diff --git a/.github/ISSUE_TEMPLATE/issue_report.yml b/.github/ISSUE_TEMPLATE/issue_report.yml
index f1ee1a82cef4..4b3cdb5b5412 100644
--- a/.github/ISSUE_TEMPLATE/issue_report.yml
+++ b/.github/ISSUE_TEMPLATE/issue_report.yml
@@ -10,9 +10,9 @@
# label: | Box title |
# description: | Box small text - Description |
#
-name: "Issue Report"
+name: 'Issue Report'
#title: "[Bug]: " | if you want to have a have it automatically say [Bug] when they start the form
-description: "Доложите о проблемах или багах, что бы мы могли их исправить."
+description: 'Доложите о проблемах или багах, что бы мы могли их исправить.'
#labels: "Баг"
body:
@@ -24,7 +24,9 @@ body:
id: version
attributes:
label: BYOND Version
- description: "На какой версии BYOND встретился баг. (Если уверены, что не связано, можно пропустить)"
+ description: 'На какой версии BYOND встретился баг. (Если уверены, что не связано, можно пропустить)'
+ validations:
+ required: true
- type: textarea
id: description
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b36ea2c786de..17d86dfb062b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,7 +8,8 @@
"typescript.enablePromptUseWorkspaceTsdk": true,
"search.exclude": {
"**/.yarn": true,
- "**/.pnp.*": true
+ "**/.pnp.*": true,
+ "tgui/public/**/*": true
},
"eslint.format.enable": true,
"eslint.rules.customizations": [
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index c104e9a29381..43c12ed66f8a 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -42,10 +42,14 @@ It is expected that contributors discuss larger changes on the [Paradise Station
For changes to content listed below, contributors **must** obtain approval from a headcoder or a member of either the balance, design, mapping, or sprite team (depending on which teams are relevant to the changes) before opening their Pull Request. This approval must be displayed in the Pull Request description body in the form of a screenshot. The Headcoders may grant an exemption to this requirement on a case-by-case basis, as the need arises.
-### Currently, changes to the following types of content requires pre-approval:
- - Security content (excluding fixes, code improvement, refactors, sprites, and mapping changes)
- - Antagonist content (excluding fixes, code improvement, refactors, sprites, and mapping changes)
- - Species content (excluding fixes, code improvement, and refactors)
- - Large changes (for example PRs that touch multiple systems, many files, many lines of code)
- - Changes that might be controversial
- - Changes with wide-ranging balance or design implications
+
+
+
+> [!IMPORTANT]
+> ### Currently, changes to the following types of content requires pre-approval:
+> - **Security content (excluding fixes, code improvement, refactors, sprites, and mapping changes)**
+> - **Antagonist content (excluding fixes, code improvement, refactors, sprites, and mapping changes)**
+> - **Species content (excluding fixes, code improvement, and refactors)**
+> - **Large changes (for example PRs that touch multiple systems, many files, many lines of code)**
+> - **Changes that might be controversial**
+> - **Changes with wide-ranging balance or design implications**
diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql
index fd82b52d1cc0..ed435e3be7f6 100644
--- a/SQL/paradise_schema.sql
+++ b/SQL/paradise_schema.sql
@@ -711,3 +711,31 @@ CREATE TABLE `budget` (
# Adds species whitelist ~legendaxe
ALTER TABLE `player` ADD `species_whitelist` LONGTEXT COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT ('["human"]');
+
+# Updating DB from 59.220.6 to 59.220.7
+# Adds SS220 toggle prefs ~Maxiemar
+
+DROP TABLE IF EXISTS `player_220`;
+CREATE TABLE `player_220` (
+ `ckey` VARCHAR(32) NOT NULL COLLATE utf8mb4_unicode_ci,
+ `toggles` int(11) DEFAULT NULL,
+ PRIMARY KEY (`ckey`) USING BTREE
+) COLLATE = utf8mb4_unicode_ci ENGINE = InnoDB;
+
+ALTER TABLE `player_220`
+ADD CONSTRAINT `fk_player_220_ckey`
+FOREIGN KEY (`ckey`) REFERENCES `player`(`ckey`)
+ON DELETE CASCADE
+ON UPDATE CASCADE;
+
+DROP TRIGGER IF EXISTS `player_insert`;
+DELIMITER //
+CREATE TRIGGER `player_insert`
+AFTER INSERT ON `player`
+FOR EACH ROW
+BEGIN
+ INSERT INTO `player_220` (`ckey`)
+ VALUES (NEW.ckey);
+END;
+//
+DELIMITER ;
diff --git a/SQL/updates220/59.220.6-59.220.7.sql b/SQL/updates220/59.220.6-59.220.7.sql
new file mode 100644
index 000000000000..12a4f9a529ec
--- /dev/null
+++ b/SQL/updates220/59.220.6-59.220.7.sql
@@ -0,0 +1,31 @@
+# Updating DB from 59.220.6 to 59.220.7
+# Adds SS220 toggle prefs ~Maxiemar
+
+DROP TABLE IF EXISTS `player_220`;
+CREATE TABLE `player_220` (
+ `ckey` VARCHAR(32) NOT NULL COLLATE utf8mb4_unicode_ci,
+ `toggles` int(11) DEFAULT NULL,
+ PRIMARY KEY (`ckey`) USING BTREE
+) COLLATE = utf8mb4_unicode_ci ENGINE = InnoDB;
+
+ALTER TABLE `player_220`
+ADD CONSTRAINT `fk_player_220_ckey`
+FOREIGN KEY (`ckey`) REFERENCES `player`(`ckey`)
+ON DELETE CASCADE
+ON UPDATE CASCADE;
+
+DROP TRIGGER IF EXISTS `player_insert`;
+DELIMITER //
+CREATE TRIGGER `player_insert`
+AFTER INSERT ON `player`
+FOR EACH ROW
+BEGIN
+ INSERT INTO `player_220` (`ckey`)
+ VALUES (NEW.ckey);
+END;
+//
+DELIMITER ;
+
+INSERT INTO `player_220` (`ckey`)
+SELECT `ckey`
+FROM `player`;
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
index 167491448153..e31219ca97e7 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
@@ -4,7 +4,7 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"au" = (
/obj/structure/grille,
/obj/item/shard,
@@ -13,7 +13,7 @@
pixel_x = 11
},
/turf/simulated/floor/plating,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"bk" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/food/syndicake{
@@ -23,7 +23,7 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"bl" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/storage/box/papersack{
@@ -35,12 +35,12 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"bn" = (
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"bq" = (
/obj/structure/chair/comfy/black{
dir = 4
@@ -48,7 +48,7 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"bv" = (
/obj/machinery/light/small{
dir = 4
@@ -56,17 +56,17 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"bG" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"bO" = (
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"bY" = (
/obj/structure/girder,
/turf/template_noop,
@@ -76,24 +76,24 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"cr" = (
/obj/machinery/conveyor/east{
id = "garbage";
dir = 1
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"cW" = (
/turf/simulated/floor/mineral/plastitanium/red,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"dP" = (
/obj/structure/flora/ausbushes/ppflowers,
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/grass,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"dV" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced,
@@ -105,7 +105,7 @@
name = "Produce Area Doors"
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"ex" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/security/telescreen/entertainment{
@@ -120,7 +120,7 @@
pixel_x = 5
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"fq" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/food/meat/corgi,
@@ -130,7 +130,7 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"fs" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/food/syndicake{
@@ -149,70 +149,72 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"fE" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/food/syndicake,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"fJ" = (
/obj/effect/decal/cleanable/vomit,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"ga" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced{
dir = 4
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"gc" = (
/obj/structure/flora/ausbushes/ywflowers,
/turf/simulated/floor/grass,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"gk" = (
/turf/simulated/floor/grass,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"gu" = (
/obj/effect/decal/remains/human,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"gx" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/reagent_containers/syringe,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"gy" = (
/obj/item/clothing/mask/gas/monkeymask,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"hc" = (
/obj/machinery/porta_turret/syndicate/assault_pod,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"ho" = (
-/obj/structure/table/reinforced,
-/obj/item/trash/spacetwinkie,
/obj/machinery/light/small{
dir = 8
},
+/obj/machinery/power/smes/engineering{
+ dir = 4
+ },
+/obj/structure/cable,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"hq" = (
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"hC" = (
/obj/structure/railing{
dir = 8
@@ -220,23 +222,23 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"hF" = (
/obj/effect/landmark/damageturf,
/turf/simulated/floor/engine/airless,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"hH" = (
/obj/structure/railing/corner,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"hM" = (
/obj/structure/door_assembly/door_assembly_hatch,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"iq" = (
/obj/item/flag/syndi{
anchored = 1
@@ -247,32 +249,32 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"iL" = (
/obj/structure/noticeboard{
pixel_y = 32
},
/obj/item/paper/fluff/ruins/syndiecakesfactory/reception,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"je" = (
/obj/structure/table_frame,
/obj/item/stack/sheet/plastitaniumglass,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"jn" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/paper/fluff/ruins/syndiecakesfactory/teleporter,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"jx" = (
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/grass,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"ke" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/food/syndicake{
@@ -283,26 +285,26 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"ky" = (
/obj/structure/window/reinforced{
dir = 8
},
/turf/simulated/floor/grass,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"kD" = (
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"ls" = (
/obj/structure/dispenser/oxygen,
/turf/simulated/floor/engine/airless,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"lZ" = (
/turf/simulated/floor/plating/airless,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"mg" = (
/obj/item/shard,
/obj/item/shard{
@@ -312,25 +314,25 @@
},
/obj/structure/grille/broken,
/turf/simulated/floor/plating,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"mP" = (
/obj/effect/decal/cleanable/vomit/green,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"nl" = (
/obj/structure/rack,
/obj/item/clothing/mask/gas/syndicate,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"nO" = (
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"oo" = (
/obj/item/stack/rods/ten,
/turf/template_noop,
@@ -340,11 +342,11 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"oH" = (
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"oJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -353,11 +355,11 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"oV" = (
/obj/structure/flora/ausbushes/brflowers,
/turf/simulated/floor/grass,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"pd" = (
/turf/template_noop,
/area/template_noop)
@@ -366,7 +368,7 @@
dir = 8
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"qd" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/food/breadslice,
@@ -382,13 +384,13 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"qk" = (
/obj/item/trash/syndi_cakes,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"qx" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/alien/sentinel{
@@ -409,7 +411,7 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"qX" = (
/obj/machinery/conveyor/east{
id = "garbage";
@@ -422,7 +424,7 @@
status = 2
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"qY" = (
/obj/structure/sign/securearea{
pixel_x = -32
@@ -433,7 +435,7 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"rJ" = (
/obj/effect/decal/cleanable/cobweb2,
/obj/machinery/light/small{
@@ -445,7 +447,7 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"rP" = (
/obj/machinery/door/poddoor{
id_tag = "cakearea"
@@ -453,14 +455,14 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"sh" = (
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"sj" = (
/obj/structure/chair/office/dark,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"sv" = (
/obj/machinery/door/airlock/hatch/syndicate{
name = "Packaging Room"
@@ -468,7 +470,7 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"sN" = (
/obj/machinery/conveyor/east,
/obj/machinery/light/small{
@@ -477,7 +479,7 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"tf" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/food/syndicake,
@@ -491,7 +493,7 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"tp" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -500,7 +502,7 @@
},
/obj/item/pen/multi/syndicate,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"tX" = (
/obj/structure/flora/ausbushes/ppflowers,
/obj/machinery/light/small{
@@ -510,7 +512,7 @@
status = 2
},
/turf/simulated/floor/grass,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"ub" = (
/obj/structure/railing{
dir = 4
@@ -518,13 +520,13 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"up" = (
/obj/machinery/tcomms/relay/ruskie{
network_id = "SYNDICAKES-FACTORY"
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"uA" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/stack/sheet/animalhide/corgi,
@@ -537,7 +539,7 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"uP" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/machinery/light/small{
@@ -546,12 +548,12 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"uU" = (
/obj/structure/rack,
/obj/random/tool,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"vo" = (
/obj/structure/lattice,
/obj/item/stack/sheet/metal,
@@ -563,20 +565,20 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"vO" = (
/obj/effect/decal/cleanable/flour,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"vR" = (
/obj/machinery/door/airlock/hatch/syndicate{
name = "SC-Eridani"
},
/turf/simulated/floor/plasteel,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"wd" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/kitchen/knife/butcher,
@@ -587,36 +589,36 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"wf" = (
/obj/structure/sign/securearea{
pixel_y = -32
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"wv" = (
/obj/machinery/light/small,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"wC" = (
/obj/effect/decal/cleanable/insectguts,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"wE" = (
/obj/machinery/door/window/classic/normal{
dir = 4
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"wI" = (
/obj/machinery/conveyor/east{
id = "garbage";
dir = 8
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"wV" = (
/obj/machinery/light/small{
dir = 8
@@ -624,38 +626,38 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"wW" = (
/obj/machinery/suit_storage_unit/syndicate,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"xy" = (
/obj/machinery/suit_storage_unit,
/turf/simulated/floor/engine/airless,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"xO" = (
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"xW" = (
/obj/structure/rack,
/obj/item/clothing/under/syndicate/silicon_cham,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"yU" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"yV" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"zc" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/stack/packageWrap,
@@ -668,21 +670,22 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"zo" = (
/obj/structure/rack,
/obj/item/clothing/suit/corgisuit,
/obj/item/clothing/head/corgi,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"zt" = (
/turf/simulated/floor/plating/damaged/airless,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"AP" = (
/obj/structure/table/reinforced,
/obj/item/trash/syndi_cakes,
+/obj/item/storage/toolbox/syndicate,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"AV" = (
/obj/machinery/door_control{
pixel_y = 32;
@@ -690,7 +693,7 @@
name = "Control Room"
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Bh" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/food/syndicake{
@@ -702,27 +705,38 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"BG" = (
/obj/effect/decal/cleanable/blood,
/obj/item/stack/sheet/animalhide/corgi,
/turf/simulated/floor/grass,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
+"BM" = (
+/obj/machinery/power/apc/critical/directional/west,
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/turf/simulated/floor/engine,
+/area/ruin/space/syndicakefactory)
"BR" = (
/obj/structure/rack,
/obj/item/clothing/suit/armor/vest,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Cm" = (
/obj/effect/decal/cleanable/vomit/green,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Cp" = (
/obj/item/shard,
/turf/simulated/floor/grass,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Cu" = (
/obj/item/stack/ore/glass/basalt,
/turf/template_noop,
@@ -731,7 +745,7 @@
/obj/structure/chair/office/dark,
/mob/living/simple_animal/hostile/syndicate/ranged/space/autogib,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"CW" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/stack/packageWrap,
@@ -741,18 +755,18 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"CX" = (
/obj/item/trash/tray,
/turf/simulated/floor/mineral/plastitanium/red,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Do" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/food/meat/corgi,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"DJ" = (
/obj/machinery/light/small{
dir = 8
@@ -760,7 +774,7 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"DP" = (
/obj/machinery/door/poddoor{
id_tag = "securearea"
@@ -768,7 +782,7 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"DY" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/reagent_containers/condiment/milk{
@@ -782,34 +796,34 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"EB" = (
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"EH" = (
/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"EJ" = (
/turf/simulated/wall,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Fj" = (
/obj/item/trash/syndi_cakes,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"FK" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"FX" = (
/obj/machinery/light/small{
dir = 4
@@ -817,19 +831,22 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Ga" = (
/obj/structure/table/reinforced,
-/obj/item/storage/fancy/donut_box/empty,
+/obj/item/storage/fancy/donut_box,
+/obj/machinery/power/terminal{
+ dir = 8
+ },
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Gh" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced{
dir = 8
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Gn" = (
/obj/structure/table/reinforced,
/obj/item/food/syndicake,
@@ -837,7 +854,7 @@
pixel_y = 7
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"GV" = (
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/light/small{
@@ -849,16 +866,21 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Ha" = (
/obj/item/stack/sheet/metal,
/turf/template_noop,
/area/template_noop)
"Hh" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/syndicate,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/bed/dogbed,
+/mob/living/simple_animal/bunny/syndi,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Ho" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced{
@@ -866,16 +888,16 @@
},
/obj/item/paper_bin,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Hy" = (
/obj/machinery/door/airlock/external,
/turf/simulated/floor/plating/airless,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Ii" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Iz" = (
/obj/item/food/meat/corgi{
pixel_y = 6
@@ -884,11 +906,11 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"IB" = (
/obj/item/stack/sheet/animalhide/corgi,
/turf/simulated/floor/grass,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"IE" = (
/obj/item/flag/syndi{
anchored = 1
@@ -899,7 +921,7 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Jt" = (
/obj/machinery/light/small{
dir = 4
@@ -907,19 +929,19 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"JQ" = (
/obj/machinery/teleport/hub,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Kr" = (
/obj/effect/decal/cleanable/flour,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"KS" = (
/obj/machinery/door/poddoor{
id_tag = "producearea"
@@ -927,7 +949,7 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"KY" = (
/obj/machinery/door/poddoor{
id_tag = "securearea"
@@ -935,16 +957,13 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
-"Li" = (
-/turf/template_noop,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Lr" = (
/obj/machinery/door/window/classic/normal{
dir = 8
},
/turf/simulated/floor/grass,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Lt" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/food/syndicake{
@@ -956,10 +975,10 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"LN" = (
/turf/simulated/floor/engine/airless,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"LV" = (
/obj/structure/chair/comfy/black{
dir = 8
@@ -967,14 +986,18 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"LW" = (
/obj/structure/closet/crate/trashcart,
/obj/item/trash/pistachios,
/obj/item/trash/cheesie,
/obj/item/trash/fried_vox,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
+"Me" = (
+/obj/item/trash/spacetwinkie,
+/turf/simulated/floor/mineral/plastitanium/red,
+/area/ruin/space/syndicakefactory)
"Mw" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/food/syndicake,
@@ -988,7 +1011,7 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"MV" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/storage/box/papersack{
@@ -1000,7 +1023,7 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"MY" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/food/syndicake{
@@ -1012,13 +1035,13 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Nq" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Nx" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/stack/packageWrap,
@@ -1028,7 +1051,7 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"NQ" = (
/obj/structure/lattice,
/turf/template_noop,
@@ -1053,7 +1076,7 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"OF" = (
/obj/machinery/door/window{
dir = 1
@@ -1064,16 +1087,16 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"OK" = (
/turf/simulated/mineral,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"OP" = (
/obj/item/flag/syndi{
anchored = 1
},
/turf/simulated/floor/engine/airless,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"OU" = (
/mob/living/simple_animal/hostile/alien/sentinel{
animal_species = /mob/living/simple_animal/pet/dog;
@@ -1093,18 +1116,18 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"PH" = (
/obj/structure/railing,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"PS" = (
/obj/structure/rack,
/obj/item/storage/pill_bottle/random_drug_bottle,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Qv" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -1113,7 +1136,7 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"QF" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/food/syndicake,
@@ -1130,19 +1153,19 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"QI" = (
/obj/item/toy/plushie/greyplushie,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"RG" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"RO" = (
/obj/structure/grille,
/obj/item/shard{
@@ -1154,33 +1177,33 @@
pixel_x = 6
},
/turf/simulated/floor/plating,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Sz" = (
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"SS" = (
/obj/item/food/meat/corgi,
/turf/simulated/floor/grass,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"TG" = (
/turf/simulated/wall/indestructible/riveted,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"TM" = (
/obj/machinery/recycler/deathtrap,
/obj/machinery/conveyor/east,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"UR" = (
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Vo" = (
/obj/machinery/light/small{
active_power_consumption = 0;
@@ -1191,7 +1214,7 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Vt" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/reagent_containers/condiment/saltshaker,
@@ -1201,7 +1224,7 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"VI" = (
/obj/item/food/meat/corgi{
pixel_y = 6
@@ -1209,7 +1232,7 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"VS" = (
/obj/structure/table_frame,
/obj/item/stack/sheet/plastitaniumglass,
@@ -1219,23 +1242,23 @@
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Wh" = (
/obj/structure/table/glass/reinforced/plastitanium,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Wr" = (
/mob/living/simple_animal/pet/dog/corgi/exoticcorgi,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"WX" = (
/obj/item/trash/waffles,
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"XZ" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/reagent_containers/condiment/enzyme{
@@ -1245,7 +1268,7 @@
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Yy" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced,
@@ -1257,11 +1280,11 @@
name = "Secure Area Doors"
},
/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"YE" = (
/obj/item/kirbyplants/plant22,
/turf/simulated/floor/grass,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"YQ" = (
/obj/structure/chair/comfy/black{
dir = 1
@@ -1269,7 +1292,7 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"YR" = (
/mob/living/simple_animal/hostile/alien/sentinel{
animal_species = /mob/living/simple_animal/pet/dog;
@@ -1287,13 +1310,13 @@
icon_dead = "corgi_dead"
},
/turf/simulated/floor/grass,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Zs" = (
/obj/item/reagent_containers/condiment/flour,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"Zw" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/food/syndicake{
@@ -1302,14 +1325,7 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
-"ZK" = (
-/mob/living/simple_animal/bunny{
- name = "Flippers";
- faction = list("neutral","jungle","syndicate")
- },
-/turf/simulated/floor/engine,
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
"ZT" = (
/obj/structure/railing/corner{
dir = 8
@@ -1317,7 +1333,7 @@
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
-/area/ruin/space/unpowered)
+/area/ruin/space/syndicakefactory)
(1,1,1) = {"
pd
@@ -2051,7 +2067,7 @@ PS
nl
BR
up
-sh
+BM
Hh
ho
TG
@@ -2094,7 +2110,7 @@ cW
cW
cW
CX
-ZK
+sh
Ga
TG
iL
@@ -2118,7 +2134,7 @@ pd
pd
"}
(20,1,1) = {"
-Li
+pd
OK
OK
OK
@@ -2177,7 +2193,7 @@ cW
cW
cW
cW
-cW
+Me
WX
AP
TG
diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index 86c9a47012da..ad4700d9ec2d 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -2948,9 +2948,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -2972,7 +2971,7 @@
/obj/machinery/power/tracker,
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"alG" = (
/obj/machinery/economy/vending/cigarette,
/obj/machinery/status_display{
@@ -3380,7 +3379,7 @@
/obj/machinery/power/tracker,
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"anb" = (
/obj/structure/chair{
dir = 4
@@ -3435,7 +3434,7 @@
/obj/structure/cable,
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"anu" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/red/line{
@@ -3453,9 +3452,8 @@
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"anx" = (
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 2;
- icon_state = "pipe-j2s";
sort_type_txt = "14"
},
/turf/simulated/floor/plasteel,
@@ -3543,7 +3541,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"anH" = (
/turf/simulated/wall/r_wall,
/area/station/security/main)
@@ -4005,7 +4003,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"aoM" = (
/obj/structure/cable{
d1 = 4;
@@ -4289,7 +4287,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"apo" = (
/obj/structure/grille/broken,
/turf/space,
@@ -4305,7 +4303,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"apq" = (
/obj/structure/cable{
d2 = 8;
@@ -4317,7 +4315,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"apx" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
@@ -4649,7 +4647,7 @@
"aqZ" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"ara" = (
/obj/structure/table/reinforced,
/obj/item/folder{
@@ -4675,7 +4673,7 @@
/obj/structure/cable,
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"ari" = (
/obj/structure/cable{
d1 = 1;
@@ -4943,7 +4941,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"arM" = (
/obj/structure/cable{
d1 = 4;
@@ -4962,7 +4960,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"arN" = (
/obj/structure/cable{
d2 = 8;
@@ -4970,7 +4968,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"arP" = (
/obj/structure/cable{
d1 = 4;
@@ -5018,7 +5016,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"arX" = (
/obj/structure/cable{
d2 = 2;
@@ -5030,11 +5028,11 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"asb" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"asc" = (
/obj/effect/spawner/random_barrier/obstruction,
/turf/simulated/floor/plating,
@@ -5356,7 +5354,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"asM" = (
/obj/structure/cable{
d1 = 2;
@@ -5370,7 +5368,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"asN" = (
/turf/simulated/floor/carpet,
/area/station/legal/lawoffice)
@@ -5739,7 +5737,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"atG" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/fore)
@@ -6720,7 +6718,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"awR" = (
/obj/structure/cable{
d2 = 8;
@@ -6728,7 +6726,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"awS" = (
/obj/machinery/shower{
dir = 8
@@ -6794,7 +6792,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"axr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -7773,7 +7771,7 @@
"azU" = (
/obj/structure/sign/electricshock,
/turf/simulated/wall,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"azV" = (
/obj/structure/cable{
d1 = 4;
@@ -8949,10 +8947,7 @@
name = "Fore Port Solar Control"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
-"aDw" = (
-/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aDx" = (
/obj/structure/sign/vacuum/external{
pixel_x = 32
@@ -8964,7 +8959,7 @@
filled = 0.05
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aDz" = (
/obj/structure/rack,
/obj/item/clothing/mask/cigarette/pipe,
@@ -9300,7 +9295,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aED" = (
/obj/machinery/power/terminal,
/obj/machinery/light/small{
@@ -9311,7 +9306,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aEE" = (
/obj/structure/cable{
d1 = 1;
@@ -9319,7 +9314,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aEF" = (
/obj/structure/table,
/obj/item/paper_bin,
@@ -9709,7 +9704,7 @@
shock_proof = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aFR" = (
/obj/structure/cable{
d2 = 8;
@@ -9717,7 +9712,7 @@
},
/obj/machinery/power/smes,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aFS" = (
/obj/structure/cable{
d1 = 2;
@@ -9730,11 +9725,11 @@
icon_state = "2-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aFT" = (
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aFU" = (
/obj/structure/table,
/obj/item/toy/figure/crew/detective,
@@ -10031,7 +10026,7 @@
/area/station/public/arcade)
"aGT" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aGU" = (
/obj/structure/cable{
d2 = 4;
@@ -10041,7 +10036,7 @@
name = "Fore Starboard Solar Control"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aGV" = (
/obj/structure/cable{
d1 = 1;
@@ -10065,7 +10060,7 @@
pixel_y = 32
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aGX" = (
/turf/simulated/wall,
/area/station/maintenance/fsmaint)
@@ -10110,11 +10105,11 @@
"aHg" = (
/obj/structure/sign/electricshock,
/turf/simulated/wall/r_wall,
-/area/station/maintenance/fpmaint2)
+/area/station/maintenance/solar_maintenance/fore_port)
"aHi" = (
/obj/effect/spawner/random_spawners/fungus_maybe,
/turf/simulated/wall/r_wall,
-/area/station/maintenance/fpmaint2)
+/area/station/maintenance/solar_maintenance/fore_port)
"aHj" = (
/obj/machinery/economy/vending/cigarette,
/turf/simulated/floor/wood,
@@ -10276,7 +10271,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aHJ" = (
/obj/structure/cable{
d2 = 8;
@@ -10287,13 +10282,13 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aHK" = (
/obj/structure/chair/stool{
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aHL" = (
/obj/structure/cable{
d1 = 4;
@@ -10500,7 +10495,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aIB" = (
/obj/structure/cable{
d2 = 4;
@@ -10510,7 +10505,7 @@
shock_proof = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aIC" = (
/obj/machinery/camera{
c_tag = "Fore Starboard Solars";
@@ -10522,7 +10517,7 @@
},
/obj/machinery/power/smes,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aID" = (
/obj/structure/closet/wardrobe/mixed,
/obj/item/clothing/shoes/jackboots,
@@ -10843,7 +10838,7 @@
"aJH" = (
/obj/structure/sign/electricshock,
/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aJI" = (
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
@@ -11141,9 +11136,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 2;
@@ -12378,9 +12372,8 @@
/turf/simulated/floor/wood,
/area/station/legal/courtroom)
"aOv" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -13786,13 +13779,6 @@
icon_state = "bluecorner"
},
/area/station/hallway/primary/fore)
-"aSV" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/starboard/east)
"aSW" = (
/obj/structure/chair/comfy/beige,
/turf/simulated/floor/plasteel{
@@ -28788,7 +28774,7 @@
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"bPd" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -30900,9 +30886,8 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/junction{
- dir = 1;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -31671,9 +31656,8 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -35679,7 +35663,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cpA" = (
/obj/effect/spawner/window/reinforced/polarized{
id = "med2"
@@ -38325,7 +38309,7 @@
"cyO" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cyP" = (
/obj/effect/spawner/random_barrier/obstruction,
/turf/simulated/floor/plating,
@@ -42245,7 +42229,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cMC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -42533,7 +42517,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cNG" = (
/turf/simulated/floor/plating,
/area/station/maintenance/assembly_line)
@@ -42560,7 +42544,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cNO" = (
/obj/structure/chair/comfy/black{
dir = 4
@@ -43003,7 +42987,7 @@
/obj/structure/cable,
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cPA" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -43030,7 +43014,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cPD" = (
/obj/machinery/atmospherics/pipe/manifold/visible/yellow,
/turf/simulated/floor/plasteel,
@@ -43057,7 +43041,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cPH" = (
/obj/structure/cable{
d2 = 8;
@@ -43065,7 +43049,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cPI" = (
/obj/structure/cable{
d2 = 4;
@@ -43073,7 +43057,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cPM" = (
/obj/structure/cable{
d1 = 1;
@@ -43234,7 +43218,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cQr" = (
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
@@ -43494,7 +43478,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cRf" = (
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 4
@@ -43638,7 +43622,7 @@
/area/station/maintenance/asmaint)
"cRA" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cRB" = (
/obj/structure/cable{
d2 = 8;
@@ -43849,7 +43833,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cSl" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel,
@@ -44080,7 +44064,7 @@
/obj/machinery/atmospherics/unary/portables_connector,
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cST" = (
/obj/structure/cable{
d2 = 2;
@@ -44088,7 +44072,7 @@
},
/obj/machinery/power/smes,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cSU" = (
/turf/simulated/wall/r_wall,
/area/station/engineering/control)
@@ -44147,7 +44131,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cTc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -44430,7 +44414,7 @@
"cTW" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"cTX" = (
/obj/structure/cable{
d2 = 4;
@@ -44459,7 +44443,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cUe" = (
/obj/structure/cable{
d1 = 1;
@@ -44467,7 +44451,7 @@
icon_state = "1-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cUf" = (
/obj/structure/cable{
d1 = 4;
@@ -44697,7 +44681,7 @@
/area/station/supply/miningdock)
"cVd" = (
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cVf" = (
/obj/structure/cable{
d1 = 1;
@@ -44760,7 +44744,7 @@
name = "Aft Port Solar Control"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cVm" = (
/obj/machinery/camera{
c_tag = "Aft Port Solar Control";
@@ -44771,7 +44755,7 @@
shock_proof = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cVo" = (
/obj/structure/cable{
d1 = 4;
@@ -45314,9 +45298,8 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/turbine)
"cXo" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/turf/simulated/floor/plasteel{
dir = 6;
@@ -46063,7 +46046,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"dar" = (
/turf/simulated/wall/r_wall,
/area/station/engineering/secure_storage)
@@ -46948,7 +46931,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"ddF" = (
/obj/structure/cable{
d1 = 1;
@@ -46987,7 +46970,7 @@
/obj/structure/cable,
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"ddP" = (
/obj/structure/cable{
d1 = 2;
@@ -47001,7 +46984,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"ddQ" = (
/obj/structure/cable{
d1 = 2;
@@ -47020,7 +47003,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"ddR" = (
/obj/structure/cable{
d2 = 8;
@@ -47028,7 +47011,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"ddT" = (
/obj/structure/cable{
d2 = 4;
@@ -47036,7 +47019,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"ddU" = (
/obj/structure/cable{
d1 = 1;
@@ -47055,7 +47038,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"dea" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -47078,7 +47061,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"dec" = (
/obj/machinery/atmospherics/pipe/manifold/visible,
/turf/simulated/floor/plasteel,
@@ -47090,7 +47073,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"dee" = (
/obj/structure/cable{
d1 = 4;
@@ -47099,7 +47082,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"def" = (
/obj/structure/cable{
d1 = 1;
@@ -47118,13 +47101,13 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"deg" = (
/obj/structure/cable,
/obj/machinery/power/tracker,
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"deh" = (
/obj/machinery/space_heater,
/obj/structure/cable{
@@ -47266,7 +47249,7 @@
"deE" = (
/obj/structure/sign/electricshock,
/turf/simulated/wall/r_wall,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"deF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/turf_decal/stripes/line{
@@ -47332,7 +47315,7 @@
icon_state = "1-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"deO" = (
/obj/structure/cable{
d2 = 4;
@@ -47377,7 +47360,7 @@
shock_proof = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"deU" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 9
@@ -47411,7 +47394,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dfa" = (
/obj/structure/cable{
d1 = 2;
@@ -47419,7 +47402,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dfb" = (
/obj/structure/chair/stool,
/obj/machinery/camera{
@@ -47427,7 +47410,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dfc" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
@@ -47460,7 +47443,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dfn" = (
/obj/machinery/power/solar_control{
name = "Aft Starboard Solar Control";
@@ -47471,7 +47454,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dfo" = (
/obj/machinery/atmospherics/pipe/manifold/visible/red{
dir = 4
@@ -47491,7 +47474,7 @@
},
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dfq" = (
/obj/machinery/atmospherics/pipe/simple/visible/green,
/turf/simulated/wall/r_wall,
@@ -48650,7 +48633,7 @@
/area/station/maintenance/asmaint)
"djQ" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"djR" = (
/obj/machinery/turretid/stun{
control_area = "\improper AI Satellite Antechamber";
@@ -49372,9 +49355,8 @@
},
/area/station/aisat/hall)
"dmu" = (
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 2;
- icon_state = "pipe-j2s";
sort_type_txt = "12"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -49945,7 +49927,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"doi" = (
/obj/item/radio/intercom{
name = "north bump";
@@ -50033,7 +50015,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"doH" = (
/obj/machinery/teleport/hub,
/turf/simulated/floor/plating,
@@ -51635,9 +51617,8 @@
"dJu" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/junction{
- dir = 1;
- icon_state = "pipe-y"
+/obj/structure/disposalpipe/junction/y{
+ dir = 1
},
/obj/structure/cable{
d1 = 1;
@@ -51815,9 +51796,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/structure/cable{
d1 = 2;
@@ -52058,9 +52038,8 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint2)
"dUc" = (
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
@@ -53214,9 +53193,8 @@
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior)
"eqN" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/extinguisher_cabinet{
name = "south bump";
@@ -54160,9 +54138,8 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/asmaint)
"ePN" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel,
@@ -54431,7 +54408,7 @@
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/spawner/airlock/s_to_n,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"eXy" = (
/obj/machinery/alarm/directional/south,
/obj/structure/table,
@@ -54783,9 +54760,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/structure/cable{
d1 = 1;
@@ -54814,9 +54790,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 6
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 2;
@@ -55209,9 +55184,8 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/turbine)
"fny" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -55231,7 +55205,7 @@
"fnH" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"fnP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 10
@@ -56295,7 +56269,7 @@
"fNh" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"fNM" = (
/obj/effect/spawner/random_barrier/possibly_welded_airlock,
/obj/structure/cable{
@@ -57422,9 +57396,8 @@
},
/area/station/maintenance/aft)
"gsf" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/nw)
@@ -58347,7 +58320,7 @@
dir = 9
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"gOr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/effect/decal/cleanable/dirt,
@@ -59406,7 +59379,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"hoJ" = (
/obj/effect/spawner/random_spawners/fungus_probably,
/turf/simulated/wall,
@@ -60135,7 +60108,7 @@
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"hHk" = (
/obj/structure/cable{
d1 = 1;
@@ -61224,9 +61197,8 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"ilk" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -61419,9 +61391,8 @@
/turf/simulated/floor/plasteel,
/area/station/science/toxins/launch)
"ipf" = (
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 8;
- icon_state = "pipe-j2s";
sort_type_txt = "10"
},
/obj/machinery/light{
@@ -63867,7 +63838,7 @@
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"jCu" = (
/obj/machinery/economy/vending/scidrobe,
/turf/simulated/floor/plasteel{
@@ -64129,9 +64100,8 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/port/east)
"jKM" = (
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 4;
- icon_state = "pipe-j2s";
sort_type_txt = "17"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -64253,7 +64223,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"jOA" = (
/obj/structure/reagent_dispensers/beerkeg/nuke{
name = "Nanotrasen-brand nuclear fizz-sion explosive"
@@ -64489,9 +64459,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/sw)
@@ -64785,7 +64754,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"kap" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -64850,9 +64819,8 @@
},
/area/station/science/hallway)
"kcO" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 2;
@@ -66214,9 +66182,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/junction{
- dir = 1;
- icon_state = "pipe-y"
+/obj/structure/disposalpipe/junction/y{
+ dir = 1
},
/obj/structure/cable{
d1 = 4;
@@ -66319,9 +66286,8 @@
/turf/simulated/floor/wood,
/area/station/command/office/captain)
"kLs" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/effect/landmark/start/scientist,
/turf/simulated/floor/plasteel{
@@ -66881,7 +66847,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"lbb" = (
/obj/machinery/disposal,
/obj/machinery/firealarm/directional/east,
@@ -68402,9 +68368,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"lLv" = (
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
@@ -68624,7 +68589,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"lQx" = (
/obj/effect/spawner/random_spawners/fungus_maybe,
/turf/simulated/wall,
@@ -69789,9 +69754,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/assembly_line)
"mvU" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -69985,9 +69949,8 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 2;
- icon_state = "pipe-j2s";
sort_type_txt = "16"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -70788,9 +70751,8 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -71099,7 +71061,7 @@
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/spawner/airlock/s_to_n,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"neo" = (
/obj/effect/spawner/window/reinforced/tinted,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -71259,9 +71221,8 @@
},
/area/station/hallway/secondary/exit)
"nju" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -71548,7 +71509,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"nuq" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel,
@@ -74007,9 +73968,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 4;
@@ -74541,9 +74501,8 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/structure/cable{
d1 = 4;
@@ -74678,9 +74637,8 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"oNo" = (
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard/east)
@@ -74752,9 +74710,8 @@
},
/area/station/medical/cloning)
"oPP" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -74911,9 +74868,8 @@
},
/area/station/security/brig)
"oSJ" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -75774,9 +75730,8 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/asmaint)
"pqW" = (
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 8;
- icon_state = "pipe-j2s";
sort_type_txt = "4"
},
/obj/structure/railing/corner{
@@ -76845,9 +76800,8 @@
/turf/simulated/wall,
/area/station/medical/surgery/primary)
"pTi" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -77537,9 +77491,8 @@
},
/area/station/medical/patients_rooms1)
"qkk" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "darkredcorners"
@@ -77618,9 +77571,8 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 2;
- icon_state = "pipe-j2s";
sort_type_txt = "13"
},
/obj/structure/cable{
@@ -79257,7 +79209,7 @@
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"qUu" = (
/obj/machinery/light_switch{
dir = 4;
@@ -80277,9 +80229,8 @@
/area/station/maintenance/apmaint)
"rtx" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -81297,9 +81248,8 @@
/turf/simulated/floor/plating,
/area/station/turret_protected/ai)
"rVk" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/plasteel{
@@ -81434,9 +81384,7 @@
name = "north bump";
pixel_y = 28
},
-/obj/structure/disposalpipe/junction{
- icon_state = "pipe-y"
- },
+/obj/structure/disposalpipe/junction/y,
/obj/structure/cable{
d1 = 2;
d2 = 4;
@@ -81636,7 +81584,7 @@
"sdw" = (
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"sem" = (
/obj/structure/morgue{
dir = 8
@@ -82054,9 +82002,8 @@
/turf/simulated/floor/plasteel,
/area/station/command/bridge)
"spC" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -82144,9 +82091,8 @@
},
/area/station/science/xenobiology)
"srx" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -82352,7 +82298,7 @@
"swl" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"swy" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
@@ -82549,7 +82495,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"sDL" = (
/obj/structure/cable{
d1 = 4;
@@ -82674,9 +82620,8 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/structure/cable{
d1 = 4;
@@ -83211,7 +83156,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"sTQ" = (
/obj/effect/landmark/start/doctor,
/obj/structure/railing{
@@ -83705,9 +83650,8 @@
},
/area/station/science/xenobiology)
"tiE" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -84037,9 +83981,8 @@
/turf/simulated/floor/carpet/black,
/area/station/command/meeting_room)
"ttT" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
@@ -84842,7 +84785,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"tNc" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/drinks/drinkingglass,
@@ -86467,7 +86410,7 @@
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"uDI" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -86808,6 +86751,9 @@
icon_state = "darkpurple"
},
/area/station/science/genetics)
+"uQE" = (
+/turf/simulated/wall/r_wall,
+/area/station/maintenance/solar_maintenance/fore_port)
"uQX" = (
/obj/machinery/atmospherics/pipe/manifold/hidden,
/obj/effect/landmark/spawner/rev,
@@ -87303,9 +87249,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 4
},
/obj/structure/cable{
d1 = 4;
@@ -87897,7 +87842,7 @@
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/spawner/airlock,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"vsw" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/flag/rnd,
@@ -91962,9 +91907,8 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -92049,9 +91993,8 @@
},
/area/station/science/hallway)
"xwE" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 9
@@ -92223,9 +92166,8 @@
"xAQ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 4
},
/obj/machinery/alarm/directional/south,
/obj/structure/cable{
@@ -92848,7 +92790,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint2)
+/area/station/maintenance/solar_maintenance/fore_port)
"xRy" = (
/obj/structure/cable{
d1 = 1;
@@ -92961,7 +92903,7 @@
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/spawner/airlock/e_to_w,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"xSH" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating,
@@ -93340,9 +93282,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"xZa" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -93854,9 +93795,8 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"ykf" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
@@ -93955,9 +93895,8 @@
},
/area/station/medical/patients_rooms1)
"ylB" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/turf/simulated/floor/carpet,
/area/station/service/library)
@@ -94022,7 +93961,7 @@
"ymb" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
(1,1,1) = {"
aaa
@@ -107479,10 +107418,10 @@ aaa
aab
aaa
ymb
-aDw
+uQE
aFT
-aDw
-aSt
+uQE
+uQE
aHM
aIJ
aKW
@@ -107739,7 +107678,7 @@ nee
aDu
aEC
aFQ
-aSt
+uQE
aHU
erj
aGn
@@ -108507,8 +108446,8 @@ aaa
aab
aaa
ymb
-aDw
-aDw
+uQE
+uQE
aFT
aHi
aRA
@@ -136812,7 +136751,7 @@ bve
bwv
bwv
aSI
-aSV
+jlQ
vbR
gSC
bWj
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index 52fed84504bd..d159c958bb5f 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -148,16 +148,16 @@
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/external/north)
"abc" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"abd" = (
@@ -508,11 +508,6 @@
pixel_y = 28;
name = "north bump"
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -520,6 +515,11 @@
dir = 4;
color = "#954535"
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "bluered"
@@ -728,6 +728,8 @@
pixel_y = 7;
pixel_x = -3
},
+/obj/structure/cable/orange,
+/obj/machinery/power/apc/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -848,11 +850,6 @@
},
/area/station/security/execution)
"aeL" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/door/airlock/maintenance/external{
name = "External Airlock Access"
},
@@ -1062,7 +1059,7 @@
"agI" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 4;
icon_state = "1-4"
@@ -1995,11 +1992,6 @@
/turf/simulated/floor/plating/airless,
/area/station/maintenance/disposal/north)
"amy" = (
-/obj/machinery/power/apc/critical/directional/north,
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
- },
/obj/machinery/camera{
c_tag = "AI Asteroid Antechamber Maintenance";
dir = 5
@@ -2606,11 +2598,6 @@
name = "Disposals Maintenance"
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -3069,6 +3056,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/landmark/lightsout,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "bcircuit"
},
@@ -3213,6 +3205,11 @@
/area/station/hallway/secondary/exit)
"auJ" = (
/obj/structure/reagent_dispensers/fueltank,
+/obj/machinery/power/apc/directional/north,
+/obj/structure/cable/orange{
+ d2 = 2;
+ icon_state = "0-2"
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "yellow"
@@ -3419,11 +3416,6 @@
/turf/simulated/mineral/ancient,
/area/station/public/locker)
"avY" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/item/assembly/mousetrap/armed,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
@@ -3434,11 +3426,6 @@
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fore2)
"awd" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plating,
/area/station/hallway/primary/central/north)
@@ -3618,15 +3605,17 @@
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/captain)
"axg" = (
+/obj/structure/disposalpipe/segment,
/obj/structure/cable/orange{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "redcorner"
},
-/area/station/maintenance/fore2)
+/area/station/security/lobby)
"axi" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -3954,7 +3943,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar/aft)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"azN" = (
/obj/machinery/light/small,
/obj/machinery/firealarm/directional/south,
@@ -4654,29 +4643,17 @@
/obj/item/stack/sheet/metal,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fpmaint)
-"aFh" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"aFn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -4750,32 +4727,16 @@
/turf/simulated/floor/carpet/arcade,
/area/station/public/arcade)
"aGe" = (
-/obj/structure/cable/orange{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/machinery/power/apc/directional/west,
-/obj/effect/turf_decal/stripes/end{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/station/public/arcade)
"aGf" = (
/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable/orange{
- d1 = 1;
+ d1 = 4;
d2 = 8;
- icon_state = "1-8"
- },
-/obj/item/assembly/mousetrap/armed,
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+ icon_state = "4-8"
},
-/area/station/maintenance/fore2)
+/turf/simulated/floor/carpet/arcade,
+/area/station/public/arcade)
"aGg" = (
/obj/machinery/light/small{
dir = 4
@@ -4804,11 +4765,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/effect/spawner/grouped_spawner{
group_id = "tunnelbats";
max_per_spawner = 1;
@@ -4885,8 +4841,8 @@
/area/station/maintenance/apmaint)
"aHk" = (
/obj/machinery/door_control{
- id = "bridge";
- name = "Bridge Lockdown";
+ id = "bridge_lower";
+ name = "Lower Bridge Lockdown";
pixel_y = 24;
req_one_access_txt = "19;14"
},
@@ -4895,6 +4851,12 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/door_control{
+ id = "bridge_upper";
+ name = "Upper Bridge Lockdown";
+ pixel_y = 32;
+ req_one_access_txt = "19;14"
+ },
/turf/simulated/floor/carpet/black,
/area/station/command/bridge)
"aHl" = (
@@ -4961,6 +4923,11 @@
random_basetype = /obj/structure/sign/poster/official
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel,
/area/station/public/locker)
"aIi" = (
@@ -5001,7 +4968,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/fore_starboard)
"aIA" = (
/obj/machinery/mineral/equipment_vendor,
/turf/simulated/floor/plasteel,
@@ -5104,6 +5071,11 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel,
/area/station/public/locker)
"aJj" = (
@@ -5138,14 +5110,6 @@
icon_state = "whitegreenfull"
},
/area/station/public/sleep/secondary)
-"aJp" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
"aJz" = (
/obj/structure/window/reinforced{
dir = 4
@@ -5200,11 +5164,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -5382,11 +5341,6 @@
},
/area/station/security/main)
"aLs" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -5401,16 +5355,6 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"aLt" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
@@ -5453,7 +5397,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aLQ" = (
/obj/machinery/door/airlock/command{
name = "Captain's Quarters"
@@ -5624,11 +5568,6 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aNk" = (
@@ -5644,7 +5583,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aNm" = (
/obj/structure/cable{
d2 = 8;
@@ -5656,7 +5595,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aNo" = (
/obj/machinery/light{
dir = 4
@@ -5746,12 +5685,12 @@
/area/station/command/office/captain)
"aNO" = (
/obj/structure/cable/orange{
- d1 = 2;
+ d1 = 4;
d2 = 8;
- icon_state = "2-8"
+ icon_state = "4-8"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
+/turf/simulated/floor/carpet,
+/area/station/legal/lawoffice)
"aNP" = (
/obj/machinery/light/small{
dir = 8
@@ -5918,13 +5857,18 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/light{
- dir = 8
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -5967,16 +5911,16 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"aPd" = (
-/obj/machinery/power/apc/directional/east,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/power/apc/directional/west,
/obj/structure/cable/orange{
d2 = 2;
icon_state = "0-2"
},
-/obj/effect/turf_decal/stripes/end{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/station/command/bridge)
+/turf/simulated/floor/plasteel,
+/area/station/public/locker)
"aPf" = (
/obj/machinery/light_switch{
dir = 4;
@@ -6167,23 +6111,28 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plasteel/white,
/area/station/maintenance/apmaint)
"aQa" = (
/obj/structure/disposalpipe/junction{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
/area/station/security/lobby)
"aQc" = (
/obj/structure/disposalpipe/junction,
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/security/lobby)
"aQe" = (
@@ -6347,16 +6296,12 @@
},
/area/station/turret_protected/aisat/interior/secondary)
"aRn" = (
-/obj/machinery/power/apc/directional/west,
-/obj/structure/cable/orange{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/effect/turf_decal/stripes/end{
- dir = 4
+/obj/structure/cable/orange,
+/obj/machinery/power/apc/directional/south,
+/turf/simulated/floor/plasteel{
+ icon_state = "darkgreenfull"
},
-/turf/simulated/floor/plating,
-/area/station/medical/break_room)
+/area/station/service/hydroponics)
"aRx" = (
/turf/simulated/wall,
/area/station/maintenance/fsmaint)
@@ -6546,20 +6491,12 @@
},
/area/station/command/bridge)
"aTb" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/cable/orange{
d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+ d2 = 4;
+ icon_state = "2-4"
},
+/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/fore)
"aTd" = (
/obj/structure/cable/orange{
@@ -7227,7 +7164,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aXd" = (
/obj/machinery/door/airlock/hatch,
/obj/effect/mapping_helpers/airlock/autoname,
@@ -7263,7 +7200,7 @@
icon_state = "0-4"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aXj" = (
/obj/machinery/recharge_station,
/obj/effect/turf_decal/stripes/line{
@@ -7282,13 +7219,8 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aXl" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/girder,
/obj/structure/grille,
/obj/structure/barricade/wooden,
@@ -7451,13 +7383,8 @@
/turf/simulated/wall,
/area/mine/unexplored/cere/engineering)
"aYk" = (
-/obj/machinery/power/apc/directional/south,
-/obj/structure/cable/orange,
-/obj/effect/turf_decal/stripes/end{
- dir = 1
- },
/turf/simulated/floor/transparent/glass/reinforced,
-/area/station/hallway/primary/fore/west)
+/area/station/maintenance/fpmaint)
"aYn" = (
/obj/structure/flora/ausbushes/ywflowers,
/obj/machinery/light{
@@ -7546,22 +7473,6 @@
/obj/machinery/ai_status_display,
/turf/simulated/wall/r_wall,
/area/station/medical/chemistry)
-"aYR" = (
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
-"aYT" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
"aYV" = (
/obj/structure/table,
/obj/item/storage/toolbox/electrical{
@@ -7697,11 +7608,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -7845,11 +7751,6 @@
d2 = 2;
icon_state = "0-2"
},
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/effect/turf_decal/stripes/end,
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/port)
@@ -7927,14 +7828,6 @@
/turf/simulated/floor/grass/jungle,
/area/station/hallway/secondary/garden)
"baK" = (
-/obj/machinery/power/apc/directional/west,
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/effect/turf_decal/stripes/end{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/station/hallway/secondary/garden)
"baL" = (
@@ -8082,11 +7975,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -8096,11 +7984,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/door/airlock/maintenance/external{
name = "External Airlock Access"
},
@@ -8262,14 +8145,12 @@
/turf/simulated/floor/plating,
/area/station/hallway/primary/starboard/south)
"bcV" = (
-/obj/machinery/power/apc/critical/directional/north,
-/obj/structure/cable/orange{
- d2 = 8;
- icon_state = "0-8"
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/obj/effect/turf_decal/stripes/end,
/turf/simulated/floor/plating,
-/area/station/medical/morgue)
+/area/station/maintenance/apmaint)
"bdh" = (
/obj/structure/flora/ausbushes/ppflowers,
/turf/simulated/floor/grass,
@@ -8295,6 +8176,11 @@
dir = 4
},
/obj/structure/flora/grass/jungle,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/grass/jungle,
/area/station/hallway/secondary/garden)
"bdr" = (
@@ -8304,6 +8190,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/north)
"bdt" = (
@@ -8443,6 +8334,11 @@
/obj/machinery/light{
dir = 1
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -8995,6 +8891,11 @@
"bhe" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -10302,6 +10203,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/carpet/arcade,
/area/station/public/arcade)
"bol" = (
@@ -10368,6 +10274,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel,
/area/station/public/locker)
"boy" = (
@@ -10380,6 +10291,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/carpet/arcade,
/area/station/public/arcade)
"boC" = (
@@ -10505,9 +10421,10 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/medical/chemistry)
"bpH" = (
/obj/structure/extinguisher_cabinet{
pixel_y = 28;
@@ -10869,23 +10786,18 @@
},
/area/station/medical/virology)
"brh" = (
-/obj/machinery/power/apc/directional/south,
-/obj/structure/cable/orange{
- d2 = 4;
- icon_state = "0-4"
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/power/apc/directional/east,
/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 1
+ d2 = 2;
+ icon_state = "0-2"
},
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "redcorner"
},
-/area/station/command/teleporter)
+/area/station/security/lobby)
"brl" = (
/obj/machinery/door/poddoor/multi_tile/three_tile_ver{
id_tag = "aieva";
@@ -11533,6 +11445,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/carpet,
/area/station/public/locker)
"bui" = (
@@ -11541,6 +11458,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/carpet,
/area/station/public/locker)
"buq" = (
@@ -11548,6 +11470,16 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/public/locker)
"buv" = (
@@ -11928,11 +11860,6 @@
},
/area/station/medical/morgue)
"bvM" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/grille/broken,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
@@ -12289,6 +12216,11 @@
/area/station/engineering/control)
"bxF" = (
/obj/machinery/pdapainter,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/wood,
/area/station/command/office/hop)
"bxG" = (
@@ -12362,6 +12294,11 @@
pixel_y = 24;
name = "north bump"
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -12469,6 +12406,11 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/wood,
/area/station/command/office/hop)
"byr" = (
@@ -13005,11 +12947,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"bAo" = (
@@ -13021,6 +12958,11 @@
/obj/structure/disposalpipe/segment/corner{
dir = 1
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -13373,6 +13315,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteyellow"
@@ -13464,6 +13411,11 @@
pixel_x = 8;
pixel_y = 6
},
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable/orange{
+ d2 = 4;
+ icon_state = "0-4"
+ },
/turf/simulated/floor/wood,
/area/station/command/office/hop)
"bCJ" = (
@@ -13528,11 +13480,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -14340,6 +14287,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -14354,6 +14306,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteyellow"
@@ -14374,6 +14331,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -14388,6 +14350,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteyellow"
@@ -14396,6 +14363,11 @@
"bFU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteblue"
@@ -14423,16 +14395,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -14450,7 +14412,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar/aft)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"bGx" = (
/obj/structure/bookcase/random{
name = "Forbidden Knowledge"
@@ -14759,21 +14721,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/port/south)
-"bIf" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/maintenance/fpmaint)
"bIh" = (
/obj/machinery/light{
dir = 8
@@ -14947,6 +14894,11 @@
/obj/machinery/light{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/carpet,
/area/station/legal/courtroom)
"bIS" = (
@@ -15217,12 +15169,22 @@
},
/area/station/science/genetics)
"bKg" = (
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "redcorner"
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/area/station/security/lobby)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"bKq" = (
/obj/machinery/r_n_d/protolathe,
/obj/effect/turf_decal/stripes/line,
@@ -15439,6 +15401,11 @@
dir = 4
},
/obj/effect/landmark/start/geneticist,
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
@@ -15701,30 +15668,15 @@
/turf/simulated/floor/carpet/black,
/area/station/command/bridge)
"bMz" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"bMA" = (
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/structure/disposalpipe/segment/corner,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -15984,23 +15936,10 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fore)
-"bNP" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment/corner{
- dir = 4
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/maintenance/starboard)
"bNT" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"bNU" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -16009,25 +15948,19 @@
icon_state = "2-8"
},
/turf/space,
-/area/space/nearstation)
+/area/station/engineering/solar/fore_port)
"bNY" = (
/obj/machinery/door/firedoor,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
},
/area/station/public/quantum/cargo)
-"bNZ" = (
-/obj/machinery/power/apc/directional/east,
-/obj/structure/cable{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/effect/turf_decal/stripes/end{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/station/hallway/primary/aft/west)
"bOf" = (
/obj/structure/cable{
d1 = 1;
@@ -16046,7 +15979,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"bOg" = (
/obj/machinery/light/small{
dir = 4
@@ -16240,8 +16173,8 @@
},
/obj/structure/cable/orange{
d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d2 = 8;
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -16334,6 +16267,18 @@
icon_state = "dark"
},
/area/station/engineering/atmos)
+"bPw" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/port/north)
"bPx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -16529,6 +16474,11 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"bQa" = (
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -16538,6 +16488,11 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/security/processing)
"bQd" = (
@@ -16553,6 +16508,11 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/security/processing)
"bQe" = (
@@ -16561,6 +16521,11 @@
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/research/glass,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel/white,
/area/station/science/rnd)
"bQg" = (
@@ -16727,6 +16692,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitegreenfull"
},
@@ -16789,6 +16759,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitegreenfull"
},
@@ -16801,6 +16776,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitegreenfull"
},
@@ -16874,6 +16854,11 @@
/area/station/engineering/atmos/distribution)
"bRy" = (
/obj/machinery/atmospherics/pipe/manifold/visible/yellow,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -16886,6 +16871,11 @@
autolink_id = "wloop_atm_meter";
name = "Waste Loop"
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -16897,6 +16887,11 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -16923,6 +16918,11 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel/white,
/area/station/science/xenobiology)
"bRE" = (
@@ -17055,7 +17055,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/space/nearstation)
+/area/station/engineering/solar/fore_port)
"bSm" = (
/obj/machinery/light/small{
dir = 8
@@ -17124,7 +17124,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"bSB" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -17992,6 +17992,11 @@
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -18573,15 +18578,18 @@
},
/area/station/command/bridge)
"bYk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/power/apc/directional/north,
/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d2 = 8;
+ icon_state = "0-8"
},
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/turf/simulated/floor/plasteel{
+ icon_state = "whitegreenfull"
},
-/area/station/maintenance/fore2)
+/area/station/public/sleep/secondary)
"bYn" = (
/obj/item/kirbyplants/plant22,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -18656,14 +18664,8 @@
pixel_y = 6
},
/obj/item/storage/toolbox/electrical,
-/obj/machinery/power/apc/directional/north,
-/obj/structure/cable/orange{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/effect/turf_decal/stripes/end,
/turf/simulated/floor/plating,
-/area/station/medical/paramedic)
+/area/station/hallway/primary/starboard/south)
"bYQ" = (
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -18723,6 +18725,11 @@
d2 = 8;
icon_state = "0-8"
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkyellow"
@@ -18746,11 +18753,6 @@
},
/area/station/maintenance/starboard)
"bZs" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/item/assembly/mousetrap/armed,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
@@ -18804,11 +18806,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/power/apc/directional/west,
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
- },
/turf/simulated/floor/plating,
/area/station/hallway/primary/port/south)
"cau" = (
@@ -18835,9 +18832,6 @@
},
/turf/simulated/floor/plating,
/area/station/command/office/hop)
-"cav" = (
-/turf/simulated/wall,
-/area/station/maintenance/auxsolarport)
"caw" = (
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/gambling_den)
@@ -18907,14 +18901,6 @@
icon_state = "dark"
},
/area/station/security/brig)
-"cbT" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"cbW" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
dir = 4;
@@ -19014,7 +19000,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar/aft)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"ccF" = (
/obj/structure/table,
/obj/item/storage/box/evidence,
@@ -19171,7 +19157,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"cdD" = (
/obj/structure/cable{
d1 = 1;
@@ -19179,7 +19165,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"cdF" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -19211,13 +19197,13 @@
/area/station/medical/patients_rooms)
"cdJ" = (
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"cdK" = (
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"cdL" = (
/obj/machinery/ai_status_display,
/turf/simulated/wall,
@@ -19231,7 +19217,7 @@
/obj/machinery/power/terminal,
/obj/structure/cable,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"cdT" = (
/turf/simulated/wall,
/area/station/hallway/secondary/exit)
@@ -19242,7 +19228,7 @@
},
/obj/structure/cable,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"cdW" = (
/obj/structure/table,
/obj/item/key/janitor{
@@ -19274,7 +19260,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"cei" = (
/obj/machinery/light{
dir = 8
@@ -19510,7 +19496,7 @@
/turf/simulated/floor/plasteel,
/area/station/security/storage)
"cfG" = (
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -20025,7 +20011,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"ciy" = (
/obj/machinery/door/airlock/maintenance{
name = "Command Asteroid Solars"
@@ -20037,16 +20023,11 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"ciB" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -20176,6 +20157,16 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "escape"
@@ -20223,17 +20214,17 @@
pixel_y = 28;
name = "custom placement"
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -20257,6 +20248,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "escape"
@@ -20516,7 +20512,7 @@
amount = 2
},
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/aft_starboard)
"cmo" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
@@ -20593,11 +20589,6 @@
/turf/simulated/wall,
/area/station/engineering/tech_storage)
"cmZ" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/structure/chair/stool,
/obj/structure/cable/orange{
d1 = 2;
@@ -20678,6 +20669,11 @@
"cnU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel/white,
/area/station/science/rnd)
"cnV" = (
@@ -20834,12 +20830,14 @@
/area/station/maintenance/fore2)
"coX" = (
/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/supply/break_room)
"cph" = (
/obj/machinery/economy/vending/lawdrobe,
/turf/simulated/floor/plasteel{
@@ -20852,15 +20850,15 @@
/area/station/command/bridge)
"cpk" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/door/poddoor/preopen{
- id_tag = "bridge";
- layer = 2.6;
- name = "Emergency Blast Door"
- },
/obj/machinery/door/airlock/command/glass,
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/all/command/general,
/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "bridge_upper";
+ layer = 2.6;
+ name = "Emergency Blast Door"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -20926,10 +20924,15 @@
},
/area/station/science/toxins/mixing)
"cpB" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel/white,
-/area/station/science/hallway)
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/maintenance/gambling_den)
"cpC" = (
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
@@ -21101,17 +21104,17 @@
},
/area/station/science/hallway)
"cqV" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "purple"
@@ -21269,6 +21272,11 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -21719,6 +21727,11 @@
pixel_y = -24;
name = "south bump"
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
@@ -21738,6 +21751,11 @@
name = "Starboard Asteroid Maintenance Access"
},
/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/supply/miningdock)
"cwJ" = (
@@ -22219,22 +22237,17 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior/secondary)
"cAU" = (
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"cAW" = (
@@ -22363,6 +22376,11 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -22658,6 +22676,11 @@
d2 = 4;
icon_state = "1-4"
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/north)
"cDO" = (
@@ -22734,17 +22757,6 @@
/obj/structure/flora/ausbushes/sunnybush,
/turf/simulated/floor/grass,
/area/station/security/lobby)
-"cEH" = (
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/structure/railing{
- dir = 8
- },
-/turf/simulated/floor/plasteel,
-/area/station/security/lobby)
"cEL" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -22779,17 +22791,22 @@
},
/area/station/security/warden)
"cEX" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -23166,6 +23183,11 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/gambling_den)
"cGw" = (
@@ -23290,6 +23312,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -23306,6 +23333,11 @@
pixel_x = -24;
name = "west bump"
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
@@ -23318,17 +23350,13 @@
/turf/simulated/floor/grass,
/area/station/hallway/secondary/exit)
"cHm" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/power/apc/directional/south,
/obj/structure/cable/orange{
- d1 = 1;
d2 = 8;
- icon_state = "1-8"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+ icon_state = "0-8"
},
-/area/station/maintenance/fsmaint)
+/turf/simulated/floor/plasteel,
+/area/station/public/fitness)
"cHq" = (
/turf/simulated/wall,
/area/station/public/quantum/cargo)
@@ -23417,6 +23445,11 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"cHG" = (
@@ -23522,6 +23555,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/north)
"cIA" = (
@@ -23751,17 +23789,17 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -23936,16 +23974,8 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/machinery/power/apc/directional/east,
-/obj/structure/cable/orange{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/effect/turf_decal/stripes/end{
- dir = 8
- },
/turf/simulated/floor/plating,
-/area/station/legal/magistrate)
+/area/station/maintenance/fpmaint)
"cKA" = (
/obj/item/clothing/head/sombrero/shamebrero,
/turf/simulated/floor/plating/asteroid/ancient/airless,
@@ -23975,6 +24005,11 @@
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -24029,11 +24064,6 @@
},
/area/station/service/bar)
"cLo" = (
-/obj/machinery/power/apc/directional/west,
-/obj/effect/turf_decal/stripes/end{
- dir = 4
- },
-/obj/structure/cable/orange,
/turf/simulated/floor/plating,
/area/station/public/fitness)
"cLq" = (
@@ -24054,6 +24084,11 @@
"cLt" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/firealarm/directional/west,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
@@ -24075,16 +24110,27 @@
},
/area/station/maintenance/fore2)
"cLz" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/obj/structure/railing{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/turf/simulated/floor/plasteel,
-/area/station/security/lobby)
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/central/north)
"cLA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -24092,6 +24138,11 @@
c_tag = "Security Lobby East";
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -24166,11 +24217,6 @@
/area/station/command/office/hop)
"cMa" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/door/poddoor/preopen{
- id_tag = "bridge";
- layer = 2.6;
- name = "Emergency Blast Door"
- },
/obj/machinery/door/airlock/command/glass{
name = "Bridge Foyer"
},
@@ -24180,6 +24226,11 @@
/obj/effect/mapping_helpers/airlock/polarized{
id = "bridge"
},
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "bridge_lower";
+ layer = 2.6;
+ name = "Emergency Blast Door"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkblue"
@@ -24194,11 +24245,6 @@
/turf/simulated/floor/plating,
/area/station/legal/magistrate)
"cMm" = (
-/obj/machinery/door/poddoor/preopen{
- id_tag = "bridge";
- layer = 2.6;
- name = "Emergency Blast Door"
- },
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
name = "Bridge Foyer"
@@ -24209,6 +24255,11 @@
/obj/effect/mapping_helpers/airlock/polarized{
id = "bridge"
},
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "bridge_lower";
+ layer = 2.6;
+ name = "Emergency Blast Door"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkblue"
@@ -25031,6 +25082,11 @@
/obj/item/storage/firstaid/o2,
/obj/item/storage/firstaid/brute,
/obj/item/storage/firstaid/brute,
+/obj/structure/cable/orange{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/machinery/power/apc/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -25368,14 +25424,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/cable{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -25489,7 +25545,7 @@
"cSo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -25511,35 +25567,6 @@
icon_state = "white"
},
/area/station/medical/virology)
-"cSI" = (
-/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"
- },
-/obj/structure/sign/directions/evac{
- dir = 4;
- pixel_y = 24
- },
-/obj/structure/sign/directions/medical{
- dir = 4;
- pixel_y = 32
- },
-/obj/structure/sign/directions/cargo{
- dir = 4;
- pixel_y = 40
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "purple"
- },
-/area/station/hallway/primary/aft/west)
"cSJ" = (
/obj/structure/closet/secure_closet/magistrate,
/obj/item/megaphone,
@@ -25592,25 +25619,31 @@
/turf/simulated/wall,
/area/station/hallway/spacebridge/serveng)
"cSU" = (
+/obj/structure/disposalpipe/segment,
/obj/structure/cable/orange{
d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+ d2 = 8;
+ icon_state = "2-8"
},
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/area/station/maintenance/fpmaint)
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "redcorner"
+ },
+/area/station/security/lobby)
"cSV" = (
/obj/structure/cable/orange{
+ d1 = 4;
d2 = 8;
- icon_state = "0-8"
+ icon_state = "4-8"
},
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 8
+/turf/simulated/floor/plasteel{
+ icon_state = "cult"
},
-/obj/machinery/power/apc/directional/north,
-/turf/simulated/floor/plating,
/area/station/legal/lawoffice)
"cSW" = (
/obj/structure/chair/comfy/black,
@@ -26473,6 +26506,11 @@
},
/obj/machinery/atmospherics/pipe/simple/visible/universal,
/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel,
/area/station/command/office/ce)
"cWg" = (
@@ -26524,11 +26562,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -26623,7 +26656,7 @@
icon_state = "0-2"
},
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/aft_starboard)
"cXJ" = (
/turf/simulated/wall/r_wall,
/area/station/hallway/spacebridge/cargocom)
@@ -26717,6 +26750,11 @@
dir = 8
},
/obj/structure/disposalpipe/segment,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
@@ -26972,6 +27010,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "escape"
@@ -27035,11 +27078,6 @@
},
/area/station/supply/sorting)
"dcC" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/obj/item/assembly/mousetrap/armed,
/obj/structure/disposalpipe/segment/corner{
dir = 8
@@ -27800,7 +27838,7 @@
/obj/effect/spawner/airlock/w_to_e,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft)
"dgO" = (
/obj/structure/girder,
/obj/item/stack/sheet/metal,
@@ -27880,7 +27918,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/aft_starboard)
"dhu" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
@@ -27895,7 +27933,7 @@
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft)
"dhy" = (
/obj/structure/disposaloutlet{
dir = 8
@@ -27964,11 +28002,6 @@
/obj/structure/disposalpipe/segment/corner{
dir = 1
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -28067,11 +28100,6 @@
},
/area/station/command/bridge)
"djn" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/obj/structure/cable/orange{
d1 = 1;
d2 = 4;
@@ -28167,6 +28195,11 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_often,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "escape"
@@ -28312,6 +28345,8 @@
/turf/simulated/floor/plating,
/area/station/engineering/tech_storage)
"dla" = (
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable/orange,
/turf/simulated/floor/plasteel{
icon_state = "whitegreen"
},
@@ -28328,18 +28363,11 @@
"dlf" = (
/obj/structure/cable/orange{
d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+ d2 = 4;
+ icon_state = "2-4"
},
-/area/station/maintenance/fpmaint)
+/turf/simulated/floor/carpet,
+/area/station/legal/lawoffice)
"dlj" = (
/turf/simulated/floor/plasteel{
icon_state = "neutral"
@@ -28366,33 +28394,19 @@
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/port)
"dlp" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/structure/railing/corner{
- dir = 1;
- pixel_y = 11
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
},
/area/station/security/lobby)
"dlq" = (
-/obj/machinery/power/apc/directional/east,
-/obj/structure/cable/orange{
- d2 = 8;
- icon_state = "0-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -28437,6 +28451,11 @@
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel,
/area/station/public/locker)
"dlT" = (
@@ -28664,6 +28683,11 @@
dir = 4;
color = "#954535"
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -28709,11 +28733,6 @@
pixel_x = -32
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -28763,7 +28782,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -29003,6 +29022,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
@@ -29146,11 +29170,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -29175,6 +29194,11 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -29194,6 +29218,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -29550,7 +29579,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"dte" = (
/obj/structure/table/glass/reinforced,
/obj/item/eftpos/register,
@@ -30157,17 +30186,16 @@
/turf/simulated/floor/plating,
/area/station/hallway/primary/starboard/south)
"dwt" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/directional/west,
/obj/structure/cable/orange{
- d2 = 4;
- icon_state = "0-4"
+ d2 = 8;
+ icon_state = "0-8"
},
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 4
+/obj/machinery/power/apc/directional/east,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "neutralcorner"
},
-/turf/simulated/floor/plating,
-/area/station/science/xenobiology)
+/area/station/hallway/secondary/entry/north)
"dww" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -31097,6 +31125,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -31128,6 +31161,11 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteyellowcorner"
@@ -31164,6 +31202,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -31326,6 +31369,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/carpet/arcade,
/area/station/public/arcade)
"dCF" = (
@@ -31373,31 +31421,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/fore/west)
-"dCS" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/maintenance/starboard)
-"dCT" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/maintenance/starboard)
"dCU" = (
/obj/structure/closet/emcloset,
/obj/effect/spawner/lootdrop/maintenance,
@@ -31512,6 +31535,16 @@
color = "#954535"
},
/obj/structure/disposalpipe/segment,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -31533,6 +31566,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteyellow"
@@ -31619,21 +31657,13 @@
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/fore)
"dGH" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
+/obj/machinery/power/apc/directional/south,
/obj/structure/cable/orange{
- d1 = 4;
d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+ icon_state = "0-8"
},
-/area/station/maintenance/fsmaint)
+/turf/simulated/floor/plating,
+/area/station/maintenance/disposal)
"dGK" = (
/obj/structure/chair/sofa/pew/right{
dir = 8
@@ -31646,7 +31676,7 @@
/area/station/service/chapel)
"dGU" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/starboardsolar/aft)
+/area/station/maintenance/solar_maintenance/aft)
"dHb" = (
/obj/machinery/light/small{
dir = 1
@@ -31795,11 +31825,6 @@
dir = 6
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"dKd" = (
@@ -31865,7 +31890,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"dKK" = (
/obj/structure/disposalpipe/segment/corner{
dir = 8
@@ -31939,7 +31964,7 @@
dir = 9
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar/aft)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dLh" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -31951,6 +31976,11 @@
name = "south bump";
pixel_y = -28
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -32019,6 +32049,11 @@
},
/obj/item/storage/belt/utility,
/obj/machinery/firealarm/directional/south,
+/obj/machinery/power/apc/directional/east,
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "whitepurple"
@@ -32201,7 +32236,7 @@
"dOC" = (
/obj/effect/spawner/random_spawners/dirt_frequent,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"dOJ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
level = 2
@@ -32299,6 +32334,11 @@
dir = 1;
color = "#954535"
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -32349,15 +32389,15 @@
"dQF" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/disposalpipe/segment{
dir = 4;
color = "#954535"
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "bluered"
@@ -32368,15 +32408,15 @@
name = "Aft Asteroid Maintenance"
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/spawner/random_spawners/dirt_frequent,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"dQT" = (
@@ -32502,22 +32542,6 @@
icon_state = "neutralfull"
},
/area/station/hallway/primary/fore/north)
-"dSA" = (
-/obj/machinery/power/apc/directional/west,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable/orange,
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/service/hydroponics)
"dSD" = (
/obj/machinery/flasher{
id = "Cell 4";
@@ -32679,14 +32703,6 @@
/area/station/maintenance/fpmaint)
"dUP" = (
/obj/effect/spawner/random_spawners/dirt_frequent,
-/obj/machinery/power/apc/directional/south,
-/obj/structure/cable/orange{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/effect/turf_decal/stripes/end{
- dir = 1
- },
/turf/simulated/floor/plating,
/area/station/supply/storage)
"dUR" = (
@@ -32826,6 +32842,14 @@
icon_state = "purple"
},
/area/station/hallway/primary/aft/west)
+"dWQ" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/turf/space,
+/area/station/engineering/solar/aft_starboard)
"dXx" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -32927,6 +32951,11 @@
dir = 8
},
/obj/effect/spawner/random_spawners/dirt_often,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -33289,6 +33318,11 @@
},
/obj/effect/mapping_helpers/airlock/access/all/medical/morgue,
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -33355,7 +33389,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft)
"eil" = (
/obj/structure/disposaloutlet{
dir = 4
@@ -33622,11 +33656,6 @@
/area/station/engineering/control)
"emN" = (
/obj/machinery/light/small,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"emQ" = (
@@ -33636,7 +33665,7 @@
icon_state = "0-2"
},
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/fore_starboard)
"emS" = (
/obj/machinery/door/airlock/maintenance{
name = "Fore Asteroid Maintenance Access"
@@ -33646,6 +33675,11 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"emX" = (
@@ -33737,7 +33771,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -33767,14 +33801,8 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/asteroid/end,
-/obj/machinery/power/apc/directional/north,
-/obj/structure/cable/orange{
- d2 = 4;
- icon_state = "0-4"
- },
/turf/simulated/floor/plating,
-/area/station/science/misc_lab)
+/area/station/maintenance/apmaint)
"eob" = (
/obj/structure/cable{
d1 = 1;
@@ -33968,23 +33996,23 @@
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/west)
"etb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/structure/disposalpipe/segment{
+ color = "#954535"
},
/obj/structure/cable/orange{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
},
-/area/station/maintenance/asmaint)
+/area/station/hallway/primary/port/south)
"ete" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -34109,16 +34137,15 @@
},
/area/station/supply/break_room)
"euL" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
-/area/station/maintenance/asmaint)
+/area/station/science/test_chamber)
"euP" = (
/obj/structure/railing,
/turf/space,
@@ -34136,11 +34163,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"evg" = (
@@ -34183,15 +34205,15 @@
/turf/space,
/area/station/hallway/spacebridge/cargocom)
"evC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"evL" = (
@@ -34271,6 +34293,11 @@
dir = 9
},
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"ewB" = (
@@ -34366,18 +34393,23 @@
},
/area/station/medical/medbay)
"eyB" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"eyH" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar/aft)
+/area/station/maintenance/solar_maintenance/aft)
"eyO" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -34474,6 +34506,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -34636,6 +34673,11 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_often,
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -34712,6 +34754,11 @@
icon_state = "2-4"
},
/obj/effect/spawner/random_spawners/dirt_often,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/fore)
"eDv" = (
@@ -34917,6 +34964,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel/white,
/area/station/science/test_chamber)
"eGC" = (
@@ -35114,34 +35166,36 @@
},
/area/station/public/quantum/docking)
"eJf" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/station/maintenance/apmaint)
"eJF" = (
-/obj/machinery/power/apc/directional/south,
-/obj/structure/cable/orange,
-/obj/effect/turf_decal/stripes/end{
- dir = 1
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/floor/plating,
-/area/station/public/locker)
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/primary/port/south)
"eJV" = (
/obj/structure/cable{
d1 = 4;
@@ -35173,6 +35227,11 @@
pixel_y = -24;
pixel_x = -5
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -35203,6 +35262,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkbrown"
@@ -35296,7 +35360,7 @@
/obj/item/solar_assembly,
/obj/item/tracker_electronics,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar/aft)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"eMc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -35338,7 +35402,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"eMR" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -35421,6 +35485,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/carpet/green,
/area/station/service/library)
"eOu" = (
@@ -35487,6 +35556,11 @@
name = "Mining Warehouse Shutters";
pixel_x = -24
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plating,
/area/station/supply/miningdock)
"ePu" = (
@@ -35497,15 +35571,15 @@
/turf/simulated/floor/plating,
/area/station/service/janitor)
"ePG" = (
-/obj/machinery/power/apc/directional/south,
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 1
+/obj/machinery/power/apc/critical/directional/south,
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
},
-/obj/structure/cable/orange,
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
},
-/area/station/public/vacant_office)
+/area/station/medical/morgue)
"ePI" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -35609,14 +35683,14 @@
},
/area/station/science/toxins/launch)
"eST" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"eTg" = (
@@ -35740,13 +35814,22 @@
},
/area/station/engineering/break_room/secondary)
"eUS" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "chapel"
+ },
+/area/station/service/chapel)
"eUU" = (
/obj/structure/disposalpipe/junction{
dir = 1
@@ -35793,7 +35876,7 @@
/obj/machinery/atmospherics/unary/portables_connector,
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar/aft)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"eWa" = (
/obj/structure/cable{
d1 = 4;
@@ -36153,14 +36236,18 @@
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"fbA" = (
-/obj/machinery/power/apc/directional/east,
+/obj/structure/closet/crate,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/structure/cable{
+ d1 = 1;
d2 = 8;
- icon_state = "0-8"
+ icon_state = "1-8"
},
-/obj/effect/spawner/random_spawners/dirt_often,
-/turf/simulated/floor/plating,
-/area/station/hallway/primary/central/north)
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/maintenance/asmaint)
"fcm" = (
/obj/structure/chair/office/dark{
dir = 1
@@ -36300,14 +36387,14 @@
dir = 8;
color = "#954535"
},
-/obj/structure/cable{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -36362,11 +36449,6 @@
/area/station/science/explab/chamber)
"fgi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
@@ -36515,6 +36597,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkgreenfull"
},
@@ -36558,14 +36645,14 @@
},
/area/station/supply/lobby)
"fka" = (
+/obj/structure/closet/crate,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/disposalpipe/segment/corner,
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/disposalpipe/segment/corner,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"fkc" = (
@@ -36642,14 +36729,14 @@
/area/station/maintenance/fore)
"flM" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/structure/cable{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -36660,7 +36747,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/aft_starboard)
"fms" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -36792,8 +36879,14 @@
/turf/simulated/floor/plating,
/area/station/hallway/secondary/entry/south)
"foP" = (
-/obj/structure/grille,
-/turf/simulated/floor/plating/asteroid/ancient,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
/area/station/maintenance/asmaint)
"fph" = (
/obj/effect/spawner/window/reinforced,
@@ -36836,6 +36929,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/spawner/random_spawners/dirt_often,
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/directional/east,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -36964,6 +37062,11 @@
},
/obj/effect/mapping_helpers/airlock/access/any/security/doors,
/obj/effect/mapping_helpers/airlock/access/any/security/court,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/carpet,
/area/station/security/processing)
"frV" = (
@@ -37076,7 +37179,7 @@
},
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"ful" = (
/turf/simulated/wall/r_wall,
/area/station/turret_protected/ai_upload)
@@ -37385,11 +37488,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -37913,6 +38011,11 @@
dir = 4;
color = "#954535"
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "purplecorner"
@@ -38088,6 +38191,11 @@
dir = 9
},
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plating,
/area/station/supply/miningdock)
"fLH" = (
@@ -38130,7 +38238,7 @@
"fMG" = (
/obj/structure/table,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"fMH" = (
/obj/machinery/door/airlock/maintenance{
name = "Security SMES Access"
@@ -38142,7 +38250,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/hallway/primary/fore/west)
+/area/station/maintenance/fpmaint)
"fMK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
@@ -38381,7 +38489,7 @@
icon_state = "0-4"
},
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/fore_starboard)
"fPZ" = (
/obj/item/stack/ore/glass,
/obj/effect/turf_decal/box,
@@ -38673,6 +38781,8 @@
"fUT" = (
/obj/item/kirbyplants/plant21,
/obj/effect/spawner/random_spawners/dirt_often,
+/obj/machinery/power/apc/directional/east,
+/obj/structure/cable/orange,
/turf/simulated/floor/plasteel{
icon_state = "redyellowfull"
},
@@ -39067,17 +39177,12 @@
},
/area/station/science/xenobiology)
"gak" = (
-/obj/structure/cable/orange{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"gaO" = (
@@ -39274,6 +39379,11 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkbrown"
@@ -39448,13 +39558,24 @@
},
/area/station/command/bridge)
"giH" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ color = "#954535"
+ },
+/obj/machinery/power/apc/directional/south,
/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d2 = 8;
+ icon_state = "0-8"
},
-/turf/simulated/floor/transparent/glass/reinforced,
-/area/station/maintenance/apmaint)
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "purple"
+ },
+/area/station/hallway/primary/aft/west)
"giI" = (
/obj/structure/table,
/obj/item/clipboard{
@@ -39480,11 +39601,6 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"giT" = (
@@ -39636,11 +39752,6 @@
},
/area/station/maintenance/gambling_den)
"glw" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitegreen"
@@ -39888,22 +39999,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
-"gpY" = (
-/obj/machinery/power/apc/directional/west,
-/obj/structure/cable/orange{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/stripes/end{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/supply/warehouse)
"gpZ" = (
/obj/effect/landmark/damageturf,
/turf/simulated/floor/wood,
@@ -40516,6 +40611,11 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -40743,13 +40843,7 @@
/turf/simulated/floor/engine,
/area/station/science/explab/chamber)
"gEL" = (
-/obj/structure/cable/orange{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/machinery/power/apc/directional/north,
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/turf_decal/stripes/end,
/turf/simulated/floor/plating,
/area/station/hallway/primary/port/north)
"gES" = (
@@ -40819,6 +40913,11 @@
"gGb" = (
/obj/machinery/light/small,
/obj/effect/spawner/random_spawners/dirt_often,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -40922,11 +41021,6 @@
c_tag = "Docking Asteroid Hall 2";
dir = 6
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -41127,6 +41221,9 @@
"gLO" = (
/obj/machinery/power/smes/engineering,
/obj/structure/cable/orange,
+/obj/structure/sign/electricshock{
+ pixel_y = -32
+ },
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/starboard)
"gLW" = (
@@ -41468,11 +41565,6 @@
/area/station/maintenance/disposal/south)
"gRw" = (
/mob/living/simple_animal/mouse/white,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -41581,6 +41673,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitebluecorner"
@@ -41771,7 +41868,7 @@
},
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"gXL" = (
/obj/structure/closet/firecloset/full,
/turf/simulated/floor/plating,
@@ -42317,21 +42414,10 @@
},
/area/station/science/robotics)
"hfi" = (
-/obj/machinery/power/apc/directional/north,
-/obj/effect/turf_decal/stripes/asteroid/end,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/cable/orange{
- d2 = 8;
- icon_state = "0-8"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/service/theatre)
+/obj/machinery/power/apc/directional/east,
+/obj/structure/cable/orange,
+/turf/simulated/floor/plasteel,
+/area/station/supply/miningdock)
"hfx" = (
/obj/machinery/door/airlock/public/glass{
name = "Walkway"
@@ -42546,22 +42632,16 @@
icon_state = "escape"
},
/area/station/hallway/secondary/exit)
-"hjJ" = (
-/obj/machinery/power/apc/directional/north,
-/obj/structure/cable/orange{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/effect/turf_decal/stripes/end,
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/medical/storage/secondary)
"hjM" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitebluecorner"
@@ -43197,6 +43277,11 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -43398,7 +43483,7 @@
},
/obj/machinery/power/smes,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft)
"hyo" = (
/obj/machinery/light{
dir = 4
@@ -43476,21 +43561,16 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port2)
"hzn" = (
+/obj/item/assembly/mousetrap/armed,
/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/machinery/power/apc/directional/west,
-/obj/structure/cable/orange,
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 4
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
-/area/station/service/kitchen)
+/area/station/maintenance/gambling_den)
"hzs" = (
/obj/machinery/power/apc/directional/east,
/obj/structure/cable/orange{
@@ -43531,11 +43611,6 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/turbine)
"hAh" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/barricade/wooden,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -44151,11 +44226,16 @@
/turf/simulated/floor/plasteel,
/area/station/public/storage/tools/auxiliary)
"hIU" = (
-/obj/structure/cable/orange,
-/obj/machinery/power/apc/directional/south,
-/obj/effect/landmark/damageturf,
-/turf/simulated/floor/wood,
-/area/station/maintenance/gambling_den)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/maintenance/apmaint)
"hIX" = (
/obj/machinery/atmospherics/meter,
/obj/machinery/atmospherics/pipe/manifold/visible{
@@ -44283,24 +44363,16 @@
/turf/simulated/floor/engine,
/area/station/science/misc_lab)
"hLs" = (
-/obj/structure/cable/orange{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/apmaint)
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/north)
"hLu" = (
/obj/structure/cable/orange{
d1 = 2;
@@ -44313,7 +44385,7 @@
"hLx" = (
/obj/effect/spawner/random_spawners/fungus_maybe,
/turf/simulated/wall,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"hLB" = (
/obj/structure/closet/secure_closet/quartermaster,
/turf/simulated/floor/plasteel{
@@ -44363,6 +44435,11 @@
/obj/item/cartridge/signal/toxins,
/obj/item/cartridge/signal/toxins,
/obj/item/cartridge/signal/toxins,
+/obj/machinery/power/apc/directional/east,
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -44396,7 +44473,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft)
"hOa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -44553,6 +44630,11 @@
icon_state = "2-4"
},
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/apmaint)
"hQs" = (
@@ -44617,11 +44699,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -44680,6 +44757,11 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -44711,11 +44793,6 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_frequent,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "escape"
@@ -44773,8 +44850,10 @@
},
/area/station/security/brig)
"hSc" = (
-/obj/structure/sign/electricshock{
- pixel_y = -32
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
},
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/starboard)
@@ -45125,6 +45204,11 @@
suffix = "#2"
},
/obj/effect/turf_decal/delivery/hollow,
+/obj/machinery/power/apc/directional/north,
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "darkbrown"
@@ -45340,6 +45424,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/supply/miningdock)
"ial" = (
@@ -45480,6 +45569,11 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
@@ -45530,11 +45624,6 @@
},
/area/station/hallway/primary/aft/west)
"idK" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/sign/poster/contraband/random{
pixel_x = -32
},
@@ -45557,6 +45646,11 @@
/obj/structure/table,
/obj/machinery/recharger,
/obj/machinery/firealarm/directional/east,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "darkred"
@@ -45586,6 +45680,11 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -45635,19 +45734,6 @@
},
/turf/simulated/floor/transparent/glass/reinforced/plasma,
/area/station/engineering/control)
-"ieS" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/maintenance/starboard)
"ieY" = (
/obj/machinery/door/airlock/external/glass{
name = "Escape Pod Airlock"
@@ -45701,6 +45787,11 @@
color = "#954535"
},
/obj/machinery/light,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "purple"
},
@@ -45738,7 +45829,7 @@
icon_state = "1-8"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft)
"igo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -45777,11 +45868,6 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/cable/orange{
d1 = 1;
d2 = 8;
@@ -46356,11 +46442,6 @@
/area/station/security/brig)
"ipB" = (
/obj/item/coin/antagtoken,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior/secondary)
"ipD" = (
@@ -46392,6 +46473,11 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
@@ -46429,12 +46515,20 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/public/storage/tools/auxiliary)
"iqy" = (
/obj/structure/closet/secure_closet/research_reagents,
/turf/simulated/floor/engine,
/area/station/science/misc_lab)
+"iqA" = (
+/turf/simulated/wall/r_wall,
+/area/station/maintenance/solar_maintenance/aft_starboard)
"iqJ" = (
/obj/machinery/door/airlock/public/glass{
name = "Walkway"
@@ -46685,6 +46779,11 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable/orange{
+ d2 = 4;
+ icon_state = "0-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -46787,7 +46886,7 @@
icon_state = "0-4"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"iuS" = (
/obj/machinery/door/airlock/command,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -46829,18 +46928,29 @@
/area/station/hallway/secondary/entry/north)
"ivK" = (
/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/primary/fore/east)
"ivP" = (
/obj/structure/chair/comfy/brown{
dir = 4
},
/obj/effect/landmark/start/assistant,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/carpet,
/area/station/public/locker)
"ivS" = (
@@ -46971,17 +47081,18 @@
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/maintcentral)
"ixC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/light/small{
+ dir = 1
},
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
-/area/station/hallway/secondary/exit)
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/maintenance/asmaint)
"ixE" = (
/obj/structure/disposalpipe/junction/reversed{
dir = 4
@@ -47111,7 +47222,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/fore_starboard)
"izY" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -47204,6 +47315,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
+/obj/machinery/power/apc/directional/east,
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkredcheck"
},
@@ -47430,16 +47546,25 @@
/turf/simulated/floor/plasteel,
/area/station/public/storage/tools/auxiliary)
"iFb" = (
-/obj/machinery/power/apc/directional/east,
-/obj/effect/turf_decal/stripes/line{
- dir = 9
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ color = "#954535"
},
+/obj/machinery/power/apc/directional/south,
/obj/structure/cable/orange{
- d2 = 2;
- icon_state = "0-2"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/floor/plating,
-/area/station/public/quantum/cargo)
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "purplecorner"
+ },
+/area/station/hallway/primary/aft/east)
"iFj" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -47448,6 +47573,11 @@
/obj/machinery/light{
dir = 1
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -47567,11 +47697,6 @@
name = "Bridge APC Access"
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"iHT" = (
@@ -47791,7 +47916,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"iKW" = (
/obj/structure/table/wood,
/obj/item/lighter/zippo/blue{
@@ -48013,6 +48138,11 @@
color = "#954535"
},
/obj/machinery/light,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "purplecorner"
@@ -48188,14 +48318,14 @@
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"iRD" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -48228,7 +48358,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -48470,17 +48600,6 @@
},
/area/station/service/hydroponics)
"iUb" = (
-/obj/structure/cable/orange{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/effect/turf_decal/stripes/end{
- dir = 4
- },
-/obj/machinery/power/apc/important/directional/west{
- name = "Cryo and Arrivals Super APC";
- cell_type = 15000
- },
/turf/simulated/floor/plating,
/area/station/public/sleep/secondary)
"iUh" = (
@@ -48583,6 +48702,11 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -48596,14 +48720,16 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"iWO" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
},
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
+ },
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/maintenance/port2)
"iWR" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -48678,6 +48804,9 @@
/obj/structure/window/reinforced{
dir = 8
},
+/obj/structure/sink{
+ pixel_y = 24
+ },
/turf/simulated/floor/grass,
/area/station/science/genetics)
"iXD" = (
@@ -48724,6 +48853,11 @@
d2 = 8;
icon_state = "1-8"
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
@@ -48737,21 +48871,11 @@
/area/station/science/misc_lab)
"iYL" = (
/obj/effect/spawner/random_spawners/dirt_often,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
/area/station/maintenance/asmaint)
"iYO" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/hallway/primary/central/north)
@@ -49073,6 +49197,11 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"jci" = (
@@ -49093,7 +49222,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft)
"jcm" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -49101,6 +49230,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -49154,16 +49288,16 @@
pixel_y = 40
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
@@ -49171,13 +49305,12 @@
/area/station/hallway/secondary/entry/east)
"jdL" = (
/obj/structure/cable/orange{
- d1 = 1;
+ d1 = 2;
d2 = 8;
- icon_state = "1-8"
+ icon_state = "2-8"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
+/turf/simulated/floor/carpet/arcade,
+/area/station/public/arcade)
"jdN" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -49302,7 +49435,14 @@
/area/station/maintenance/apmaint)
"jfo" = (
/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/floor/plating/asteroid/ancient,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
/area/station/maintenance/asmaint)
"jft" = (
/turf/simulated/mineral/ancient,
@@ -49361,11 +49501,6 @@
"jgq" = (
/obj/structure/girder,
/obj/item/stack/sheet/metal,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -49805,20 +49940,18 @@
},
/area/station/hallway/spacebridge/comeng)
"jop" = (
-/obj/structure/cable/orange{
- d1 = 4;
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/cable{
d2 = 8;
- icon_state = "4-8"
+ icon_state = "0-8"
},
-/obj/structure/cable/orange{
+/obj/structure/cable{
d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+ d2 = 8;
+ icon_state = "1-8"
},
-/area/station/maintenance/apmaint)
+/turf/simulated/floor/plating,
+/area/station/turret_protected/aisat/interior/secondary)
"joE" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -50038,24 +50171,16 @@
d2 = 4;
icon_state = "1-4"
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
/area/station/maintenance/asmaint)
-"jrJ" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
"jrM" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/door/airlock/maintenance{
name = "Port Asteroid Maintenance"
},
@@ -50209,11 +50334,6 @@
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/random_spawners/dirt_frequent,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"jtk" = (
@@ -50408,24 +50528,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plating,
-/area/station/supply/miningdock)
-"jvx" = (
/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/area/station/maintenance/port)
+/turf/simulated/floor/plating,
+/area/station/supply/miningdock)
"jvA" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/disposalpipe/segment{
@@ -50803,14 +50912,15 @@
/turf/simulated/floor/plating,
/area/station/maintenance/gambling_den)
"jAg" = (
-/obj/machinery/power/apc/directional/north,
-/obj/effect/turf_decal/stripes/asteroid/end,
/obj/structure/cable/orange{
+ d1 = 1;
d2 = 2;
- icon_state = "0-2"
+ icon_state = "1-2"
},
-/turf/simulated/floor/plating/asteroid/ancient,
-/area/station/supply/break_room)
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/medical/storage/secondary)
"jAn" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -51033,6 +51143,11 @@
dir = 1;
sort_type_txt = "20"
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -51163,6 +51278,11 @@
dir = 4;
color = "#954535"
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "purple"
},
@@ -51281,11 +51401,6 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "purple"
@@ -51490,11 +51605,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
@@ -51502,10 +51612,15 @@
pixel_y = 24;
name = "north bump"
},
-/obj/structure/cable{
- d1 = 2;
+/obj/structure/cable/orange{
+ d1 = 4;
d2 = 8;
- icon_state = "2-8"
+ icon_state = "4-8"
+ },
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -51626,21 +51741,15 @@
},
/area/station/hallway/primary/fore/west)
"jLe" = (
-/obj/machinery/power/apc/directional/east,
/obj/structure/cable/orange{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 10
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
},
-/turf/simulated/floor/plating,
-/area/station/hallway/primary/fore/east)
+/area/station/hallway/secondary/entry/north)
"jLm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -51752,18 +51861,6 @@
icon_state = "whitegreenfull"
},
/area/station/public/quantum/cargo)
-"jNg" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Starboard Asteroid Maintenance Access"
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
"jNk" = (
/obj/structure/sign/chinese{
pixel_x = -32;
@@ -51839,11 +51936,6 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_often,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -52102,7 +52194,7 @@
/obj/machinery/atmospherics/portable/canister/air,
/obj/machinery/atmospherics/unary/portables_connector,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft)
"jRW" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
@@ -52187,9 +52279,9 @@
dir = 4
},
/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -52299,6 +52391,11 @@
pixel_x = 28;
name = "custom placement"
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkred"
@@ -52344,7 +52441,7 @@
},
/obj/structure/barricade/wooden,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar/aft)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"jVa" = (
/obj/machinery/conveyor/auto{
dir = 4
@@ -52515,6 +52612,11 @@
},
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
@@ -52546,6 +52648,11 @@
},
/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/alarm/directional/north,
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkbrown"
@@ -52649,7 +52756,7 @@
},
/obj/structure/cable,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft)
"kaY" = (
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 8
@@ -52683,11 +52790,6 @@
/turf/simulated/floor/plating,
/area/station/hallway/primary/central/north)
"kbo" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/light/small{
dir = 4
},
@@ -52752,19 +52854,6 @@
icon_state = "dark"
},
/area/station/service/hydroponics)
-"kcF" = (
-/obj/machinery/power/apc/directional/east,
-/obj/structure/cable/orange{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 8
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/hallway/secondary/exit)
"kcG" = (
/obj/structure/disposalpipe/trunk{
color = "#954535"
@@ -52975,6 +53064,11 @@
dir = 4
},
/obj/effect/spawner/window/reinforced,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/supply/sorting)
"kgd" = (
@@ -53003,6 +53097,8 @@
},
/area/station/supply/office)
"kgP" = (
+/obj/machinery/power/apc/directional/east,
+/obj/structure/cable/orange,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkyellowcorners"
@@ -53023,6 +53119,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -53396,7 +53497,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/aft_starboard)
"knI" = (
/obj/structure/table,
/obj/item/book/manual/wiki/chef_recipes,
@@ -53483,11 +53584,6 @@
},
/area/station/medical/medbay)
"kps" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/disposalpipe/segment,
/obj/item/assembly/mousetrap/armed,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -54258,15 +54354,20 @@
},
/area/station/engineering/atmos/distribution)
"kCg" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ color = "#954535"
+ },
/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
+ dir = 8;
+ icon_state = "purplecorner"
},
-/area/station/hallway/primary/aft/west)
+/area/station/hallway/primary/aft/east)
"kCC" = (
/obj/structure/table,
/obj/item/kitchen/knife,
@@ -54300,13 +54401,13 @@
},
/area/station/hallway/primary/central/north)
"kDf" = (
-/obj/structure/cable{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "darkpurple"
},
@@ -54351,13 +54452,13 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
- },
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/caution/stand_clear,
/obj/machinery/power/apc/important/directional/north,
+/obj/structure/cable/orange{
+ d2 = 2;
+ icon_state = "0-2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkpurple"
@@ -54449,11 +54550,6 @@
dir = 10
},
/obj/structure/disposalpipe/segment/corner,
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -54497,7 +54593,7 @@
/area/station/maintenance/apmaint)
"kGR" = (
/turf/simulated/mineral/ancient/outer,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"kHq" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/orange{
@@ -54571,6 +54667,11 @@
/obj/machinery/firealarm/directional/east,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteblue"
@@ -54780,6 +54881,11 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/service/theatre)
"kLk" = (
@@ -54847,7 +54953,7 @@
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/aft_starboard)
"kLV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -54992,14 +55098,6 @@
icon_state = "yellow"
},
/area/station/public/storage/tools/auxiliary)
-"kMZ" = (
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/turf/simulated/floor/transparent/glass/reinforced,
-/area/station/maintenance/apmaint)
"kNw" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -55195,6 +55293,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -55341,6 +55444,11 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "chapel"
},
@@ -55348,9 +55456,9 @@
"kSI" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/station/medical/break_room)
@@ -55470,7 +55578,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/firealarm/directional/west,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -55593,7 +55701,7 @@
/turf/simulated/floor/engine,
/area/station/engineering/control)
"kVI" = (
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -55706,7 +55814,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -55722,16 +55830,15 @@
/turf/simulated/floor/carpet,
/area/station/medical/psych)
"kYZ" = (
-/obj/machinery/power/apc/directional/east,
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/effect/turf_decal/stripes/end{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
},
-/turf/simulated/floor/plating,
-/area/station/hallway/primary/starboard/south)
+/turf/simulated/floor/plasteel,
+/area/station/hallway/secondary/exit)
"kZb" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -55797,6 +55904,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable/orange{
+ d2 = 4;
+ icon_state = "0-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "chapel"
},
@@ -55989,10 +56101,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/obj/structure/cable/orange{
d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d2 = 8;
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
@@ -56033,12 +56150,12 @@
/turf/simulated/floor/plating,
/area/station/command/office/ntrep)
"ldH" = (
+/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/asmaint)
"ldL" = (
@@ -56060,6 +56177,11 @@
/obj/machinery/light{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"led" = (
@@ -56270,7 +56392,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar/aft)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"lht" = (
/obj/structure/grille/broken,
/obj/structure/disposalpipe/segment{
@@ -56460,11 +56582,6 @@
},
/area/station/hallway/primary/starboard/south)
"ljN" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/door/airlock/maintenance{
name = "Medbay Maintenance"
},
@@ -56605,11 +56722,6 @@
"llm" = (
/obj/structure/grille/broken,
/obj/item/chair/stool,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"llo" = (
@@ -56892,9 +57004,9 @@
icon_state = "4-8"
},
/obj/structure/cable/orange{
- d1 = 1;
+ d1 = 2;
d2 = 8;
- icon_state = "1-8"
+ icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -56979,12 +57091,19 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/supply/warehouse)
"lpZ" = (
/obj/effect/spawner/random_spawners/dirt_often,
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable/orange,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -57161,6 +57280,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel,
/area/station/command/office/rd)
"luv" = (
@@ -57429,19 +57553,6 @@
},
/turf/simulated/floor/plating,
/area/station/science/xenobiology)
-"lxo" = (
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
"lxu" = (
/obj/machinery/button/windowtint{
id = "Magistrate";
@@ -57472,19 +57583,28 @@
/area/station/science/hallway)
"lxO" = (
/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/cable/orange{
+ d1 = 2;
d2 = 4;
- icon_state = "0-4"
+ icon_state = "2-4"
},
-/obj/machinery/power/apc/directional/west,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore)
+/turf/simulated/floor/transparent/glass/reinforced,
+/area/station/maintenance/starboard)
"lxP" = (
/obj/structure/disposalpipe/segment{
dir = 4;
color = "#954535"
},
/obj/machinery/firealarm/directional/south,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "purple"
},
@@ -57624,11 +57744,6 @@
"lzz" = (
/obj/effect/spawner/random_spawners/dirt_frequent,
/obj/effect/decal/cleanable/glass,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"lzH" = (
@@ -57649,6 +57764,11 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "escape"
@@ -57696,10 +57816,6 @@
icon_state = "whiteblue"
},
/area/station/medical/medbay)
-"lAv" = (
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/station/engineering/solar/port)
"lAy" = (
/obj/structure/chair/sofa/pew/right{
dir = 8
@@ -57726,7 +57842,7 @@
/area/station/hallway/spacebridge/sercom)
"lBh" = (
/turf/simulated/mineral/ancient/outer,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"lBr" = (
/obj/machinery/light/small{
dir = 8
@@ -57847,13 +57963,24 @@
},
/area/station/maintenance/apmaint)
"lDe" = (
+/obj/structure/disposalpipe/segment{
+ color = "#954535"
+ },
/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/turf/simulated/floor/plating/asteroid/ancient,
-/area/station/maintenance/fsmaint)
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/port/south)
"lDh" = (
/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/atmospherics/portable/canister/sleeping_agent,
@@ -58033,7 +58160,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"lFB" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -58117,7 +58244,7 @@
},
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"lHd" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -58328,11 +58455,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"lKN" = (
@@ -58487,11 +58609,6 @@
/turf/simulated/floor/carpet/green,
/area/station/service/library)
"lOy" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/effect/spawner/random_spawners/dirt_frequent,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -58535,11 +58652,6 @@
dir = 10
},
/obj/structure/disposalpipe/segment/corner,
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
@@ -58881,6 +58993,8 @@
/obj/structure/table/reinforced,
/obj/machinery/reagentgrinder,
/obj/item/wrench,
+/obj/structure/cable/orange,
+/obj/machinery/power/apc/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
@@ -59035,6 +59149,11 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -59058,7 +59177,7 @@
"lVi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -59324,6 +59443,11 @@
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -59677,11 +59801,6 @@
/turf/simulated/floor/carpet/blue,
/area/station/command/office/hop)
"meS" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/item/assembly/mousetrap/armed,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
@@ -59913,6 +60032,11 @@
pixel_y = 28;
name = "north bump"
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "escape"
@@ -60001,7 +60125,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"mle" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -60142,6 +60266,11 @@
dir = 4
},
/obj/item/kirbyplants,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
@@ -60433,6 +60562,16 @@
name = "west bump";
pixel_x = 24
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"mrW" = (
@@ -60500,6 +60639,11 @@
pixel_y = 24;
name = "north bump"
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "escape"
@@ -60516,7 +60660,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft)
"mtB" = (
/obj/structure/disposalpipe/segment/corner{
dir = 1
@@ -60770,12 +60914,12 @@
name = "Docking Asteroid SMES Access"
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"mxh" = (
@@ -60788,14 +60932,14 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port2)
"mxj" = (
-/obj/structure/cable{
- d2 = 8;
- icon_state = "0-8"
- },
/obj/machinery/power/apc/important/directional/east{
name = "Cryo and Arrivals Super APC";
cell_type = 15000
},
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/south)
"mxn" = (
@@ -60946,11 +61090,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -61294,6 +61433,11 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"mGY" = (
@@ -61421,6 +61565,11 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"mJd" = (
@@ -61572,7 +61721,7 @@
/obj/structure/lattice,
/obj/item/wirecutters,
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/aft_starboard)
"mLz" = (
/obj/machinery/atmospherics/binary/valve{
dir = 1;
@@ -61596,11 +61745,6 @@
},
/area/station/maintenance/asmaint)
"mMw" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/disposalpipe/segment,
/obj/machinery/light/small{
dir = 8
@@ -61846,12 +61990,12 @@
"mQN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
+/obj/machinery/door/firedoor,
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -61960,7 +62104,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -62295,6 +62439,11 @@
},
/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/firealarm/directional/north,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkbrown"
@@ -62410,6 +62559,11 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/supply/miningdock)
"mYI" = (
@@ -62494,6 +62648,11 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "purplecorner"
@@ -62621,11 +62780,6 @@
name = "Medbay SMES Access"
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating,
/area/station/hallway/primary/starboard/south)
"nca" = (
@@ -62693,13 +62847,27 @@
},
/area/station/hallway/primary/central/west)
"ncP" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/floor/plating,
-/area/station/hallway/primary/starboard/south)
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "escape"
+ },
+/area/station/hallway/secondary/entry/east)
"ncQ" = (
/obj/structure/chair/sofa/corp/left,
/turf/simulated/floor/plasteel{
@@ -62711,6 +62879,17 @@
/obj/structure/sign/securearea,
/turf/simulated/wall,
/area/station/engineering/tech_storage)
+"nde" = (
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/starboard/south)
"ndl" = (
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "rd"
@@ -62980,11 +63159,6 @@
/obj/structure/disposalpipe/segment/corner{
color = "#954535"
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 4;
@@ -63126,17 +63300,15 @@
},
/area/station/public/locker)
"nkf" = (
-/obj/machinery/power/apc/directional/north,
/obj/structure/cable/orange{
+ d1 = 1;
d2 = 2;
- icon_state = "0-2"
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/end,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
},
-/turf/simulated/floor/plating,
-/area/station/medical/chemistry)
+/area/station/service/hydroponics)
"nks" = (
/obj/machinery/light{
dir = 1
@@ -63238,8 +63410,7 @@
d2 = 2;
icon_state = "0-2"
},
-/obj/effect/turf_decal/stripes/asteroid/end,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/apmaint)
"nlT" = (
/obj/structure/cable/orange{
@@ -63261,11 +63432,6 @@
/area/station/supply/lobby)
"nlZ" = (
/obj/machinery/porta_turret/ai_turret/disable,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -63274,14 +63440,6 @@
},
/area/station/turret_protected/aisat/interior/secondary)
"nmk" = (
-/obj/structure/cable/orange{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 1
- },
-/obj/machinery/power/apc/directional/south,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -63660,7 +63818,7 @@
},
/obj/effect/spawner/random_spawners/dirt_frequent,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"ntW" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -63693,6 +63851,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -63967,6 +64130,11 @@
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
/obj/machinery/door/firedoor,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/supply/miningdock)
"nyc" = (
@@ -64003,11 +64171,6 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_often,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"nyX" = (
@@ -64323,7 +64486,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/fore_starboard)
"nFy" = (
/obj/structure/cable{
d1 = 1;
@@ -64430,7 +64593,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -64577,11 +64740,6 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/cable/orange{
d1 = 1;
d2 = 4;
@@ -64608,6 +64766,11 @@
"nJX" = (
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/random_spawners/dirt_often,
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -64719,7 +64882,7 @@
},
/obj/structure/cable,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar/aft)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"nLc" = (
/obj/machinery/light{
dir = 8
@@ -64895,11 +65058,6 @@
name = "Service SMES Access"
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"nNN" = (
@@ -64919,12 +65077,15 @@
/area/station/command/bridge)
"nOi" = (
/obj/structure/cable/orange{
- d1 = 1;
+ d1 = 4;
d2 = 8;
- icon_state = "1-8"
+ icon_state = "4-8"
},
-/turf/simulated/floor/plating,
-/area/station/hallway/primary/port/north)
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/port/south)
"nOu" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
@@ -65123,11 +65284,6 @@
name = "Medbay SMES Access"
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating,
/area/station/hallway/primary/fore/east)
"nRf" = (
@@ -65140,11 +65296,6 @@
},
/area/station/public/sleep)
"nRk" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
@@ -65165,11 +65316,6 @@
},
/area/station/public/quantum/security)
"nRz" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
@@ -65269,11 +65415,6 @@
},
/area/station/science/toxins/launch)
"nUg" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plating,
/area/station/hallway/primary/starboard/south)
@@ -65384,17 +65525,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
-"nWA" = (
-/obj/machinery/power/apc/directional/west,
-/obj/effect/turf_decal/stripes/end{
- dir = 4
- },
-/obj/structure/cable/orange{
- d2 = 4;
- icon_state = "0-4"
- },
-/turf/simulated/floor/transparent/glass/reinforced,
-/area/station/science/rnd)
"nWK" = (
/obj/item/soap,
/turf/simulated/floor/plasteel{
@@ -65477,14 +65607,14 @@
},
/area/station/hallway/secondary/entry/east)
"nYR" = (
-/obj/structure/cable{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/firedoor,
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -65637,6 +65767,11 @@
dir = 4;
color = "#954535"
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "purplecorner"
},
@@ -65728,11 +65863,6 @@
},
/area/station/maintenance/gambling_den)
"oeh" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -65798,11 +65928,6 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/fore/east)
"oez" = (
@@ -66244,19 +66369,6 @@
icon_state = "dark"
},
/area/station/engineering/control)
-"ola" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
"olg" = (
/obj/machinery/door/airlock/maintenance{
name = "Docking Asteroid SMES Access"
@@ -66552,6 +66664,11 @@
},
/obj/structure/flora/junglebush,
/mob/living/simple_animal/butterfly,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/grass/jungle,
/area/station/hallway/secondary/garden)
"ooA" = (
@@ -66615,7 +66732,12 @@
"opl" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/cable{
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/cable/orange{
d1 = 1;
d2 = 8;
icon_state = "1-8"
@@ -66732,15 +66854,6 @@
},
/turf/simulated/floor/engine,
/area/station/science/test_chamber)
-"oqZ" = (
-/obj/effect/turf_decal/stripes/end,
-/obj/machinery/power/apc/directional/north,
-/obj/structure/cable/orange{
- d2 = 2;
- icon_state = "0-2"
- },
-/turf/simulated/floor/plating,
-/area/station/science/genetics)
"org" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -67052,7 +67165,7 @@
/area/station/security/brig)
"owf" = (
/turf/simulated/wall,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"owE" = (
/obj/effect/landmark/lightsout,
/turf/simulated/floor/plasteel{
@@ -67113,21 +67226,16 @@
},
/area/station/medical/break_room)
"oxk" = (
-/obj/structure/cable/orange{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/effect/turf_decal/stripes/end{
- dir = 1
- },
-/obj/machinery/power/apc/important/directional/south{
- name = "Cryo and Arrivals Super APC";
- cell_type = 15000
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/area/station/hallway/secondary/entry/east)
+/turf/simulated/floor/grass/jungle,
+/area/station/hallway/secondary/garden)
"oxo" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -67164,13 +67272,13 @@
d2 = 2;
icon_state = "0-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/poddoor/preopen{
- id_tag = "bridge";
+ id_tag = "bridge_upper";
layer = 2.6;
name = "Emergency Blast Door"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/station/command/bridge)
"oxO" = (
@@ -67188,7 +67296,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"oya" = (
/obj/effect/turf_decal/loading_area,
/obj/effect/turf_decal/delivery/hollow,
@@ -67200,10 +67308,6 @@
/obj/effect/spawner/random_barrier/obstruction,
/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard)
-"oyl" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
"oyo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/power/apc/directional/east,
@@ -67507,6 +67611,14 @@
/obj/structure/sign/cargo,
/turf/simulated/wall,
/area/station/maintenance/apmaint)
+"oEP" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/solar_maintenance/aft_starboard)
"oEV" = (
/obj/structure/ore_box,
/turf/simulated/floor/plating,
@@ -67634,11 +67746,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior/secondary)
"oHk" = (
@@ -67833,12 +67940,18 @@
/area/station/engineering/gravitygenerator)
"oKU" = (
/obj/structure/cable/orange{
- d1 = 1;
+ d1 = 4;
d2 = 8;
- icon_state = "1-8"
+ icon_state = "4-8"
+ },
+/obj/machinery/power/apc/directional/north,
+/obj/structure/cable/orange{
+ d2 = 4;
+ icon_state = "0-4"
},
/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
+ dir = 4;
+ icon_state = "neutralcorner"
},
/area/station/hallway/primary/fore/east)
"oLb" = (
@@ -67860,7 +67973,7 @@
name = "Aft Starboard Solar Access"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"oLo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/turf_decal/loading_area{
@@ -67916,6 +68029,11 @@
},
/area/station/service/barber)
"oMu" = (
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "yellow"
@@ -68049,17 +68167,6 @@
"oOg" = (
/turf/simulated/wall,
/area/station/service/barber)
-"oOh" = (
-/obj/machinery/power/apc/directional/south,
-/obj/structure/cable/orange{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/effect/turf_decal/stripes/end{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/station/medical/medbay)
"oOu" = (
/obj/structure/morgue{
dir = 8
@@ -68469,6 +68576,11 @@
},
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -68534,6 +68646,11 @@
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/station/public/vacant_office)
"oVs" = (
@@ -68699,7 +68816,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/fore_starboard)
"oXz" = (
/obj/effect/decal/cleanable/vomit,
/turf/simulated/floor/plating{
@@ -68742,7 +68859,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"oYF" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -68834,11 +68951,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -68853,17 +68965,17 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/machinery/status_display{
pixel_y = 32
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -69010,6 +69122,10 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"pbR" = (
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/station/engineering/solar/fore_starboard)
"pbY" = (
/obj/structure/disposalpipe/segment{
color = "#954535"
@@ -69070,7 +69186,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft)
"pdk" = (
/obj/structure/disposalpipe/junction/reversed{
dir = 1
@@ -69090,6 +69206,11 @@
name = "east bump";
pixel_x = 28
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkbrown"
@@ -69220,18 +69341,15 @@
/obj/structure/disposalpipe/junction/y{
dir = 1
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkbrown"
},
/area/station/supply/storage)
-"peG" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
- },
-/turf/space,
-/area/station/engineering/solar/port)
"peQ" = (
/obj/machinery/light_switch{
dir = 4;
@@ -69362,7 +69480,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"phZ" = (
/obj/machinery/door/airlock/maintenance{
name = "Medbay SMES Access"
@@ -69404,21 +69522,15 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"piE" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/power/apc/directional/north,
-/obj/structure/cable/orange{
+/obj/machinery/power/apc/critical/directional/south,
+/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
-/obj/effect/turf_decal/stripes/asteroid/end,
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
},
-/area/station/maintenance/fsmaint)
+/area/station/turret_protected/aisat/interior/secondary)
"piO" = (
/obj/effect/spawner/grouped_spawner{
group_id = "tunnelbats";
@@ -69636,7 +69748,7 @@
"plQ" = (
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall,
-/area/station/maintenance/starboardsolar/aft)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"pmA" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -69650,11 +69762,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -69675,7 +69782,7 @@
pixel_x = 32
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar/aft)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"pnd" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -69700,18 +69807,6 @@
icon_state = "dark"
},
/area/station/security/interrogation)
-"png" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"pno" = (
/obj/structure/cable{
d1 = 1;
@@ -69767,15 +69862,10 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
},
-/area/station/maintenance/asmaint)
+/area/station/hallway/secondary/exit)
"pod" = (
/obj/effect/spawner/grouped_spawner{
group_id = "tunnelbats";
@@ -69908,12 +69998,17 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock,
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
"ppV" = (
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"pqi" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/hologram/holopad,
@@ -69925,6 +70020,11 @@
/obj/structure/chair/office/light{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -70033,7 +70133,7 @@
"psw" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"psE" = (
/obj/structure/girder,
/obj/structure/grille,
@@ -70240,6 +70340,11 @@
/area/station/service/hydroponics)
"puE" = (
/obj/machinery/alarm/directional/north,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -70369,7 +70474,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft)
"pwN" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -70414,6 +70519,11 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkbrown"
},
@@ -70553,22 +70663,24 @@
/turf/simulated/floor/wood,
/area/station/service/theatre)
"pAM" = (
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 1
- },
-/obj/structure/cable/orange{
- d2 = 8;
- icon_state = "0-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/obj/machinery/light/small{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/power/apc/important/directional/south{
- name = "Cryo and Arrivals Super APC";
- cell_type = 15000
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ color = "#954535"
},
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "bluered"
},
/area/station/hallway/secondary/entry/west)
"pBi" = (
@@ -70577,6 +70689,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/carpet,
/area/station/public/locker)
"pBv" = (
@@ -70862,14 +70979,13 @@
},
/area/station/maintenance/port)
"pFr" = (
-/obj/machinery/power/apc/directional/north,
-/obj/effect/turf_decal/stripes/end,
-/obj/structure/cable{
+/obj/structure/cable/orange{
d2 = 8;
icon_state = "0-8"
},
-/turf/simulated/floor/transparent/glass/reinforced,
-/area/station/hallway/primary/aft/east)
+/obj/machinery/power/apc/directional/north,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/starboard/south)
"pFv" = (
/obj/machinery/economy/vending/janidrobe,
/obj/structure/window/reinforced{
@@ -71000,6 +71116,11 @@
"pHh" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable/orange{
+ d2 = 4;
+ icon_state = "0-4"
+ },
/turf/simulated/floor/carpet/green,
/area/station/service/library)
"pHG" = (
@@ -71072,6 +71193,11 @@
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -71153,7 +71279,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -71396,6 +71522,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkblue"
},
@@ -71441,16 +71572,16 @@
},
/area/station/service/barber)
"pOl" = (
-/obj/machinery/door/poddoor/preopen{
- id_tag = "bridge";
- layer = 2.6;
- name = "Emergency Blast Door"
- },
/obj/machinery/door/airlock/command/glass,
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/all/command/general,
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "bridge_upper";
+ layer = 2.6;
+ name = "Emergency Blast Door"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -71646,11 +71777,11 @@
},
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/caution/stand_clear,
-/obj/structure/cable{
+/obj/machinery/power/apc/important/directional/north,
+/obj/structure/cable/orange{
d2 = 2;
icon_state = "0-2"
},
-/obj/machinery/power/apc/important/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkgreen"
@@ -71695,6 +71826,16 @@
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -71753,6 +71894,11 @@
/obj/effect/spawner/random_spawners/dirt_often,
/obj/structure/closet/firecloset,
/obj/machinery/firealarm/directional/south,
+/obj/machinery/power/apc/directional/east,
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurple"
@@ -71845,6 +71991,11 @@
/area/station/medical/medbay)
"pTz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -71977,7 +72128,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/aft_starboard)
"pWc" = (
/obj/machinery/light/small{
dir = 1
@@ -71985,11 +72136,6 @@
/turf/simulated/floor/plasteel/freezer,
/area/station/service/kitchen)
"pWf" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -72074,32 +72220,24 @@
/turf/simulated/floor/wood,
/area/station/public/vacant_office)
"pWW" = (
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/end{
- dir = 4
- },
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/power/apc/important/directional/west,
-/turf/simulated/floor/plating,
-/area/station/engineering/atmos/distribution)
+/area/station/hallway/primary/fore/east)
"pXf" = (
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
+ },
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment/corner{
- dir = 1
- },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"pXh" = (
@@ -72252,6 +72390,11 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -72298,6 +72441,11 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -72484,11 +72632,6 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -72510,6 +72653,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "escape"
@@ -72584,11 +72732,6 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -72753,6 +72896,11 @@
dir = 4
},
/obj/machinery/alarm/directional/north,
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "darkred"
@@ -72876,13 +73024,14 @@
/turf/simulated/floor/plating,
/area/station/supply/storage)
"qhD" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
},
-/turf/simulated/floor/plating/asteroid/ancient,
-/area/station/maintenance/asmaint)
+/area/station/hallway/primary/starboard/south)
"qhH" = (
/obj/structure/cable{
d1 = 2;
@@ -72953,11 +73102,6 @@
"qiR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -73027,7 +73171,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/aft_starboard)
"qke" = (
/obj/effect/landmark/spawner/xeno,
/turf/simulated/floor/plating,
@@ -73162,7 +73306,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -73213,7 +73357,7 @@
pixel_x = 32;
pixel_y = 32
},
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -73319,11 +73463,6 @@
/turf/simulated/floor/plating,
/area/station/service/janitor)
"qnS" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/door/airlock/maintenance{
name = "Aft Asteroid Maintenance"
},
@@ -73390,6 +73529,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -73598,6 +73742,11 @@
/obj/structure/disposalpipe/junction/reversed{
dir = 1
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkbrown"
@@ -73707,7 +73856,7 @@
icon_state = "0-8"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft)
"quI" = (
/turf/simulated/wall/r_wall,
/area/station/science/explab/chamber)
@@ -73763,11 +73912,6 @@
/turf/simulated/floor/plasteel,
/area/station/security/prisonlockers)
"qvn" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/grille,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -73929,6 +74073,11 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"qyk" = (
@@ -74116,14 +74265,6 @@
},
/turf/simulated/floor/noslip,
/area/station/engineering/control)
-"qAY" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/turf/simulated/floor/plating,
-/area/station/turret_protected/aisat/interior/secondary)
"qBa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -74390,7 +74531,7 @@
icon_state = "0-8"
},
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/fore_starboard)
"qFS" = (
/obj/structure/closet/emcloset,
/obj/structure/disposalpipe/segment,
@@ -74563,18 +74704,6 @@
icon_state = "white"
},
/area/station/science/misc_lab)
-"qIg" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/maintenance/fsmaint)
"qIi" = (
/obj/machinery/door_control{
id = "kitchen1";
@@ -74638,13 +74767,8 @@
},
/obj/structure/cable/orange{
d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/structure/cable/orange{
- d1 = 4;
d2 = 8;
- icon_state = "4-8"
+ icon_state = "1-8"
},
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
@@ -74781,7 +74905,7 @@
icon_state = "0-2"
},
/obj/machinery/door/poddoor/preopen{
- id_tag = "bridge";
+ id_tag = "bridge_lower";
layer = 2.6;
name = "Emergency Blast Door"
},
@@ -74875,7 +74999,7 @@
"qMm" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"qMs" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -74929,6 +75053,11 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel,
/area/station/public/fitness)
"qNi" = (
@@ -74972,11 +75101,6 @@
path_to_spawn = /mob/living/simple_animal/hostile/scarybat;
total_amount = 20
},
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fsmaint)
"qNG" = (
@@ -75021,11 +75145,6 @@
/turf/simulated/floor/plating,
/area/station/command/office/ce)
"qOk" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/railing{
dir = 8;
pixel_y = 10
@@ -75094,7 +75213,12 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_often,
-/obj/structure/cable{
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -75173,7 +75297,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft)
"qRD" = (
/obj/effect/spawner/random_spawners/grille_maybe,
/turf/simulated/floor/plating,
@@ -75208,14 +75332,17 @@
},
/area/station/science/toxins/mixing)
"qRO" = (
+/obj/effect/turf_decal/delivery/hollow,
+/obj/machinery/shieldwallgen,
+/obj/machinery/power/apc/directional/south,
/obj/structure/cable/orange{
- d1 = 1;
d2 = 8;
- icon_state = "1-8"
+ icon_state = "0-8"
},
-/obj/effect/spawner/random_spawners/dirt_often,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/command/teleporter)
"qRT" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating,
@@ -75233,12 +75360,12 @@
},
/area/station/security/permabrig)
"qSl" = (
-/obj/structure/cable/orange{
- d1 = 1;
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ d1 = 4;
d2 = 8;
- icon_state = "1-8"
+ icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"qSK" = (
@@ -75274,6 +75401,11 @@
"qTi" = (
/obj/structure/closet/secure_closet/miner,
/obj/machinery/requests_console/directional/east,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"qTK" = (
@@ -75395,6 +75527,11 @@
dir = 4
},
/obj/machinery/alarm/directional/south,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -75459,7 +75596,7 @@
"qWL" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"qWM" = (
/obj/machinery/light{
dir = 4
@@ -75636,21 +75773,15 @@
},
/area/station/maintenance/asmaint)
"raj" = (
-/obj/effect/turf_decal/stripes/asteroid/end,
-/obj/machinery/power/apc/directional/north,
-/obj/structure/cable/orange{
- d2 = 2;
- icon_state = "0-2"
- },
-/turf/simulated/floor/plating,
-/area/station/command/office/rd)
-"rao" = (
-/obj/item/assembly/mousetrap/armed,
/obj/structure/cable/orange{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
+/turf/simulated/floor/plasteel,
+/area/station/supply/miningdock)
+"rao" = (
+/obj/item/assembly/mousetrap/armed,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -75768,17 +75899,17 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/turbine)
"rcB" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/light{
color = "#62416F"
},
@@ -75919,9 +76050,6 @@
/obj/machinery/ai_status_display,
/turf/simulated/mineral/ancient,
/area/station/legal/courtroom)
-"rfn" = (
-/turf/simulated/wall/r_wall,
-/area/station/maintenance/portsolar)
"rfq" = (
/obj/structure/cable{
d1 = 1;
@@ -76039,13 +76167,10 @@
/turf/simulated/floor/grass,
/area/station/service/hydroponics)
"rjd" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating,
-/area/station/turret_protected/aisat/interior/secondary)
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable/orange,
+/turf/simulated/floor/transparent/glass/reinforced,
+/area/station/maintenance/fore)
"rji" = (
/obj/structure/cable{
d1 = 1;
@@ -76076,11 +76201,6 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -76129,16 +76249,14 @@
/turf/simulated/wall/r_wall,
/area/station/turret_protected/ai_upload)
"rjx" = (
-/obj/machinery/light/small,
+/obj/effect/spawner/random_spawners/dirt_frequent,
/obj/structure/cable/orange{
- d1 = 4;
+ d1 = 2;
d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+ icon_state = "2-8"
},
-/area/station/maintenance/apmaint)
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
"rjy" = (
/obj/machinery/alarm/directional/north,
/turf/simulated/floor/plasteel{
@@ -76235,16 +76353,13 @@
},
/area/station/public/storage/tools)
"rmq" = (
-/obj/machinery/power/apc/directional/south,
-/obj/effect/turf_decal/stripes/end{
- dir = 1
- },
/obj/structure/cable/orange{
+ d1 = 1;
d2 = 4;
- icon_state = "0-4"
+ icon_state = "1-4"
},
-/turf/simulated/floor/plating,
-/area/station/command/office/hop)
+/turf/simulated/floor/carpet,
+/area/station/legal/courtroom)
"rmA" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/camera/autoname{
@@ -76265,6 +76380,8 @@
/area/station/science/misc_lab)
"rmT" = (
/obj/structure/closet/secure_closet/paramedic,
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable/orange,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteblue"
@@ -76285,26 +76402,13 @@
"rnw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/south)
-"rnC" = (
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/structure/disposalpipe/segment/corner{
- dir = 1
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/maintenance/gambling_den)
"rnQ" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -76389,6 +76493,11 @@
"rot" = (
/obj/structure/disposalpipe/segment/corner,
/obj/effect/spawner/random_spawners/dirt_often,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/public/locker)
"roF" = (
@@ -76423,6 +76532,11 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/southwest)
+"rpm" = (
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable/orange,
+/turf/simulated/floor/wood,
+/area/station/service/theatre)
"rpx" = (
/obj/machinery/door/poddoor/shutters{
dir = 8;
@@ -76467,11 +76581,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -76479,6 +76588,11 @@
dir = 4;
color = "#954535"
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -76521,7 +76635,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/fore_starboard)
"rrj" = (
/obj/machinery/door/airlock/maintenance{
name = "Medbay SMES Access"
@@ -76657,19 +76771,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/apmaint)
-"rtt" = (
-/obj/machinery/power/apc/directional/east,
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 8
- },
-/obj/structure/cable/orange{
- d2 = 8;
- icon_state = "0-8"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/legal/courtroom)
"rtB" = (
/obj/machinery/door/airlock/public/glass{
name = "Garden"
@@ -76777,6 +76878,15 @@
icon_state = "whitepurplecorner"
},
/area/station/science/explab/chamber)
+"rvO" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate,
+/obj/structure/cable/orange,
+/obj/machinery/power/apc/directional/south,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/supply/warehouse)
"rwg" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -76815,6 +76925,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteblue"
@@ -76829,11 +76944,6 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/north)
"rxq" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 8
},
@@ -76908,11 +77018,6 @@
/area/station/science/robotics/chargebay)
"ryD" = (
/obj/item/stack/rods,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"ryQ" = (
@@ -76999,7 +77104,7 @@
"rAB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -77192,11 +77297,6 @@
},
/area/station/hallway/spacebridge/scidock)
"rCT" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -77210,6 +77310,11 @@
/obj/structure/chair/comfy{
dir = 1
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
@@ -77333,6 +77438,11 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -77365,11 +77475,6 @@
/turf/simulated/floor/plating,
/area/station/hallway/primary/starboard/south)
"rGy" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
@@ -77417,15 +77522,6 @@
/obj/structure/cable/orange,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/southwest)
-"rHq" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/station/medical/break_room)
"rHs" = (
/obj/machinery/conveyor_switch/oneway{
id = "CargoWaste"
@@ -77565,26 +77661,26 @@
/turf/simulated/wall,
/area/station/security/warden)
"rJv" = (
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/turf/simulated/floor/plating/asteroid/ancient,
-/area/station/maintenance/asmaint)
-"rJP" = (
-/obj/structure/cable/orange{
+/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/central/north)
+"rJP" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/orange{
d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+ d2 = 2;
+ icon_state = "1-2"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore2)
+/turf/simulated/floor/plasteel,
+/area/station/public/locker)
"rKq" = (
/obj/machinery/light{
dir = 8
@@ -77868,7 +77964,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft)
"rNE" = (
/obj/structure/grille/broken,
/turf/simulated/floor/plating,
@@ -78016,6 +78112,11 @@
pixel_x = 24;
pixel_y = -5
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkbrown"
@@ -78069,6 +78170,11 @@
icon_state = "2-4"
},
/obj/structure/disposalpipe/segment/corner,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -78112,11 +78218,6 @@
name = "Medbay Access"
},
/obj/effect/mapping_helpers/airlock/access/all/medical/general,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"rRj" = (
@@ -78135,16 +78236,21 @@
},
/area/station/engineering/atmos)
"rRE" = (
-/obj/machinery/power/apc/directional/east,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/obj/structure/cable/orange{
+ d1 = 2;
d2 = 8;
- icon_state = "0-8"
+ icon_state = "2-8"
},
-/obj/effect/turf_decal/stripes/end{
- dir = 8
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
},
-/turf/simulated/floor/plating,
-/area/station/service/library)
+/area/station/service/hydroponics)
"rRG" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -78237,6 +78343,11 @@
name = "east bump";
pixel_x = 28
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"rTy" = (
@@ -78293,15 +78404,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"rUB" = (
-/obj/machinery/light/small,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating/asteroid/ancient,
-/area/station/maintenance/fsmaint)
"rUL" = (
/obj/structure/table/wood,
/obj/item/storage/bag/dice,
@@ -78346,15 +78448,12 @@
},
/area/station/hallway/primary/port/north)
"rVx" = (
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable/orange,
+/turf/simulated/floor/plasteel{
+ icon_state = "cult"
},
-/area/station/maintenance/fore2)
+/area/station/legal/lawoffice)
"rVD" = (
/obj/effect/spawner/random_spawners/grille_maybe,
/turf/simulated/floor/plating{
@@ -78373,6 +78472,11 @@
pixel_x = 28;
name = "custom placement"
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkyellow"
@@ -78420,6 +78524,11 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -78486,7 +78595,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
icon_state = "1-2"
@@ -78635,11 +78744,6 @@
/turf/simulated/floor/plasteel/freezer,
/area/station/service/kitchen)
"rZN" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -78708,18 +78812,14 @@
},
/area/station/science/toxins/mixing)
"sbf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
+/obj/effect/landmark/start/shaft_miner,
/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/maintenance/asmaint)
+/turf/simulated/floor/plasteel,
+/area/station/supply/miningdock)
"sbg" = (
/obj/structure/barricade/wooden,
/turf/simulated/floor/plating{
@@ -79048,19 +79148,6 @@
},
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/starboard)
-"sfS" = (
-/obj/machinery/power/apc/directional/east,
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 8
- },
-/obj/structure/cable/orange{
- d2 = 8;
- icon_state = "0-8"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/maintenance/disposal)
"sfZ" = (
/obj/structure/disposaloutlet{
dir = 4
@@ -79222,7 +79309,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft)
"shU" = (
/turf/simulated/mineral/ancient/outer,
/area/station/maintenance/disposal/north)
@@ -79393,7 +79480,7 @@
"skB" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/aft)
"skF" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -79614,7 +79701,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft)
"snX" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -79649,6 +79736,10 @@
icon_state = "chapel"
},
/area/station/service/chapel)
+"sox" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/turf/simulated/floor/plating,
+/area/station/maintenance/solar_maintenance/aft_starboard)
"soK" = (
/obj/structure/closet,
/obj/item/pickaxe,
@@ -79677,17 +79768,19 @@
},
/area/station/hallway/secondary/exit)
"squ" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/structure/cable/orange{
+ d2 = 4;
+ icon_state = "0-4"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/power/apc/directional/west,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/station/hallway/secondary/entry/north)
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "escape"
+ },
+/area/station/hallway/secondary/exit)
"sqB" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
@@ -79713,6 +79806,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/carpet,
/area/station/public/locker)
"srn" = (
@@ -79869,9 +79967,16 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/directional/north,
+/obj/effect/turf_decal/stripes/asteroid/end,
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/maintenance/fsmaint)
"ssW" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -79971,6 +80076,11 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -80147,11 +80257,6 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -80533,11 +80638,6 @@
/area/station/medical/reception)
"sBs" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/light/small,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
@@ -80683,6 +80783,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/carpet/arcade,
/area/station/public/arcade)
"sCB" = (
@@ -80694,18 +80799,17 @@
pixel_y = 7
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"sCF" = (
-/obj/machinery/power/apc/directional/west,
-/obj/effect/turf_decal/stripes/end{
- dir = 4
- },
/obj/structure/cable/orange{
- d2 = 4;
- icon_state = "0-4"
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
},
-/turf/simulated/floor/plating,
-/area/station/supply/qm)
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
+ },
+/area/station/supply/break_room)
"sCJ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -80714,6 +80818,16 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -80822,6 +80936,11 @@
/obj/structure/sign/science{
pixel_y = -32
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "purplecorner"
},
@@ -80887,6 +81006,11 @@
/area/station/medical/surgery/secondary)
"sFd" = (
/obj/effect/spawner/random_spawners/dirt_often,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
@@ -81386,6 +81510,11 @@
dir = 4;
color = "#954535"
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "purplecorner"
@@ -81395,6 +81524,8 @@
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
+/obj/machinery/power/apc/directional/east,
+/obj/structure/cable/orange,
/turf/simulated/floor/wood,
/area/station/legal/magistrate)
"sOo" = (
@@ -81414,11 +81545,6 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
/turf/simulated/floor/transparent/glass/reinforced,
@@ -81588,6 +81714,11 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"sRk" = (
@@ -81649,6 +81780,11 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_often,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "escape"
@@ -81659,22 +81795,6 @@
icon_state = "neutralfull"
},
/area/station/public/storage/tools)
-"sSj" = (
-/obj/machinery/power/apc/directional/south,
-/obj/structure/cable/orange{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/stripes/end{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/station/security/checkpoint/secondary)
"sSm" = (
/obj/structure/disposalpipe/segment{
color = "#954535"
@@ -81823,9 +81943,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -82061,25 +82181,6 @@
icon_state = "darkyellow"
},
/area/station/engineering/atmos)
-"sXL" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/station/hallway/primary/starboard/south)
"sYg" = (
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -82153,22 +82254,6 @@
icon_state = "redcorner"
},
/area/station/hallway/primary/fore/west)
-"sZh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/structure/disposalpipe/segment/corner{
- dir = 1
- },
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/maintenance/fsmaint)
"sZi" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
@@ -82440,14 +82525,14 @@
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior/secondary)
"tdk" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/effect/spawner/random_spawners/dirt_often,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteblue"
@@ -82515,6 +82600,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -82602,7 +82692,7 @@
"tgI" = (
/obj/structure/lattice,
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/aft_starboard)
"tgP" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
@@ -82619,11 +82709,6 @@
/area/station/maintenance/disposal/westalt)
"tgU" = (
/obj/effect/spawner/random_spawners/dirt_frequent,
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
@@ -82708,7 +82793,7 @@
dir = 9
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"thH" = (
/obj/structure/cable{
d1 = 4;
@@ -82950,11 +83035,6 @@
/turf/simulated/floor/plating,
/area/station/security/permabrig)
"tkv" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/cable/orange{
d1 = 2;
d2 = 4;
@@ -83362,6 +83442,11 @@
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
@@ -83383,11 +83468,6 @@
},
/area/station/science/toxins/launch)
"tsB" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/light,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -83399,6 +83479,11 @@
/obj/structure/table,
/obj/item/crowbar,
/obj/item/radio,
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable/orange{
+ d2 = 4;
+ icon_state = "0-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkred"
},
@@ -83484,6 +83569,11 @@
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic,
/obj/machinery/door/firedoor,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -83606,6 +83696,11 @@
dir = 4;
color = "#954535"
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -83625,6 +83720,11 @@
pixel_y = 4
},
/obj/item/clothing/glasses/science,
+/obj/structure/cable/orange{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/machinery/power/apc/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
@@ -83632,9 +83732,11 @@
/area/station/science/xenobiology)
"tvV" = (
/turf/simulated/mineral/ancient,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"twa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/power/apc/important/directional/east,
+/obj/structure/cable,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -84080,7 +84182,7 @@
"tCG" = (
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"tCV" = (
/obj/item/kirbyplants/plant22,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -84376,11 +84478,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/port2)
"tHV" = (
@@ -84512,7 +84609,7 @@
icon_state = "1-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft)
"tKj" = (
/obj/structure/cable{
d1 = 4;
@@ -84615,12 +84712,25 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/power/apc/directional/north,
+/obj/structure/cable/orange{
+ d2 = 4;
+ icon_state = "0-4"
+ },
/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
+ dir = 4;
+ icon_state = "redcorner"
},
-/area/station/hallway/primary/fore/east)
+/area/station/hallway/primary/fore/west)
"tLE" = (
/obj/structure/extinguisher_cabinet{
pixel_x = -24;
@@ -85051,7 +85161,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/aft_starboard)
"tVb" = (
/obj/machinery/door/airlock/security/glass{
id_tag = "cell1";
@@ -85224,11 +85334,6 @@
/turf/simulated/wall/r_wall,
/area/station/command/teleporter)
"tWM" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/item/assembly/mousetrap/armed,
/turf/simulated/floor/plating{
@@ -85370,7 +85475,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft)
"tYu" = (
/obj/machinery/door/airlock/maintenance{
name = "Port Asteroid Maintenance"
@@ -85628,11 +85733,6 @@
dir = 1;
color = "#954535"
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
@@ -85775,6 +85875,11 @@
/turf/simulated/wall,
/area/station/maintenance/disposal/northwest)
"ueQ" = (
+/obj/machinery/power/apc/directional/east,
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
@@ -86118,6 +86223,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -86241,11 +86351,6 @@
},
/area/station/science/robotics)
"ukC" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/machinery/light/small{
dir = 8
},
@@ -86398,6 +86503,11 @@
d2 = 4;
icon_state = "2-4"
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkbrown"
@@ -86449,19 +86559,6 @@
icon_state = "dark"
},
/area/station/engineering/atmos/distribution)
-"uom" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/maintenance/asmaint)
"uor" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -86534,7 +86631,7 @@
},
/obj/item/stack/cable_coil/random,
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/fore_starboard)
"uqt" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating,
@@ -86774,7 +86871,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft)
"utB" = (
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal/deliveryChute{
@@ -86791,14 +86888,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/prison/cell_block/A)
-"utF" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"utP" = (
/obj/machinery/atmospherics/binary/pump{
dir = 4;
@@ -86907,7 +86996,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/fore_starboard)
"uvM" = (
/obj/machinery/light/small{
dir = 8
@@ -86922,19 +87011,19 @@
/turf/simulated/mineral/ancient,
/area/station/maintenance/electrical_shop)
"uwa" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/obj/structure/cable/orange{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"uwc" = (
@@ -87133,7 +87222,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"uxY" = (
/obj/structure/disposalpipe/junction{
dir = 1
@@ -87144,6 +87233,16 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkbrown"
@@ -87193,6 +87292,11 @@
name = "Cargo Lockdown"
},
/obj/effect/turf_decal/caution/red,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -87211,7 +87315,7 @@
icon_state = "1-4"
},
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/fore_starboard)
"uyI" = (
/obj/item/key/security{
pixel_x = -6;
@@ -87369,6 +87473,11 @@
dir = 4
},
/obj/machinery/economy/vending/wallmed/directional/north,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "escape"
@@ -87381,6 +87490,8 @@
},
/area/station/hallway/primary/fore/east)
"uBd" = (
+/obj/structure/cable/orange,
+/obj/machinery/power/apc/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "whitegreen"
},
@@ -87506,16 +87617,23 @@
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/port)
"uCM" = (
+/obj/machinery/door/airlock/glass{
+ name = "Internal Affairs Office"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/security/iaa,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/polarized{
+ id = "IAA"
+ },
/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/turf/simulated/floor/plasteel{
+ icon_state = "cult"
},
-/area/station/maintenance/asmaint)
+/area/station/legal/lawoffice)
"uCO" = (
/obj/structure/table,
/obj/machinery/reagentgrinder,
@@ -87595,11 +87713,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -87737,6 +87850,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "yellow"
@@ -87853,6 +87971,11 @@
/obj/structure/disposalpipe/segment/corner{
dir = 1
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/wood,
/area/station/service/theatre)
"uJq" = (
@@ -87890,6 +88013,11 @@
/area/station/public/locker)
"uJE" = (
/obj/machinery/requests_console/directional/east,
+/obj/machinery/power/apc/directional/north,
+/obj/structure/cable/orange{
+ d2 = 2;
+ icon_state = "0-2"
+ },
/turf/simulated/floor/carpet,
/area/station/legal/courtroom)
"uJF" = (
@@ -87994,6 +88122,11 @@
/obj/machinery/light{
dir = 1
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "escape"
@@ -88037,11 +88170,6 @@
dir = 4;
color = "#954535"
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
@@ -88050,6 +88178,11 @@
d2 = 8;
icon_state = "1-8"
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -88075,6 +88208,11 @@
/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/station/hallway/secondary/garden)
"uME" = (
@@ -88219,7 +88357,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"uPi" = (
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -88259,6 +88397,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -88296,11 +88439,6 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
@@ -88347,12 +88485,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/power/apc/directional/north,
-/obj/effect/turf_decal/stripes/asteroid/end,
-/obj/structure/cable/orange{
- d2 = 8;
- icon_state = "0-8"
- },
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
@@ -88510,6 +88642,11 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/gambling_den)
"uRS" = (
@@ -88540,7 +88677,7 @@
icon_state = "0-2"
},
/obj/machinery/door/poddoor/preopen{
- id_tag = "bridge";
+ id_tag = "bridge_upper";
layer = 2.6;
name = "Emergency Blast Door"
},
@@ -88598,16 +88735,14 @@
},
/area/station/hallway/secondary/exit)
"uSO" = (
-/obj/machinery/power/apc/directional/south,
-/obj/effect/turf_decal/stripes/end{
- dir = 1
- },
-/obj/structure/cable/orange{
- d2 = 4;
- icon_state = "0-4"
+/obj/structure/chair/stool{
+ dir = 8
},
-/turf/simulated/floor/transparent/glass/reinforced,
-/area/station/hallway/primary/fore/north)
+/obj/effect/landmark/start/assistant,
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable/orange,
+/turf/simulated/floor/carpet/arcade,
+/area/station/public/arcade)
"uSP" = (
/turf/simulated/wall/mineral/titanium,
/area/shuttle/arrival/station)
@@ -88676,6 +88811,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -88944,30 +89084,17 @@
},
/turf/simulated/floor/plating,
/area/station/hallway/primary/starboard/south)
-"uXE" = (
-/obj/machinery/power/apc/directional/west,
-/obj/structure/cable/orange{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 4
- },
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/supply/miningdock)
"uXU" = (
/obj/structure/table,
/obj/item/flashlight/lamp,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel,
/area/station/security/processing)
"uYj" = (
@@ -89088,27 +89215,6 @@
icon_state = "white"
},
/area/station/medical/patients_rooms)
-"uZC" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/maintenance/starboard)
"uZZ" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -89223,7 +89329,7 @@
icon_state = "0-8"
},
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/fore_starboard)
"vbY" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -89298,7 +89404,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"vcx" = (
/obj/machinery/light_switch{
pixel_y = 24;
@@ -89360,27 +89466,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"vdF" = (
-/obj/machinery/power/apc/directional/west,
-/obj/structure/cable/orange{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 4
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/medical/virology)
-"vdN" = (
-/obj/machinery/power/apc/directional/south,
-/obj/effect/turf_decal/stripes/end{
- dir = 1
- },
-/obj/structure/cable/orange,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"vdZ" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=ArrivalsWest";
@@ -89475,11 +89560,6 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -89724,6 +89804,11 @@
name = "Warehouse Shutters"
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -89761,6 +89846,11 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"vlz" = (
@@ -89814,6 +89904,11 @@
icon_state = "2-8"
},
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "bluecorner"
@@ -89945,6 +90040,11 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -90173,6 +90273,11 @@
id = "Magistrate"
},
/obj/structure/disposalpipe/segment,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/wood,
/area/station/legal/magistrate)
"vqQ" = (
@@ -90238,6 +90343,11 @@
/area/station/hallway/primary/fore/east)
"vsu" = (
/obj/structure/filingcabinet,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/wood,
/area/station/command/office/hop)
"vsv" = (
@@ -90479,6 +90589,11 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel/white,
/area/station/science/hallway)
"vvg" = (
@@ -90489,11 +90604,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
@@ -90570,11 +90680,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -90582,6 +90687,16 @@
dir = 4;
color = "#954535"
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/cable/orange{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/machinery/power/apc/directional/north,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -90833,6 +90948,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -90858,14 +90978,10 @@
},
/area/station/service/chapel)
"vBm" = (
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
+/obj/structure/cable,
+/obj/machinery/power/apc/directional/east,
+/turf/simulated/floor/grass/jungle,
+/area/station/hallway/secondary/garden)
"vBr" = (
/obj/machinery/atmospherics/portable/canister/air,
/obj/machinery/atmospherics/unary/portables_connector{
@@ -90916,11 +91032,6 @@
/turf/simulated/floor/plating,
/area/station/hallway/primary/starboard/south)
"vBV" = (
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
@@ -91018,7 +91129,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"vDL" = (
/obj/machinery/sleeper{
dir = 1
@@ -91163,11 +91274,6 @@
},
/area/station/maintenance/apmaint)
"vFf" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/disposalpipe/sortjunction/reversed{
dir = 8;
sort_type_txt = "21"
@@ -91325,11 +91431,6 @@
},
/area/station/public/quantum/cargo)
"vIi" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/structure/sign/poster/random{
name = "random contraband poster";
pixel_x = -32;
@@ -91576,20 +91677,15 @@
/turf/simulated/floor/plating,
/area/station/engineering/break_room/secondary)
"vLS" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "redcorner"
@@ -91602,9 +91698,9 @@
},
/obj/effect/spawner/random_spawners/dirt_often,
/obj/structure/cable{
- d1 = 4;
+ d1 = 1;
d2 = 8;
- icon_state = "4-8"
+ icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -91735,6 +91831,11 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -91797,6 +91898,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -91937,11 +92043,6 @@
},
/area/station/ai_monitored/storage/eva)
"vRn" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
@@ -91990,14 +92091,14 @@
/area/station/service/kitchen)
"vRH" = (
/obj/structure/cable/orange{
- d1 = 2;
+ d1 = 1;
d2 = 4;
- icon_state = "2-4"
+ icon_state = "1-4"
},
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
},
-/area/station/hallway/primary/fore/east)
+/area/station/maintenance/fsmaint)
"vRO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -92105,11 +92206,6 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_frequent,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating,
/area/station/hallway/secondary/exit)
"vTo" = (
@@ -92129,11 +92225,6 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -92166,7 +92257,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar/aft)
+/area/station/maintenance/solar_maintenance/aft)
"vUn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -92193,15 +92284,6 @@
/obj/effect/landmark/spawner/nukedisc_respawn,
/turf/simulated/floor/engine,
/area/station/science/xenobiology)
-"vVz" = (
-/obj/effect/spawner/random_spawners/dirt_frequent,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
"vVI" = (
/obj/machinery/hydroponics/constructable,
/obj/effect/decal/cleanable/dirt,
@@ -92225,11 +92307,6 @@
/area/station/public/sleep)
"vVP" = (
/obj/effect/spawner/random_spawners/dirt_frequent,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -92402,6 +92479,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -92443,6 +92525,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -92471,6 +92558,11 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -92488,6 +92580,8 @@
pixel_x = 32;
pixel_y = 24
},
+/obj/machinery/power/apc/directional/east,
+/obj/structure/cable/orange,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -92538,6 +92632,11 @@
dir = 4
},
/obj/machinery/door/firedoor,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkredfull"
},
@@ -92561,17 +92660,6 @@
icon_state = "neutralfull"
},
/area/station/hallway/primary/starboard/south)
-"waB" = (
-/obj/effect/spawner/random_spawners/dirt_frequent,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/hallway/primary/fore/east)
"waN" = (
/obj/machinery/door/airlock/maintenance{
name = "Hydroponics"
@@ -92734,7 +92822,7 @@
icon_state = "0-2"
},
/obj/machinery/door/poddoor/preopen{
- id_tag = "bridge";
+ id_tag = "bridge_lower";
layer = 2.6;
name = "Emergency Blast Door"
},
@@ -93025,15 +93113,6 @@
},
/turf/simulated/floor/engine,
/area/station/science/xenobiology)
-"wiI" = (
-/obj/machinery/power/apc/directional/north,
-/obj/effect/turf_decal/stripes/end,
-/obj/structure/cable/orange{
- d2 = 2;
- icon_state = "0-2"
- },
-/turf/simulated/floor/plating,
-/area/station/public/storage/tools/auxiliary)
"wiJ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -93124,6 +93203,11 @@
/area/station/hallway/primary/port/south)
"wjy" = (
/obj/structure/disposalpipe/segment,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
@@ -93303,36 +93387,43 @@
"wlD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/spawner/random_spawners/dirt_frequent,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
},
/area/station/hallway/secondary/entry/north)
"wlU" = (
-/obj/effect/spawner/random_spawners/dirt_frequent,
-/obj/effect/decal/cleanable/generic,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/directional/south,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/port/east)
"wlV" = (
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/engine,
@@ -93397,7 +93488,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft)
"wmA" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
@@ -93561,11 +93652,6 @@
},
/area/station/maintenance/gambling_den)
"wpl" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -93630,7 +93716,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/cable{
+/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -93644,6 +93730,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -93799,6 +93890,11 @@
/obj/effect/mapping_helpers/airlock/access/any/supply/general,
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
/obj/machinery/door/firedoor,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkbrownfull"
},
@@ -93881,11 +93977,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
@@ -94314,22 +94405,15 @@
},
/area/station/medical/cloning)
"wxE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "escape"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/orange{
+ d2 = 2;
+ icon_state = "0-2"
},
-/area/station/hallway/secondary/entry/east)
+/obj/machinery/power/apc/directional/west,
+/turf/simulated/floor/wood,
+/area/station/public/vacant_office)
"wxI" = (
/obj/structure/morgue,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -94349,6 +94433,11 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkbrown"
@@ -94400,6 +94489,11 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "redyellowfull"
},
@@ -94431,11 +94525,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -94602,6 +94691,11 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/station/public/vacant_office)
"wAp" = (
@@ -94759,11 +94853,6 @@
/turf/simulated/wall,
/area/station/science/server)
"wCB" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/effect/spawner/grouped_spawner{
group_id = "tunnelbats";
max_per_spawner = 1;
@@ -94792,6 +94881,11 @@
color = "#954535"
},
/obj/machinery/firealarm/directional/south,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "purplecorner"
@@ -94874,21 +94968,13 @@
/turf/simulated/floor/engine,
/area/station/engineering/control)
"wDL" = (
-/obj/machinery/power/apc/directional/west,
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable/orange,
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/area/station/service/bar)
+/turf/simulated/floor/plasteel,
+/area/station/public/fitness)
"wDV" = (
/obj/structure/disposalpipe/segment,
/obj/structure/table/wood,
@@ -94950,14 +95036,12 @@
/area/station/science/storage)
"wES" = (
/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
-/area/station/maintenance/fore2)
+/turf/simulated/floor/carpet/arcade,
+/area/station/public/arcade)
"wFa" = (
/obj/item/radio/intercom{
pixel_x = 28;
@@ -95118,6 +95202,11 @@
path_to_spawn = /mob/living/simple_animal/hostile/scarybat;
total_amount = 20
},
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -95224,14 +95313,14 @@
/obj/machinery/light/small{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"wJe" = (
@@ -95313,12 +95402,12 @@
/turf/simulated/wall,
/area/station/hallway/spacebridge/comeng)
"wKu" = (
-/obj/structure/cable/orange{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -95457,6 +95546,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -95481,11 +95575,6 @@
/turf/space,
/area/space)
"wMV" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -95568,26 +95657,15 @@
},
/area/station/supply/storage)
"wOi" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
},
-/area/station/maintenance/apmaint)
+/area/station/command/office/rd)
"wOn" = (
/obj/item/radio/intercom{
pixel_y = -28;
@@ -95809,6 +95887,9 @@
"wRF" = (
/turf/simulated/floor/engine,
/area/station/science/misc_lab)
+"wSc" = (
+/turf/simulated/wall,
+/area/station/maintenance/solar_maintenance/fore_port)
"wSh" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass,
@@ -95820,6 +95901,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkgreenfull"
},
@@ -95856,18 +95942,13 @@
/turf/simulated/floor/engine,
/area/station/engineering/control)
"wSP" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
+ d2 = 2;
+ icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior/secondary)
@@ -95881,6 +95962,11 @@
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "darkbrowncorners"
},
@@ -96015,6 +96101,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/carpet,
/area/station/public/locker)
"wUX" = (
@@ -96042,7 +96133,7 @@
"wVu" = (
/obj/effect/spawner/airlock/s_to_n,
/turf/simulated/wall,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"wVD" = (
/obj/machinery/power/smes/engineering,
/obj/structure/cable/orange,
@@ -96142,31 +96233,21 @@
icon_state = "tranquillite"
},
/area/station/service/mime)
-"wXc" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/station/hallway/primary/aft/west)
"wXm" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ color = "#954535"
+ },
/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "purplecorner"
},
-/area/station/maintenance/gambling_den)
+/area/station/hallway/primary/aft/west)
"wXW" = (
/turf/simulated/wall/r_wall,
/area/station/science/server/coldroom)
@@ -96230,14 +96311,14 @@
/turf/simulated/wall,
/area/station/medical/paramedic)
"wZA" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -96917,6 +96998,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "escapecorner"
@@ -97001,11 +97087,6 @@
name = "External Airlock Access"
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating,
/area/station/hallway/primary/starboard/south)
"xkn" = (
@@ -97091,11 +97172,6 @@
/turf/simulated/floor/carpet/green,
/area/station/service/library)
"xmy" = (
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -97147,21 +97223,15 @@
},
/area/station/hallway/primary/port/south)
"xod" = (
+/obj/machinery/power/apc/directional/west,
/obj/structure/cable/orange{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ d2 = 4;
+ icon_state = "0-4"
},
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
+/turf/simulated/floor/plasteel{
+ icon_state = "cafeteria"
},
-/area/station/maintenance/port2)
+/area/station/supply/break_room)
"xof" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
@@ -97269,11 +97339,6 @@
"xpG" = (
/obj/machinery/light/small,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -97340,7 +97405,7 @@
},
/obj/effect/spawner/random_spawners/dirt_frequent,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"xrm" = (
/obj/structure/disposalpipe/segment/corner{
dir = 4
@@ -97363,6 +97428,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "escape"
@@ -97477,6 +97547,11 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/station/supply/miningdock)
"xuc" = (
@@ -97721,7 +97796,7 @@
/obj/effect/spawner/airlock/e_to_w,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar/aft)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"xxt" = (
/obj/structure/cable{
d1 = 2;
@@ -97874,11 +97949,6 @@
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plating,
/area/station/hallway/primary/starboard/south)
@@ -98053,6 +98123,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -98173,7 +98248,7 @@
/obj/effect/spawner/airlock/s_to_n,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"xCd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -98339,7 +98414,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft)
"xEp" = (
/turf/space,
/area/shuttle/gamma/station)
@@ -98462,12 +98537,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/effect/spawner/random_spawners/dirt_often,
/obj/structure/cable/orange{
d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -98652,11 +98727,6 @@
/turf/simulated/floor/plating,
/area/station/engineering/control)
"xIB" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -98758,7 +98828,11 @@
icon_state = "0-4"
},
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/aft)
+"xJR" = (
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/station/engineering/solar/aft_starboard)
"xJW" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -98915,6 +98989,11 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "purple"
},
@@ -98997,11 +99076,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -99058,6 +99132,19 @@
icon_state = "neutralfull"
},
/area/station/hallway/primary/port/east)
+"xPq" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/cable/orange{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "bridge_upper";
+ layer = 2.6;
+ name = "Emergency Blast Door"
+ },
+/turf/simulated/floor/plating,
+/area/station/command/bridge)
"xPv" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -99143,6 +99230,11 @@
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_often,
+/obj/machinery/power/apc/directional/north,
+/obj/structure/cable/orange{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "bluecorner"
@@ -99228,26 +99320,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/starboard/south)
-"xSl" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/power/apc/directional/west,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/cable/orange{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 4
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/supply/sorting)
"xSo" = (
/turf/simulated/wall,
/area/station/security/checkpoint/secondary)
@@ -99373,7 +99445,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard/aft)
+/area/station/engineering/solar/fore_starboard)
"xUb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -99941,7 +100013,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft)
"ycI" = (
/obj/structure/cable{
d1 = 1;
@@ -99987,9 +100059,9 @@
dir = 1
},
/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
@@ -100115,6 +100187,11 @@
/obj/machinery/light{
dir = 4
},
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkbrown"
@@ -100400,6 +100477,30 @@
/obj/structure/fans/tiny,
/turf/simulated/floor/plating,
/area/station/hallway/secondary/entry/south)
+"yiy" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/sign/directions/evac{
+ dir = 4;
+ pixel_y = 24
+ },
+/obj/structure/sign/directions/medical{
+ dir = 4;
+ pixel_y = 32
+ },
+/obj/structure/sign/directions/cargo{
+ dir = 4;
+ pixel_y = 40
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "purple"
+ },
+/area/station/hallway/primary/aft/west)
"yiE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -100467,13 +100568,21 @@
},
/area/station/hallway/primary/fore/west)
"yjn" = (
-/obj/effect/turf_decal/stripes/asteroid/end{
- dir = 1
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/structure/cable/orange,
-/obj/machinery/power/apc/directional/south,
-/turf/simulated/floor/plating,
-/area/station/science/test_chamber)
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/maintenance/gambling_den)
"yjp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -100526,11 +100635,6 @@
/area/station/security/warden)
"yjS" = (
/obj/item/stack/rods,
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -100664,7 +100768,7 @@
/obj/structure/cable,
/obj/effect/spawner/random_spawners/dirt_frequent,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/fore_starboard)
(1,1,1) = {"
rNK
@@ -110488,11 +110592,11 @@ rNK
rNK
rNK
rNK
-cav
-cav
-sji
-sji
-sji
+wSc
+wSc
+wSc
+wSc
+wSc
deW
aCz
sUK
@@ -110755,7 +110859,7 @@ dvD
bnp
ltr
ubY
-bIf
+fGA
xJa
xJa
xJa
@@ -111012,7 +111116,7 @@ dvE
sji
sji
nxA
-rUo
+gbb
xJa
xJa
xJa
@@ -111269,7 +111373,7 @@ azb
ueH
bsA
nxA
-vZt
+xyw
xJa
xJa
xJa
@@ -111526,7 +111630,7 @@ ciC
ciC
aFf
seh
-vZt
+xyw
xJa
xJa
xJa
@@ -111783,7 +111887,7 @@ abW
xJa
nxA
nxA
-rtt
+xyw
xJa
xJa
xJa
@@ -112115,7 +112219,7 @@ fYi
pTp
jwF
xyf
-jvx
+pFm
pFm
jsN
pFm
@@ -112126,7 +112230,7 @@ rho
uCK
uCK
uCK
-cUx
+eCI
uCK
uCK
bWE
@@ -112372,7 +112476,7 @@ eCI
vtY
lkL
aue
-iWO
+cWr
vtY
pXy
usD
@@ -112383,7 +112487,7 @@ vtY
vtY
vtY
uCK
-cUx
+eCI
vtY
pXy
pXy
@@ -112629,7 +112733,7 @@ jee
vtY
vtY
cWr
-xFT
+aue
bMX
rho
vtY
@@ -112886,7 +112990,7 @@ vtY
vtY
vtY
tXA
-liJ
+jee
aue
rho
vtY
@@ -113143,7 +113247,7 @@ vtY
vtY
vtY
vtY
-rRE
+jee
bMY
aEe
aEe
@@ -113634,7 +113738,7 @@ cMT
fav
cMT
cMT
-hfi
+cUx
grA
pXy
rho
@@ -113840,7 +113944,7 @@ xJa
gLH
uJE
bIR
-xhk
+rmq
xhk
xhk
xtN
@@ -114110,9 +114214,9 @@ sOm
ude
cKY
vFB
-cSU
-ubY
-dlf
+xyw
+xyw
+fWe
doL
bTL
mxF
@@ -114367,7 +114471,7 @@ dkp
aSs
dkp
dkp
-cSV
+duh
dkq
dkq
wsU
@@ -114887,7 +114991,7 @@ pXv
vKP
ihe
aYk
-fIg
+dkq
gsx
gbb
duh
@@ -115401,7 +115505,7 @@ dkq
dkq
doO
dkq
-fIg
+dkq
guD
hyY
ioJ
@@ -115679,7 +115783,7 @@ aXn
aXn
uSv
gEL
-nOi
+bzj
bcp
bcp
bcp
@@ -115909,8 +116013,8 @@ vFG
vFG
aUo
aUo
-aUo
-vFG
+dlf
+rVx
dkp
dpO
dIS
@@ -116166,7 +116270,7 @@ cph
vFG
aUo
izl
-aUo
+aNO
cYg
qCk
ctA
@@ -116244,7 +116348,7 @@ dOO
uZZ
bVS
glz
-uNH
+eUS
kmk
btg
fNK
@@ -116423,7 +116527,7 @@ aRT
vFG
aTw
kEb
-vFG
+cSV
cYh
qCk
dpV
@@ -116459,7 +116563,7 @@ bdR
cMT
naR
uJm
-eES
+rpm
cMT
faP
yfx
@@ -116680,7 +116784,7 @@ dkp
aSz
dkp
dkp
-aUq
+uCM
dkp
dkp
dpV
@@ -116760,7 +116864,7 @@ bWn
bWn
bUN
bVO
-oYb
+nOi
mCM
iOk
bmJ
@@ -116932,14 +117036,14 @@ lbr
hzh
joR
aQc
-bKg
+axg
cHi
-bKg
+axg
cLt
-bKg
-bKg
+axg
+cSU
cYn
-bKg
+axg
dqh
dKQ
liQ
@@ -117013,7 +117117,7 @@ xwS
gCh
wEe
gCh
-gCh
+lDe
gCh
tcl
gCh
@@ -117021,7 +117125,7 @@ pZq
eZX
iBn
lxQ
-eZX
+etb
wGo
rIf
nbB
@@ -117270,7 +117374,7 @@ gxo
mCM
mCM
oKK
-mCM
+eJF
mCM
mCM
ecG
@@ -117278,7 +117382,7 @@ mCM
mCM
iOk
oGs
-mCM
+eJF
mGM
mCM
mCM
@@ -117477,7 +117581,7 @@ mQU
iAO
aZb
vZj
-xlY
+bPw
vZo
xlY
xlY
@@ -117705,10 +117809,10 @@ gYW
tJs
tJs
cBL
-cEH
-cLz
-cLz
-cLz
+tJs
+tJs
+tJs
+tJs
qOk
dlp
dra
@@ -117959,14 +118063,14 @@ cgh
lyS
cnz
lyS
-lyS
-lyS
+brh
+dlq
cBN
cEX
cLA
-lyS
-lyS
-lyS
+dlq
+dlq
+dlq
dlq
drb
bWx
@@ -118094,8 +118198,8 @@ vWO
cuM
jvN
mas
-raj
-wOi
+rza
+gYw
wsR
wsR
wIq
@@ -118298,12 +118402,12 @@ btd
hsc
biB
biB
-vcB
-biB
-biB
-biB
-biB
-prN
+rRE
+nkf
+nkf
+nkf
+nkf
+aRn
btd
oQK
mVY
@@ -118603,7 +118707,7 @@ iVB
crv
fFE
knB
-hDv
+wOi
alD
hDv
iEl
@@ -118860,7 +118964,7 @@ kxo
dba
sJX
hDv
-hDv
+wOi
hDv
jyg
faF
@@ -119038,7 +119142,7 @@ fYA
fxA
tfU
umX
-brM
+wlU
oOg
oOg
oOg
@@ -119103,7 +119207,7 @@ pSN
vmU
txf
wMV
-kCg
+xEd
sEg
tHG
ckC
@@ -119359,8 +119463,8 @@ lyI
lyI
lyI
lyI
-cSI
-kCg
+yiy
+xEd
lxP
uMr
qOm
@@ -119612,12 +119716,12 @@ chQ
vxP
ekF
hhd
-wXc
+fil
fil
fil
ksi
jGC
-kCg
+xEd
jEr
uMr
djd
@@ -119869,12 +119973,12 @@ rQS
eEE
chQ
tTJ
-bNZ
+chQ
pMB
kJp
vkl
kSc
-kCg
+xEd
jEr
uMr
snb
@@ -120388,8 +120492,8 @@ qAH
ixR
wiE
grQ
-kCg
-jEr
+xEd
+giH
uMr
mdK
wiR
@@ -120538,7 +120642,7 @@ mYS
cfn
xla
xla
-drG
+tLy
dMP
iEe
qwd
@@ -120645,7 +120749,7 @@ fxp
fxp
uTv
vBs
-kCg
+xEd
ifz
jht
uMr
@@ -120833,7 +120937,7 @@ ktf
uzy
cki
cFF
-cFF
+wDL
pwt
boJ
sON
@@ -120902,8 +121006,8 @@ kMq
fxp
uTv
nGn
-kCg
-qTc
+xEd
+wXm
eGV
uMr
sNo
@@ -120927,8 +121031,8 @@ wRF
hLg
pon
aic
-hLs
-yjn
+dsY
+rza
alv
uyl
xhD
@@ -121090,7 +121194,7 @@ uvv
cFF
cFF
cFF
-cFF
+wDL
hZp
boJ
tzW
@@ -121159,7 +121263,7 @@ fxp
fxp
ylx
iqk
-kCg
+xEd
dnS
xYx
pPq
@@ -121347,7 +121451,7 @@ cFF
cFF
cFF
cFF
-cFF
+cHm
bEM
boJ
dKi
@@ -121425,7 +121529,7 @@ xOw
fCc
cnU
bQe
-cpB
+sKb
vvb
crv
twL
@@ -121589,7 +121693,7 @@ aXn
aXn
aXn
lPg
-igo
+iWO
kWu
lWR
uuF
@@ -122103,7 +122207,7 @@ aXn
mTc
wkS
nIF
-xod
+xdr
cLo
qxQ
lHU
@@ -122191,7 +122295,7 @@ xEd
ifz
udL
cGd
-uMr
+cGd
cGd
cGd
cGd
@@ -122217,7 +122321,7 @@ fNF
uyl
dhu
vPj
-qBm
+euL
pqm
lTx
uyl
@@ -122398,7 +122502,7 @@ rQO
wpF
wpF
xEN
-hzn
+wWP
jCE
wxY
xOD
@@ -122406,10 +122510,10 @@ sbn
sbn
sbn
vBV
-wpF
-wpF
+quW
+quW
wpl
-dSA
+quW
nRk
vRn
kbo
@@ -122448,7 +122552,7 @@ bqU
xNk
wDx
jUk
-nWA
+uxn
uxn
jgw
wIq
@@ -122643,7 +122747,7 @@ vnL
glm
vXX
wpF
-wDL
+yjn
wWP
xsc
wpF
@@ -122655,11 +122759,11 @@ mWU
quW
agO
quW
-rnC
-wXm
+wxY
+wph
vFf
wCB
-wpF
+quW
wpl
jrM
dcC
@@ -122705,8 +122809,8 @@ xEd
lxP
cGd
lmA
-kMZ
-giH
+uxn
+uxn
cmZ
wBr
cGd
@@ -122900,7 +123004,7 @@ vnT
sbn
odZ
wph
-wEB
+hzn
wph
wph
xOD
@@ -123157,7 +123261,7 @@ wHg
sbn
sbn
sbn
-wph
+cpB
wYw
xtR
sbn
@@ -123216,9 +123320,9 @@ shk
vFW
bXp
uuV
-gPL
+iFb
dXV
-pFr
+nlS
hQo
gmN
mbd
@@ -123447,7 +123551,7 @@ dgP
dgP
qDR
xmy
-hIU
+qDR
uJT
aXn
hUU
@@ -123730,10 +123834,10 @@ sLj
npb
cia
sWc
-gPL
+kCg
izC
-nlS
-jop
+rza
+nta
wIq
xPU
iwi
@@ -123754,7 +123858,7 @@ teA
xPU
hSZ
lMW
-fFz
+cWF
sKh
wsR
wIq
@@ -123987,7 +124091,7 @@ sLj
vFW
xxC
ciG
-gPL
+kCg
izC
sKh
nta
@@ -124011,7 +124115,7 @@ anv
xPU
wIq
sNR
-fFz
+cWF
wsR
wsR
wIq
@@ -124268,7 +124372,7 @@ dHN
xPU
wIq
wIq
-fFz
+cWF
wsR
rUU
wIq
@@ -124758,7 +124862,7 @@ ddw
jhA
uIC
ciG
-gPL
+kCg
izC
sKh
nta
@@ -125017,7 +125121,7 @@ nxX
irU
sOk
qyc
-dhH
+hIU
uPP
sKh
xPU
@@ -125296,7 +125400,7 @@ dHN
xPU
rVL
wsR
-fFz
+cWF
wIq
wIq
uYF
@@ -125553,7 +125657,7 @@ xIa
xPU
lDd
wIq
-eMR
+bcV
wIq
wIq
ahX
@@ -126940,7 +127044,7 @@ aij
whx
aij
aLt
-eJF
+vrQ
aqC
ckt
ksl
@@ -127196,7 +127300,7 @@ wDs
rAT
aZc
vrQ
-cUy
+vXM
aPc
avS
jHd
@@ -127451,9 +127555,9 @@ abW
abW
wDs
ccV
-rVx
-qLN
-aJp
+tbe
+vXM
+vrQ
wDs
avS
bhs
@@ -127708,7 +127812,7 @@ abW
abW
wDs
bbc
-wES
+tbe
rAT
wDs
wDs
@@ -127716,7 +127820,7 @@ avS
bhw
box
buq
-usr
+rJP
aIg
aJg
usr
@@ -127856,7 +127960,7 @@ wIq
wIq
wIq
sKh
-dwt
+lMW
neD
ftr
wIq
@@ -127965,7 +128069,7 @@ abW
abW
wDs
bbc
-wES
+tbe
wDs
tXQ
tXQ
@@ -127989,7 +128093,7 @@ cGw
cGn
cPA
cTD
-cGn
+aPd
dlL
hRA
oTb
@@ -128113,7 +128217,7 @@ eHE
cNt
wIq
sKh
-rjx
+dEm
wIq
sKo
sKh
@@ -128222,7 +128326,7 @@ abW
abW
rAT
bbc
-wES
+tbe
vPt
tXQ
cSW
@@ -128479,7 +128583,7 @@ abW
abW
atg
vXM
-aLu
+vrQ
vPt
tXQ
aTu
@@ -128735,18 +128839,18 @@ abW
abW
abW
dkg
-rVx
-jdL
+tbe
+vXM
wDs
tXQ
aHc
bGI
bGI
bog
-aHc
+wES
bCx
aKW
-aJj
+bYk
cKp
gGB
abW
@@ -128992,7 +129096,7 @@ abW
abW
abW
atB
-wES
+tbe
wDs
wDs
tXQ
@@ -129000,7 +129104,7 @@ aTP
bca
bik
bih
-aHc
+aGf
bca
aKW
aEF
@@ -129139,11 +129243,11 @@ wIq
eOu
mvF
wIq
-cGd
-rfn
+dGU
+dGU
mtz
-rfn
-rfn
+dGU
+dGU
plk
khY
stN
@@ -129257,7 +129361,7 @@ aTV
qLa
kra
cAW
-aHc
+aGf
bCy
aKW
aJj
@@ -129396,11 +129500,11 @@ wIq
wIq
wIq
wIq
-rfn
+dGU
hyd
tJW
shP
-rfn
+dGU
sHB
lvB
jRo
@@ -129506,7 +129610,7 @@ abW
abW
wDs
tbe
-cUy
+vXM
vPt
wDs
tXQ
@@ -129514,8 +129618,8 @@ aUh
byj
byj
aHc
-aHc
-byj
+jdL
+uSO
aKW
aJk
aKl
@@ -129653,11 +129757,11 @@ rWw
rWw
rWw
tTD
-rfn
+dGU
eii
xEi
hNu
-rfn
+dGU
iwD
bxf
aOi
@@ -129763,8 +129867,8 @@ abW
abW
vPt
auL
-aNO
-coX
+vrQ
+vrQ
wDs
tXQ
nEn
@@ -129819,7 +129923,7 @@ aXP
aXP
aXP
bdm
-aXP
+vBm
cIh
cIO
wWC
@@ -129910,11 +130014,11 @@ rNK
rNK
rNK
lzH
-rfn
+dGU
jRK
qRt
kaD
-rfn
+dGU
raX
flr
flr
@@ -130021,7 +130125,7 @@ abW
vPt
wDs
bbc
-cUy
+vXM
wDs
tXQ
xCj
@@ -130167,11 +130271,11 @@ rNK
rNK
rNK
lzH
-oyl
-oyl
-jrJ
+eyH
+eyH
+vUb
dgL
-oyl
+eyH
lzH
rNK
rNK
@@ -130278,7 +130382,7 @@ abW
wDs
vPt
bbc
-wES
+tbe
vPt
tXQ
uyM
@@ -130332,7 +130436,7 @@ beR
aXP
aXP
aXP
-cGq
+oxk
fph
rZe
cIZ
@@ -130425,9 +130529,9 @@ rNK
rNK
lzH
lzH
-oyl
-jrJ
-oyl
+eyH
+vUb
+eyH
lzH
lzH
rNK
@@ -130535,7 +130639,7 @@ abW
wDs
rAT
awc
-aLu
+vrQ
rAT
wDs
aUi
@@ -130682,9 +130786,9 @@ rNK
rNK
rNK
lzH
-oyl
-jrJ
-oyl
+eyH
+vUb
+eyH
lzH
rNK
rNK
@@ -130792,17 +130896,17 @@ abW
abW
vPt
rAT
-axg
-qLN
-bYk
-bYk
-bYk
-aMX
-bpx
-aGf
-qLN
-bYk
-jdL
+tbe
+vXM
+tbe
+tbe
+tbe
+vrQ
+dkg
+avY
+vXM
+tbe
+vXM
aKm
abW
abW
@@ -130846,7 +130950,7 @@ kZW
beR
fph
rxi
-cIs
+hLs
lip
joZ
bfW
@@ -130943,18 +131047,18 @@ lzH
utz
snQ
dhv
-lAv
-lAv
-lAv
-peG
-lAv
-lAv
-lAv
-peG
-lAv
-lAv
-lAv
-peG
+skB
+skB
+skB
+xJM
+skB
+skB
+skB
+xJM
+skB
+skB
+skB
+xJM
lzH
lzH
ejE
@@ -131103,7 +131207,7 @@ aZi
hqg
bbM
lip
-cIs
+hLs
lip
cIs
lip
@@ -131323,7 +131427,7 @@ abW
abW
vPt
csz
-rmq
+vrQ
nuE
nuE
btv
@@ -131580,7 +131684,7 @@ abW
abW
vPt
vrQ
-aLu
+vrQ
nuE
bqF
cGM
@@ -131875,7 +131979,7 @@ bbo
lip
cIq
lip
-eFn
+rJv
bgf
cFj
iSD
@@ -132093,8 +132197,8 @@ abW
abW
abW
vPt
-aPd
-rJP
+vrQ
+vrQ
nuE
brY
btA
@@ -132132,7 +132236,7 @@ bbp
bbO
bcB
lip
-eFn
+rJv
bgf
bfZ
aYJ
@@ -132903,7 +133007,7 @@ iYO
gcU
gcU
ooB
-eFn
+rJv
bgf
buQ
aYJ
@@ -133417,7 +133521,7 @@ awd
xSW
aYJ
rHQ
-eFn
+rJv
bgf
buQ
sBO
@@ -133891,7 +133995,7 @@ bYn
cdf
tpA
oKm
-eMh
+xPq
djy
pGv
kOs
@@ -134743,7 +134847,7 @@ mVp
mVp
mVp
vME
-pWW
+vME
cUm
mVp
gvo
@@ -135982,12 +136086,12 @@ aXD
aXR
gcU
sdv
-fbA
+awd
bbv
gIt
bcH
aYJ
-eQQ
+cLz
bgf
buQ
fBC
@@ -137497,8 +137601,8 @@ abW
abW
cMz
cRT
-bIl
-uSO
+aTb
+rjd
dmA
dyD
vuY
@@ -137589,15 +137693,15 @@ rNK
rNK
cmn
tgI
-skB
-skB
-skB
+xJR
+xJR
+xJR
cXC
qkc
qkc
kLA
tUG
-skB
+xJR
rNK
rNK
rNK
@@ -137848,7 +137952,7 @@ pVK
pVK
pVK
tgI
-xJM
+dWQ
tgI
knD
pVK
@@ -138265,7 +138369,7 @@ vpg
czt
qbE
gKc
-lxO
+dQr
flF
flF
sSq
@@ -138522,7 +138626,7 @@ vpg
czu
axj
rUq
-aTb
+rBk
rBk
bvD
aKC
@@ -138618,8 +138722,8 @@ rNK
rNK
rNK
rNK
-eyH
-vUb
+sox
+oEP
xxg
bhO
bhO
@@ -138875,9 +138979,9 @@ rNK
rNK
rNK
rNK
-eyH
-vUb
-eyH
+sox
+oEP
+sox
bhO
bhO
bhO
@@ -139131,11 +139235,11 @@ rNK
rNK
rNK
bhO
-eyH
-eyH
-vUb
-eyH
-eyH
+sox
+sox
+oEP
+sox
+sox
bhO
hUU
hUU
@@ -139388,7 +139492,7 @@ rNK
rNK
aXn
bhO
-dGU
+iqA
eVY
dLb
nKY
@@ -139902,11 +140006,11 @@ bhO
bhO
bhO
bhO
-dGU
+iqA
pnb
eLX
bGk
-dGU
+iqA
pue
mJk
mJk
@@ -140159,8 +140263,8 @@ bhO
bhO
bhO
bhO
-dGU
-dGU
+iqA
+iqA
plQ
plQ
plQ
@@ -140430,7 +140534,7 @@ ppd
fRZ
abc
gak
-uCM
+wKu
wKu
mIS
vLT
@@ -140688,8 +140792,8 @@ wLr
cAU
qSl
imG
-pAM
-qHn
+ggK
+vpJ
xOp
jEo
sFj
@@ -140943,7 +141047,7 @@ aXn
aXn
aXn
chX
-imG
+foP
gge
vWF
vWF
@@ -141455,9 +141559,9 @@ wLr
wLr
mpB
mpB
-ceK
-tXf
-cfH
+ixC
+bKg
+fbA
vWF
vWF
vWF
@@ -141969,7 +142073,7 @@ dQc
wGZ
xZK
wLr
-imG
+foP
tXf
dYD
tWC
@@ -143004,9 +143108,9 @@ tWC
bmg
bmg
xEJ
-bmg
+qRO
tWC
-aJW
+pAM
eWu
vjb
wGJ
@@ -143256,7 +143360,7 @@ aXn
wLr
uir
wZA
-brh
+cdG
tWC
tWC
tWC
@@ -143513,7 +143617,7 @@ aXn
aXn
uir
evC
-sSj
+yep
xSo
xSo
oDP
@@ -144983,14 +145087,14 @@ rPz
rPz
rPz
jQS
-iFb
-jLe
-ncP
+rPz
+rPz
+rPz
aAk
qTK
-kYZ
+rPz
rxq
-sXL
+cUz
stK
vXn
tjb
@@ -145445,7 +145549,7 @@ qKQ
mwF
qKQ
asE
-oyx
+piE
okP
kVY
aCy
@@ -145498,8 +145602,8 @@ jNc
qnd
bgS
uWV
-vRH
-oKU
+fmI
+fmI
oVG
tTt
nuU
@@ -145522,9 +145626,9 @@ mGs
lfd
ukL
bOS
-ukL
-ukL
-ukL
+qhD
+qhD
+qhD
fgi
bOL
sOO
@@ -145755,7 +145859,7 @@ lCk
vHL
muL
epT
-tLy
+tcx
tcx
hfV
egr
@@ -145830,7 +145934,7 @@ dnc
xIB
aSw
pQa
-pQa
+jLe
pQa
pQa
pKz
@@ -146012,11 +146116,11 @@ wve
vHL
pNK
bNY
-taM
-fmI
+ivK
+pWW
lUQ
uyz
-npl
+nde
npl
seO
dBQ
@@ -146087,7 +146191,7 @@ tgU
vVP
vgP
dxM
-dxM
+dwt
dxM
dxM
qmy
@@ -146214,7 +146318,7 @@ oyx
asE
lPi
wSP
-lPi
+jop
buv
oyx
mmW
@@ -146273,7 +146377,7 @@ iET
fmI
gIY
vXn
-bmS
+pFr
bmS
bmS
bmS
@@ -146340,7 +146444,7 @@ vpJ
vpJ
vpJ
vpJ
-dJG
+oxO
nFW
pLr
pLr
@@ -146581,7 +146685,7 @@ qUi
ivI
mUa
lbf
-squ
+afX
lbf
afX
eDQ
@@ -146595,16 +146699,16 @@ omG
vpJ
wJY
moj
-euL
+moj
+nRz
nRz
-qRO
nFW
cfh
eJd
rrt
hNb
wMQ
-wxE
+daX
djw
sla
xMQ
@@ -146852,7 +146956,7 @@ sCn
vpJ
vRX
rao
-mLO
+vRX
nrP
vWF
nFW
@@ -146979,9 +147083,9 @@ sYg
vBu
vBu
okP
-qAY
-rjd
-rjd
+akN
+akN
+akN
ipB
cAS
oGZ
@@ -147106,9 +147210,9 @@ aXn
vpJ
dJb
vRX
-rJv
-mJk
-mLO
+imG
+vRX
+vRX
vWF
vpJ
vWF
@@ -147362,8 +147466,8 @@ aXn
aXn
wLr
ogk
-rIn
-qhD
+vRX
+imG
vWF
vWF
vWF
@@ -147619,7 +147723,7 @@ aXn
aXn
wLr
cdx
-cdG
+vRX
vWF
vWF
vWF
@@ -147876,7 +147980,7 @@ aXn
aXn
aXn
vRX
-cdG
+vRX
vWF
vWF
vWF
@@ -148095,9 +148199,9 @@ xTL
xTL
cFu
bCg
-nkf
+mqf
bMz
-vdN
+vHH
aZN
itf
cQy
@@ -148133,16 +148237,16 @@ aXn
aXn
aXn
vRX
-cdG
+vRX
vRX
sWR
sWR
-rIn
-mJk
-mJk
-mJk
-mJk
-cdj
+vRX
+vRX
+vRX
+vRX
+vRX
+vRX
vRX
xEX
vpJ
@@ -148325,7 +148429,7 @@ qQc
max
xJY
jpX
-iET
+oKU
fmI
neH
bJU
@@ -148348,8 +148452,8 @@ dBe
bCg
bEv
bFG
-xTL
-xTL
+bpx
+bpx
adV
bCg
vIQ
@@ -148390,17 +148494,17 @@ aXn
aXn
yev
vRX
-pob
-mJk
-mJk
+vRX
+vRX
+vRX
yjS
-uom
+qds
vWF
vWF
eEj
imG
qds
-mJk
+vRX
iYL
oxO
sSf
@@ -148612,7 +148716,7 @@ bCg
ovW
tiG
jeX
-ssT
+jeX
tiG
wRa
wRa
@@ -148647,7 +148751,7 @@ vpJ
vpJ
pXP
vRX
-cdG
+vRX
qZT
imG
ble
@@ -148658,8 +148762,8 @@ kXu
chI
chI
chI
-oxk
-xMQ
+vRX
+vpJ
uKO
djw
jUc
@@ -148869,7 +148973,7 @@ bCg
vWu
cKk
jXm
-utF
+vHH
gFg
gFg
gFg
@@ -148904,9 +149008,9 @@ tVf
djo
djo
imG
-xON
+vRX
bGh
-ePG
+vRX
pts
hSk
jlY
@@ -149162,7 +149266,7 @@ djo
wLr
ceK
vRX
-sbf
+bGh
vun
chI
vHw
@@ -149171,7 +149275,7 @@ tBT
pWQ
tWq
hDk
-hDk
+wxE
wAo
oVj
cjF
@@ -149354,7 +149458,7 @@ sHw
jUJ
jCn
cEL
-taM
+fmI
iLa
dzw
cOv
@@ -149562,7 +149666,7 @@ nFa
nFa
nFa
nFa
-skB
+pbR
nFa
nFa
nFa
@@ -149611,7 +149715,7 @@ kMQ
jUJ
jCn
cEL
-taM
+fmI
iPu
dzw
rqu
@@ -149676,8 +149780,8 @@ aXn
aXn
aXn
aXn
-etb
-cdj
+bGh
+vRX
chI
gqQ
rKr
@@ -149688,7 +149792,7 @@ vlP
jNz
jaa
chI
-daX
+ncP
djw
jUc
evU
@@ -149832,7 +149936,7 @@ fue
qWL
vct
owf
-piE
+ssT
eOi
aRx
gNQ
@@ -149868,7 +149972,7 @@ hle
jUJ
jUJ
jvd
-waB
+ftZ
tKj
dzw
lXe
@@ -149897,7 +150001,7 @@ bKZ
bME
bME
kSI
-rHq
+bME
yfZ
rwg
teW
@@ -150191,7 +150295,7 @@ aXn
aXn
fbs
nyL
-kcF
+vRX
chI
mTL
fcw
@@ -150333,7 +150437,7 @@ lzH
lzH
lzH
lzH
-skB
+pbR
lzH
lzH
lzH
@@ -150381,8 +150485,8 @@ wKe
imc
vLl
jUJ
-wiI
-cbT
+vHH
+vHH
eGO
dzw
dzw
@@ -150413,7 +150517,7 @@ uqv
uHR
uhF
cQb
-wvp
+jAg
drp
xWf
wvp
@@ -150590,7 +150694,7 @@ nFa
nFa
nFa
nFa
-skB
+pbR
nFa
nFa
nFa
@@ -150714,7 +150818,7 @@ iTC
thC
njJ
njJ
-njJ
+squ
oTu
xjc
rns
@@ -150971,7 +151075,7 @@ jvl
jvl
jvl
jvl
-jvl
+pob
jvl
qoU
jvl
@@ -151219,16 +151323,16 @@ cuw
cuw
cuw
pmS
-ixC
-ixC
-ixC
-ixC
-ixC
-ixC
-ixC
-ixC
+cuw
+cuw
+cuw
+cuw
+cuw
+cuw
+cuw
+cuw
evc
-cMp
+kYZ
cMp
lcR
tDr
@@ -151361,7 +151465,7 @@ lzH
lzH
lzH
lzH
-skB
+pbR
lzH
lzH
lzH
@@ -151406,7 +151510,7 @@ bni
sfJ
eUk
vpG
-vpG
+lxO
piZ
xTb
vFQ
@@ -151618,7 +151722,7 @@ nFa
nFa
nFa
nFa
-skB
+pbR
nFa
nFa
nFa
@@ -151951,7 +152055,7 @@ uVC
vPs
bLe
bDA
-aRn
+vHH
bAn
yfZ
qpW
@@ -152208,7 +152312,7 @@ vCS
xhG
kkD
bDA
-oqZ
+vHH
wtg
yfZ
yfZ
@@ -152217,7 +152321,7 @@ xyF
xyF
sVv
yfZ
-hjJ
+gFg
gRw
tvJ
aZN
@@ -152389,7 +152493,7 @@ lzH
lzH
lzH
lzH
-skB
+pbR
lzH
lzH
lzH
@@ -152432,7 +152536,7 @@ xBW
jqB
hOK
rxR
-myT
+xod
qPs
uWI
sua
@@ -152475,7 +152579,7 @@ xiQ
xiQ
xiQ
gFg
-sWr
+xAV
mqf
aZN
aZM
@@ -152646,7 +152750,7 @@ nFa
nFa
nFa
nFa
-skB
+pbR
nFa
nFa
nFa
@@ -152689,7 +152793,7 @@ ntW
ott
qRs
lwz
-myT
+coX
gnh
sTZ
brL
@@ -152946,7 +153050,7 @@ pJa
pym
wrU
cKT
-myT
+sCF
myT
ipv
bjg
@@ -152989,7 +153093,7 @@ jBh
gSQ
gFg
gFg
-png
+vIQ
mqf
aZN
aZM
@@ -153215,7 +153319,7 @@ umz
lnN
vHH
wyL
-vBm
+wyL
rRe
glw
lnI
@@ -153246,7 +153350,7 @@ jvZ
gFg
itf
aLH
-pps
+mqf
mqf
aZN
aZM
@@ -153417,7 +153521,7 @@ rNK
rNK
rNK
rNK
-skB
+pbR
rNK
rNK
rNK
@@ -153466,13 +153570,13 @@ aAB
myT
euD
hOK
-jAg
-uZC
+gSQ
+ezI
swN
fqw
pIc
vHH
-oOh
+vHH
cKk
bpJ
dxK
@@ -153503,7 +153607,7 @@ aLH
itf
itf
itf
-sWr
+xAV
xAV
gFg
gFg
@@ -153674,7 +153778,7 @@ nFa
nFa
nFa
nFa
-skB
+pbR
nFa
nFa
nFa
@@ -153760,7 +153864,7 @@ aLH
itf
itf
itf
-sWr
+xAV
xAV
ozK
aUU
@@ -154009,15 +154113,15 @@ bLj
cFA
itf
mqf
-aFh
-xTb
-bNP
-bJb
+bvb
+vHH
+bZq
+lux
mMw
-bJb
-bJb
-bJb
-lWu
+lux
+lux
+lux
+egq
xAV
aLH
aZM
@@ -154445,7 +154549,7 @@ lzH
lzH
lzH
lzH
-skB
+pbR
lzH
lzH
lzH
@@ -154458,7 +154562,7 @@ rNK
rNK
lCC
okQ
-doy
+mAq
rWb
nLP
jZz
@@ -154702,7 +154806,7 @@ nFa
nFa
nFa
nFa
-skB
+pbR
nFa
nFa
nFa
@@ -154715,7 +154819,7 @@ rNK
rNK
lCC
rPm
-doy
+mAq
rWb
nLP
mWC
@@ -154972,7 +155076,7 @@ rNK
lCC
lCC
rPm
-aYT
+vdj
rWb
nLP
hYe
@@ -155229,7 +155333,7 @@ rNK
lCC
alc
rPm
-rUB
+gGH
qGa
qGa
qGa
@@ -155287,7 +155391,7 @@ uyn
lzO
gGb
biN
-ivK
+wyL
gFg
uPV
lye
@@ -155498,7 +155602,7 @@ tgV
tgV
lpY
rGc
-vXF
+rvO
iIK
psV
pJm
@@ -155542,9 +155646,9 @@ bAg
dZd
dZd
rdq
-bkH
+ePG
biN
-bcV
+vHH
itf
jOE
lnB
@@ -155743,7 +155847,7 @@ rNK
lCC
mKo
okQ
-doy
+mAq
qGa
jHE
huP
@@ -156000,7 +156104,7 @@ rNK
lCC
jfS
okQ
-wlU
+fAx
qGa
ihY
ibJ
@@ -156257,7 +156361,7 @@ rNK
lCC
alc
rPm
-doy
+mAq
qGa
bgx
ibJ
@@ -156281,7 +156385,7 @@ gYz
iLv
aIB
aIB
-aIB
+sbf
iLv
iNj
nYc
@@ -156514,7 +156618,7 @@ rNK
lCC
alc
rPm
-doy
+mAq
qGa
ihY
ibJ
@@ -156531,15 +156635,15 @@ aRx
rWb
rWb
rWb
-sCF
+vdj
uKL
aIA
-iLv
+raj
ldS
qTi
rTs
mrU
-iLv
+hfi
wOx
nYc
rNK
@@ -156771,7 +156875,7 @@ rNK
lCC
unU
rPm
-lDe
+hqL
qGa
tmM
jth
@@ -157028,7 +157132,7 @@ rPi
rPi
hHP
jTA
-sZh
+dib
qGa
qGa
qGa
@@ -157041,30 +157145,30 @@ wzS
kZD
kZD
aNh
-eUS
-eUS
-eUS
-eUS
-lxo
+vdj
+vdj
+vdj
+vdj
+vdj
lzz
-vVz
-vVz
-eUS
-ola
+mAq
+doy
+vdj
+vdj
qcb
-jNg
-uXE
-vFQ
-vFQ
-vFQ
-vFQ
-vFQ
-vFQ
+oSN
+gFg
+gFg
+gFg
+gFg
+gFg
+gFg
+gFg
idK
-vFQ
-vFQ
-ieS
-vFQ
+gFg
+gFg
+lBr
+gFg
vTx
dYY
itf
@@ -157076,7 +157180,7 @@ tpp
bil
oXg
bil
-vdF
+gFg
gSQ
vOv
biN
@@ -157286,7 +157390,7 @@ sVO
cmb
gRg
kGl
-qIg
+vuW
dib
qGa
wGv
@@ -157294,9 +157398,9 @@ oWg
dcz
qGa
rWb
-aYR
-gpY
-eUS
+vdj
+vdj
+vdj
ryD
vdj
rWb
@@ -157305,10 +157409,10 @@ mAq
glQ
wJQ
mAq
-mAq
-cpC
-mdT
-cpC
+rjx
+bkW
+bkW
+vRH
oSN
fCP
gFg
@@ -157333,7 +157437,7 @@ dAi
tPV
bfr
bil
-dCS
+gFg
dCU
fqw
biN
@@ -157544,14 +157648,14 @@ hqL
hqL
mmv
hqL
-dGH
+rPm
qGa
qGa
qGa
qGa
rWb
ukH
-aYT
+vdj
rWb
rWb
rWb
@@ -157564,8 +157668,8 @@ waj
waj
waj
ayS
-sfS
cpC
+mdT
rWb
xia
gSQ
@@ -157802,13 +157906,13 @@ alc
alc
mmv
kGl
-qIg
+vuW
svp
-xSl
+vuW
doh
-qIg
-qIg
-cHm
+vuW
+vuW
+vuW
vuW
vuW
bis
@@ -158079,7 +158183,7 @@ bgB
iSM
wDk
wzx
-sOD
+dGH
lMN
alc
gSQ
@@ -158104,7 +158208,7 @@ bil
bil
itf
gSQ
-dCS
+gFg
gSQ
gSQ
gSQ
@@ -158361,7 +158465,7 @@ eNg
vFQ
vFQ
vFQ
-dCT
+vFQ
vFQ
vFQ
xTb
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index 88d19086ad5c..90ba1744be31 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -34,7 +34,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"abD" = (
/obj/structure/railing{
dir = 1
@@ -74,7 +74,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"acf" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -88,7 +88,7 @@
icon_state = "2-4"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"acg" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -107,7 +107,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"ach" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -115,12 +115,12 @@
icon_state = "0-8"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"aci" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"acj" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -128,7 +128,7 @@
icon_state = "0-4"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"aco" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -147,7 +147,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"acp" = (
/obj/machinery/power/tracker,
/obj/structure/cable{
@@ -157,7 +157,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"acC" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -175,7 +175,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"acF" = (
/obj/structure/lattice/catwalk,
/turf/space,
@@ -188,7 +188,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"acJ" = (
/obj/docking_port/stationary{
dheight = 9;
@@ -228,7 +228,7 @@
"adg" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"adh" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -526,7 +526,7 @@
/area/station/hallway/secondary/entry/east)
"afg" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"afh" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -577,7 +577,7 @@
dir = 9
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"afx" = (
/obj/machinery/power/smes,
/obj/machinery/light/small{
@@ -591,7 +591,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"afy" = (
/obj/machinery/camera{
c_tag = "Fore Starboard Solars";
@@ -603,7 +603,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"afz" = (
/obj/structure/table/reinforced,
/obj/item/storage/belt/utility,
@@ -667,7 +667,7 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"afO" = (
/obj/machinery/conveyor{
dir = 4;
@@ -691,7 +691,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"agd" = (
/obj/machinery/light{
dir = 8
@@ -2561,7 +2561,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"apG" = (
/turf/simulated/wall,
/area/station/maintenance/electrical_shop)
@@ -3527,7 +3527,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"asi" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -3841,7 +3841,7 @@
icon_state = "1-4"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"asW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -3886,7 +3886,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"atb" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -3894,12 +3894,12 @@
icon_state = "0-8"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"atc" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"atd" = (
/turf/simulated/wall/r_wall,
/area/station/engineering/controlroom)
@@ -4144,7 +4144,7 @@
icon_state = "0-4"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"atL" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -4163,7 +4163,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"atM" = (
/obj/structure/cable{
d1 = 4;
@@ -4234,7 +4234,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"atV" = (
/obj/structure/chair/stool{
dir = 1
@@ -4278,11 +4278,11 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"atZ" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aua" = (
/obj/structure/rack,
/obj/item/flashlight,
@@ -7998,7 +7998,7 @@
icon_state = "0-2"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aEc" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -8007,7 +8007,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aEe" = (
/obj/machinery/light{
dir = 8
@@ -8189,7 +8189,7 @@
dir = 10
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aEF" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -9077,9 +9077,6 @@
icon_state = "neutralfull"
},
/area/station/security/permabrig)
-"aGY" = (
-/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarport)
"aGZ" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/incinerator)
@@ -9559,7 +9556,7 @@
dir = 9
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aIr" = (
/obj/machinery/power/smes,
/obj/machinery/light/small{
@@ -9573,7 +9570,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aIs" = (
/obj/machinery/camera{
c_tag = "Port Fore Solars";
@@ -9592,7 +9589,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aIt" = (
/obj/machinery/disposal,
/obj/structure/sign/deathsposal{
@@ -10014,7 +10011,7 @@
},
/obj/effect/landmark/spawner/nukedisc_respawn,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aJK" = (
/obj/machinery/light,
/obj/effect/turf_decal/stripes/line,
@@ -10036,7 +10033,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aJN" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -10529,12 +10526,12 @@
dir = 10
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aKZ" = (
/obj/machinery/alarm/directional/south,
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aLa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -10564,7 +10561,7 @@
dir = 6
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aLd" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 5
@@ -14063,7 +14060,7 @@
/obj/machinery/alarm/directional/south,
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aUt" = (
/obj/machinery/power/solar_control{
dir = 8;
@@ -14074,7 +14071,7 @@
dir = 6
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aUv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -30801,13 +30798,6 @@
"bLt" = (
/turf/simulated/floor/carpet,
/area/station/security/detective)
-"bLu" = (
-/obj/machinery/computer/med_data{
- dir = 8
- },
-/obj/machinery/requests_console/directional/east,
-/turf/simulated/floor/carpet,
-/area/station/security/detective)
"bLv" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -50630,7 +50620,7 @@
/area/station/medical/reception)
"cPC" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cPD" = (
/obj/structure/railing{
dir = 4
@@ -51088,7 +51078,7 @@
dir = 9
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cRg" = (
/obj/item/kirbyplants,
/turf/simulated/floor/plasteel{
@@ -51167,7 +51157,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cRD" = (
/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_2)
@@ -51557,7 +51547,7 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cSN" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -51565,7 +51555,7 @@
icon_state = "0-8"
},
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"cSO" = (
/obj/structure/rack,
/obj/item/storage/belt/medical,
@@ -51837,7 +51827,7 @@
"cTN" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"cTO" = (
/obj/structure/chair/office/light{
dir = 4
@@ -52412,7 +52402,7 @@
dir = 10
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cWa" = (
/obj/machinery/camera{
c_tag = "Port Hallway South"
@@ -53079,7 +53069,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"cZb" = (
/obj/machinery/sleeper{
dir = 4
@@ -53426,7 +53416,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"dal" = (
/obj/structure/cable{
d1 = 1;
@@ -53551,7 +53541,7 @@
icon_state = "2-4"
},
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"daA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -53575,7 +53565,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"daD" = (
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall,
@@ -53605,7 +53595,7 @@
icon_state = "0-4"
},
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"daI" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -53683,7 +53673,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"daW" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -53704,7 +53694,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"dbd" = (
/obj/structure/table/glass,
/obj/item/storage/box/beakers{
@@ -53729,7 +53719,7 @@
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"dbp" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -60583,7 +60573,7 @@
},
/obj/effect/landmark/spawner/nukedisc_respawn,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dGw" = (
/turf/simulated/wall,
/area/station/medical/virology)
@@ -61331,9 +61321,8 @@
},
/area/station/service/chapel)
"dLt" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/turf/simulated/floor/carpet/black,
/area/station/service/chapel)
@@ -61833,7 +61822,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"dOO" = (
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
@@ -61935,7 +61924,7 @@
/area/station/engineering/hardsuitstorage)
"dPq" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dPr" = (
/obj/structure/cable{
d1 = 2;
@@ -62183,7 +62172,7 @@
dir = 9
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dQa" = (
/obj/machinery/power/smes,
/obj/machinery/light/small{
@@ -62197,7 +62186,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dQb" = (
/obj/structure/sign/electricshock,
/turf/simulated/wall/r_wall,
@@ -62318,7 +62307,7 @@
"dQB" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"dQC" = (
/obj/machinery/field/generator{
anchored = 1;
@@ -62370,7 +62359,7 @@
},
/obj/effect/landmark/spawner/nukedisc_respawn,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dQN" = (
/obj/structure/table/reinforced,
/obj/item/stack/packageWrap,
@@ -62413,9 +62402,8 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/machinery/firealarm/directional/west,
/turf/simulated/floor/plasteel/grimy,
@@ -62468,9 +62456,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/turf/simulated/floor/plasteel/grimy,
/area/station/service/chapel/office)
@@ -62506,7 +62493,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dRc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -62590,12 +62577,12 @@
dir = 10
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dRp" = (
/obj/machinery/alarm/directional/south,
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dRq" = (
/obj/machinery/power/apc/directional/south,
/obj/structure/cable,
@@ -62603,7 +62590,7 @@
dir = 6
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dRr" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -63222,7 +63209,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"dTY" = (
/obj/structure/closet/coffin,
/obj/machinery/light/small{
@@ -63257,6 +63244,13 @@
icon_state = "cult"
},
/area/station/service/chapel/office)
+"dUf" = (
+/obj/machinery/computer/med_data{
+ dir = 8
+ },
+/obj/machinery/requests_console/directional/east,
+/turf/simulated/floor/carpet,
+/area/station/security/detective)
"dUi" = (
/obj/item/kirbyplants,
/obj/structure/cable{
@@ -63567,7 +63561,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"dVo" = (
/obj/item/kirbyplants,
/obj/structure/cable{
@@ -63638,7 +63632,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"dWf" = (
/obj/docking_port/stationary{
dheight = 9;
@@ -63947,7 +63941,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dXI" = (
/obj/structure/chair/wood{
dir = 4
@@ -64181,7 +64175,7 @@
icon_state = "0-4"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"dYJ" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -64190,7 +64184,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"dYL" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -64204,7 +64198,7 @@
icon_state = "1-4"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"dYM" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -64223,7 +64217,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"dYN" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -64231,7 +64225,7 @@
icon_state = "0-8"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"dYO" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -64250,7 +64244,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"dYP" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -64264,7 +64258,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"dYR" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -64272,7 +64266,7 @@
icon_state = "0-2"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"dYS" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -64281,7 +64275,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"dYT" = (
/obj/structure/window/reinforced{
dir = 4
@@ -65307,7 +65301,7 @@
icon_state = "0-2"
},
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"exy" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -66521,7 +66515,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"ffG" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -66986,7 +66980,7 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"frp" = (
/obj/structure/flora/ausbushes/sunnybush,
/obj/structure/flora/ausbushes/lavendergrass,
@@ -68548,7 +68542,7 @@
"gmT" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"gng" = (
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -73055,7 +73049,7 @@
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/spawner/airlock/e_to_w,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"iYX" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
@@ -73676,7 +73670,7 @@
"jtb" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"jtD" = (
/obj/machinery/light_switch{
dir = 1;
@@ -73918,7 +73912,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"jCU" = (
/obj/structure/sign/poster/official/random{
pixel_y = 32
@@ -73948,7 +73942,7 @@
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/spawner/airlock/w_to_e,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"jEI" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
autolink_id = "engines_vent";
@@ -78272,6 +78266,9 @@
icon_state = "neutralfull"
},
/area/station/hallway/primary/starboard/west)
+"mgS" = (
+/turf/simulated/wall/r_wall,
+/area/station/maintenance/solar_maintenance/fore_port)
"mhf" = (
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
@@ -81152,7 +81149,7 @@
"nKk" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"nKs" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -81717,7 +81714,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"oei" = (
/turf/simulated/wall,
/area/station/security/interrogation)
@@ -81742,7 +81739,7 @@
"ofi" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"ofu" = (
/turf/simulated/wall,
/area/station/hallway/primary/central/west)
@@ -82455,7 +82452,7 @@
/obj/effect/turf_decal/delivery,
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"ozw" = (
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
@@ -84198,7 +84195,7 @@
dir = 8
},
/turf/simulated/floor/plasteel,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"pzQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -84482,7 +84479,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"pGk" = (
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/railing{
@@ -84606,7 +84603,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"pIY" = (
/obj/structure/cable{
d2 = 2;
@@ -85262,7 +85259,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"qbI" = (
/turf/simulated/floor/plasteel{
dir = 8;
@@ -86045,7 +86042,7 @@
/obj/effect/turf_decal/delivery,
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"qFT" = (
/obj/structure/table/wood,
/obj/item/clipboard,
@@ -86104,7 +86101,7 @@
icon_state = "0-8"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"qHE" = (
/obj/machinery/newscaster{
dir = 1;
@@ -86602,7 +86599,7 @@
dir = 4
},
/turf/simulated/floor/plasteel,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"qWs" = (
/obj/machinery/computer/arcade{
dir = 1
@@ -87393,7 +87390,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"rod" = (
/turf/simulated/floor/plasteel/white,
/area/station/medical/cryo)
@@ -87595,7 +87592,7 @@
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/spawner/airlock/e_to_w,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"rtU" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/atmos/glass{
@@ -88564,7 +88561,7 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"rXR" = (
/obj/machinery/door/window/brigdoor{
dir = 8;
@@ -90496,7 +90493,7 @@
dir = 6
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"sQa" = (
/obj/structure/closet,
/obj/effect/decal/cleanable/dirt,
@@ -90724,7 +90721,7 @@
/obj/effect/turf_decal/delivery,
/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"sVv" = (
/obj/structure/grille,
/turf/simulated/floor/plating,
@@ -90743,7 +90740,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"sWn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -92304,7 +92301,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"tSM" = (
/obj/machinery/sparker{
id = "testigniter";
@@ -92741,7 +92738,7 @@
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/spawner/airlock/w_to_e,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"uec" = (
/obj/machinery/door_control{
id = "cmoofficedoor";
@@ -93235,7 +93232,7 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"upW" = (
/obj/machinery/firealarm/directional/north,
/turf/simulated/floor/plasteel{
@@ -93497,7 +93494,7 @@
},
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"uBQ" = (
/obj/effect/landmark/start/atmospheric,
/turf/simulated/floor/plasteel,
@@ -93576,7 +93573,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"uEh" = (
/obj/structure/cable{
d1 = 4;
@@ -94830,7 +94827,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"vtq" = (
/obj/item/radio/intercom{
name = "north bump";
@@ -94947,7 +94944,7 @@
/obj/effect/turf_decal/delivery,
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"vzs" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -98165,7 +98162,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"xnA" = (
/obj/machinery/door/airlock/maintenance{
name = "Library Maintenance"
@@ -120746,7 +120743,7 @@ gmT
gmT
jCQ
gmT
-aGZ
+mgS
aGZ
aPm
aGZ
@@ -120999,11 +120996,11 @@ tOF
tOF
abj
aaa
-aGY
+mgS
aIq
upI
aKY
-aGZ
+mgS
aNU
aPn
aQM
@@ -121256,11 +121253,11 @@ abj
abj
abj
abj
-aGY
+mgS
aIr
aJI
aKZ
-aGZ
+mgS
aNV
wfj
aQN
@@ -121513,11 +121510,11 @@ abj
aaa
aaa
abj
-aGY
+mgS
aIs
aJM
aLc
-aGZ
+mgS
ibb
aPp
aQO
@@ -121770,11 +121767,11 @@ abj
aaa
aaa
abj
-aGY
-aGY
+mgS
+mgS
pGi
-aGY
-aGZ
+mgS
+mgS
aNV
vMl
aQN
@@ -148534,7 +148531,7 @@ aaa
bLn
bHP
dMA
-bLu
+dUf
bNu
nXf
bLn
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index 45896c725d97..a4ec0e7aaed7 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -67,7 +67,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"abW" = (
/turf/simulated/wall/r_wall,
/area/station/security/permabrig)
@@ -135,7 +135,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"acI" = (
/obj/item/seeds/wheat/rice,
/obj/item/seeds/wheat/rice,
@@ -191,7 +191,7 @@
"adj" = (
/obj/structure/cable,
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"adk" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
@@ -243,7 +243,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"adM" = (
/obj/structure/table,
/obj/machinery/cell_charger,
@@ -306,7 +306,7 @@
"aee" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"aef" = (
/obj/structure/lattice/catwalk,
/turf/space,
@@ -468,7 +468,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"afH" = (
/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_3)
@@ -504,7 +504,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"agg" = (
/obj/structure/cable/green{
icon_state = "0-10"
@@ -545,7 +545,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"agw" = (
/obj/structure/chair{
dir = 1
@@ -579,7 +579,7 @@
/area/station/maintenance/fore)
"agH" = (
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"agK" = (
/obj/machinery/door/poddoor{
id_tag = "ToxinsVenting";
@@ -591,7 +591,7 @@
"agM" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"agY" = (
/obj/structure/closet/secure_closet/detective,
/obj/item/restraints/handcuffs,
@@ -789,7 +789,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aiR" = (
/obj/structure/cable{
d1 = 2;
@@ -797,7 +797,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aiY" = (
/turf/simulated/wall,
/area/station/public/arcade)
@@ -888,9 +888,6 @@
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
-"ajB" = (
-/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarport)
"ajC" = (
/obj/structure/cable{
d2 = 4;
@@ -900,7 +897,7 @@
name = "Fore Port Solar Control"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"ajD" = (
/mob/living/simple_animal/mouse,
/obj/effect/decal/cleanable/dirt,
@@ -918,7 +915,7 @@
},
/obj/machinery/power/apc/directional/west,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"ajJ" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -937,7 +934,7 @@
icon_state = "2-4"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"ajL" = (
/obj/structure/cable,
/obj/effect/spawner/window/reinforced/grilled,
@@ -950,7 +947,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"ajO" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -1065,7 +1062,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"akw" = (
/obj/effect/landmark/spawner/xeno,
/obj/structure/cable{
@@ -1074,7 +1071,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"akx" = (
/obj/structure/cable{
d2 = 8;
@@ -1089,7 +1086,7 @@
pixel_x = 28
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aky" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/fpmaint)
@@ -1240,7 +1237,7 @@
},
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"alw" = (
/obj/structure/cable{
d2 = 8;
@@ -1248,7 +1245,7 @@
},
/obj/machinery/power/smes,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"alx" = (
/obj/structure/table,
/obj/item/stack/medical/ointment{
@@ -1562,7 +1559,7 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"ann" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -1574,9 +1571,6 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"ans" = (
-/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarstarboard)
"anv" = (
/obj/machinery/door/poddoor/preopen{
id_tag = "Disposal Exit";
@@ -1695,7 +1689,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"anN" = (
/obj/structure/morgue{
dir = 2
@@ -1789,7 +1783,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aon" = (
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall,
@@ -2361,7 +2355,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"arD" = (
/obj/structure/disposaloutlet{
dir = 4
@@ -2398,7 +2392,7 @@
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"arJ" = (
/obj/structure/chair{
dir = 8
@@ -2441,7 +2435,7 @@
},
/obj/machinery/power/apc/directional/west,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"arU" = (
/obj/effect/landmark/spawner/xeno,
/turf/simulated/floor/plating,
@@ -2612,7 +2606,7 @@
"asU" = (
/obj/effect/spawner/random_spawners/wall_rusted_probably,
/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"asV" = (
/obj/machinery/economy/vending/detdrobe,
/turf/simulated/floor/plasteel{
@@ -2708,7 +2702,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"atk" = (
/obj/structure/cable{
d1 = 4;
@@ -2907,7 +2901,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"atW" = (
/obj/machinery/light,
/obj/machinery/economy/vending/cola,
@@ -2925,7 +2919,7 @@
/obj/machinery/atmospherics/portable/canister/air,
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aub" = (
/obj/item/book/manual/random,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -2957,9 +2951,8 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/gravitygenerator)
"auf" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -2995,7 +2988,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"auk" = (
/obj/effect/landmark/spawner/xeno,
/obj/structure/cable{
@@ -3004,7 +2997,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aul" = (
/obj/structure/cable{
d2 = 8;
@@ -3019,7 +3012,7 @@
pixel_x = 28
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"aup" = (
/obj/structure/lattice,
/obj/structure/grille/broken,
@@ -3061,7 +3054,7 @@
icon_state = "0-2"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"auw" = (
/obj/machinery/light/small{
dir = 8
@@ -3387,7 +3380,7 @@
},
/obj/machinery/power/smes,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"avN" = (
/obj/machinery/porta_turret/ai_turret,
/obj/machinery/computer/security/telescreen/minisat{
@@ -3521,7 +3514,7 @@
},
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"awf" = (
/obj/machinery/light,
/obj/effect/landmark/spawner/xeno,
@@ -4149,7 +4142,7 @@
"ayA" = (
/obj/structure/sign/electricshock,
/turf/simulated/wall/r_wall,
-/area/station/maintenance/fsmaint)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"ayB" = (
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plating,
@@ -4242,9 +4235,8 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/gravitygenerator)
"ayZ" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -4402,7 +4394,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"azC" = (
/obj/item/radio/intercom/department/security{
pixel_y = 28
@@ -4705,7 +4697,7 @@
icon_state = "0-4"
},
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"aAX" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
@@ -4736,7 +4728,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"aBs" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -4750,7 +4742,7 @@
icon_state = "2-4"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aBu" = (
/obj/structure/cable{
d1 = 4;
@@ -5599,7 +5591,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aED" = (
/obj/machinery/economy/vending/shoedispenser,
/obj/machinery/alarm/directional/east,
@@ -5931,7 +5923,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aGl" = (
/obj/structure/chair{
dir = 4
@@ -7165,9 +7157,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 1;
@@ -9694,7 +9685,7 @@
icon_state = "1-4"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"aSJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -12699,9 +12690,8 @@
/turf/simulated/wall,
/area/station/engineering/tech_storage)
"bbI" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/structure/cable{
d1 = 2;
@@ -18642,7 +18632,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"brp" = (
/obj/machinery/light,
/turf/simulated/floor/mineral/titanium/blue,
@@ -22059,7 +22049,7 @@
/area/station/service/bar)
"bAC" = (
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"bAE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -24030,7 +24020,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"bHK" = (
/obj/structure/cable{
d1 = 1;
@@ -25619,7 +25609,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"bNK" = (
/obj/structure/closet/crate/hydroponics/prespawned,
/obj/item/shovel/spade,
@@ -25766,7 +25756,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"bOn" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/unary/outlet_injector/on,
@@ -25908,7 +25898,7 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"bOM" = (
/obj/structure/chair{
dir = 1
@@ -26902,7 +26892,7 @@
icon_state = "2-4"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"bSx" = (
/obj/machinery/kitchen_machine/candy_maker,
/obj/machinery/light_switch{
@@ -27112,7 +27102,7 @@
pixel_y = -28
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"bTl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -27426,7 +27416,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"bUy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
@@ -27944,7 +27934,7 @@
},
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"bWm" = (
/obj/structure/rack,
/obj/item/storage/box,
@@ -28416,7 +28406,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"bXK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
@@ -29191,7 +29181,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"caL" = (
/obj/machinery/firealarm/directional/north,
/obj/effect/turf_decal/stripes/corner{
@@ -29845,7 +29835,7 @@
/obj/structure/lattice/catwalk,
/obj/item/stack/rods/ten,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"ccW" = (
/obj/structure/cable{
d1 = 1;
@@ -31107,7 +31097,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"chy" = (
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
@@ -31776,7 +31766,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"cjZ" = (
/obj/machinery/alarm/directional/south,
/turf/simulated/floor/plasteel{
@@ -31805,7 +31795,7 @@
/obj/machinery/atmospherics/unary/portables_connector,
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cke" = (
/obj/structure/cable{
d2 = 8;
@@ -31822,7 +31812,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"ckf" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -31997,7 +31987,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"ckN" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance/two,
@@ -32411,7 +32401,7 @@
/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cmK" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/visible/green,
@@ -32987,7 +32977,7 @@
icon_state = "1-4"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"coU" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -33024,7 +33014,7 @@
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cpq" = (
/obj/machinery/atmospherics/binary/pump,
/turf/simulated/wall/r_wall,
@@ -33144,7 +33134,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cpM" = (
/obj/structure/cable{
d1 = 1;
@@ -34081,7 +34071,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"ctK" = (
/obj/structure/filingcabinet/chestdrawer/autopsy,
/obj/structure/window/reinforced{
@@ -34297,7 +34287,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cur" = (
/obj/structure/cable{
d2 = 4;
@@ -34306,7 +34296,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"cut" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -34522,7 +34512,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cva" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -34785,7 +34775,7 @@
icon_state = "1-4"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cwi" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/door_control{
@@ -35223,7 +35213,7 @@
icon_state = "0-2"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"cyd" = (
/obj/structure/rack,
/obj/item/seeds/cannabis,
@@ -35389,7 +35379,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"cyM" = (
/obj/machinery/power/apc/directional/east,
/obj/structure/cable{
@@ -35668,7 +35658,7 @@
/obj/machinery/power/tracker,
/obj/structure/cable,
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"czX" = (
/obj/machinery/light/small,
/turf/simulated/floor/engine,
@@ -36388,7 +36378,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"cCQ" = (
/obj/structure/extinguisher_cabinet{
name = "east bump";
@@ -37052,7 +37042,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"cFm" = (
/turf/simulated/floor/mech_bay_recharge_floor,
/area/station/science/robotics/chargebay)
@@ -37140,7 +37130,7 @@
pixel_x = 32
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cFO" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -37365,7 +37355,7 @@
"cGt" = (
/obj/structure/cable,
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"cGv" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -37373,7 +37363,7 @@
icon_state = "0-8"
},
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"cGw" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -38177,7 +38167,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cJn" = (
/turf/simulated/floor/plasteel{
icon_state = "chapel"
@@ -38668,7 +38658,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cLg" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38968,7 +38958,7 @@
pixel_y = -32
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cMF" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/drinks/bottle/holywater{
@@ -39197,7 +39187,7 @@
/obj/machinery/power/smes,
/obj/structure/cable,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cNw" = (
/obj/structure/closet/wardrobe/white,
/obj/effect/spawner/lootdrop/maintenance,
@@ -39355,7 +39345,7 @@
icon_state = "0-2"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"cNS" = (
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -40000,7 +39990,7 @@
/area/station/hallway/secondary/exit)
"cQJ" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/disposal)
+/area/station/maintenance/solar_maintenance/fore_port)
"cQK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -40072,7 +40062,7 @@
/area/station/hallway/secondary/exit)
"cQW" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cRc" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance,
@@ -40391,7 +40381,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cSy" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
@@ -40816,7 +40806,7 @@
/area/station/science/toxins/test)
"cUm" = (
/turf/simulated/wall,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cUq" = (
/obj/item/kirbyplants,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -41133,7 +41123,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"cVr" = (
/obj/structure/closet/crate/engineering,
/obj/item/solar_assembly,
@@ -41157,7 +41147,7 @@
},
/obj/machinery/power/apc/directional/east,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cVw" = (
/obj/structure/chair/sofa/pew/left,
/turf/simulated/floor/plasteel{
@@ -41452,7 +41442,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"cXa" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -41807,9 +41797,8 @@
/turf/simulated/floor/plating,
/area/station/service/hydroponics)
"cYX" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/structure/cable{
d1 = 1;
@@ -41840,7 +41829,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"cZf" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -41941,7 +41930,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cZD" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/emcloset,
@@ -42207,9 +42196,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-y"
+/obj/structure/disposalpipe/junction/y{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
@@ -42416,7 +42404,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"dcj" = (
/obj/structure/chair/sofa/left,
/obj/effect/spawner/lootdrop/maintenance,
@@ -42441,7 +42429,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"dcs" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
@@ -42630,7 +42618,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"ddG" = (
/obj/machinery/atmospherics/portable/canister/toxins,
/obj/effect/turf_decal/delivery/red/hollow,
@@ -43677,9 +43665,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 8
},
/obj/structure/cable{
d1 = 2;
@@ -43893,9 +43880,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
@@ -44132,9 +44118,8 @@
},
/area/station/science/xenobiology)
"dxB" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -44367,9 +44352,8 @@
/area/station/security/armory/secure)
"dCx" = (
/obj/machinery/firealarm/directional/west,
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -44674,9 +44658,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"dLF" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 1;
@@ -44804,7 +44787,7 @@
"dPW" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"dPX" = (
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -44921,9 +44904,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 2;
@@ -45033,7 +45015,7 @@
},
/obj/effect/mapping_helpers/airlock/autoname,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dUF" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/spawner/airlock/e_to_w,
@@ -45539,9 +45521,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/turf/simulated/floor/wood,
/area/station/public/mrchangs)
@@ -45793,7 +45774,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"emO" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -45834,7 +45815,7 @@
icon_state = "2-4"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"eow" = (
/obj/machinery/atmospherics/pipe/manifold/visible,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -45866,7 +45847,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"epn" = (
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
dir = 4
@@ -45937,9 +45918,8 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 8
},
/obj/structure/cable{
d1 = 4;
@@ -46102,9 +46082,8 @@
/turf/simulated/wall/r_wall,
/area/station/security/range)
"esO" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -46180,9 +46159,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/structure/cable{
d1 = 4;
@@ -46677,9 +46655,8 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/junction{
- dir = 2;
- icon_state = "pipe-y"
+/obj/structure/disposalpipe/junction/y{
+ dir = 2
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
@@ -46722,9 +46699,8 @@
},
/area/station/public/locker)
"eGd" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 2;
@@ -47223,9 +47199,8 @@
},
/area/station/security/permabrig)
"eSU" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -47948,7 +47923,7 @@
},
/obj/item/stack/rods/ten,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"fho" = (
/obj/structure/closet/secure_closet/roboticist,
/turf/simulated/floor/plasteel{
@@ -48190,9 +48165,8 @@
},
/area/station/security/interrogation)
"fmf" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -48593,7 +48567,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"ftz" = (
/obj/machinery/alarm/directional/north,
/turf/simulated/floor/plasteel{
@@ -49101,9 +49075,8 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
@@ -49286,7 +49259,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"fFX" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -49446,7 +49419,7 @@
},
/obj/effect/mapping_helpers/airlock/autoname,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"fJd" = (
/obj/machinery/door/airlock/security/glass{
name = "Brig"
@@ -50308,9 +50281,8 @@
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"gcy" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -50359,9 +50331,8 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -50405,9 +50376,8 @@
},
/area/station/security/permabrig)
"geq" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -51154,7 +51124,7 @@
},
/obj/effect/mapping_helpers/airlock/autoname,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"gxn" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
@@ -51389,6 +51359,9 @@
/obj/machinery/alarm/directional/north,
/turf/simulated/floor/mineral/tranquillite,
/area/station/service/mime)
+"gDl" = (
+/turf/simulated/wall/r_wall,
+/area/station/maintenance/solar_maintenance/fore_starboard)
"gDu" = (
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 4
@@ -51727,9 +51700,8 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
@@ -52295,9 +52267,8 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -52346,7 +52317,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"gVB" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -52579,7 +52550,7 @@
/obj/effect/spawner/airlock/s_to_n,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"hbc" = (
/obj/machinery/atmospherics/unary/tank/air,
/turf/simulated/floor/plating,
@@ -52593,7 +52564,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"hbB" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -53088,9 +53059,8 @@
"hkr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -53338,9 +53308,8 @@
/obj/structure/chair/comfy/brown{
dir = 8
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/structure/cable{
d1 = 1;
@@ -53361,7 +53330,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"hpR" = (
/obj/structure/plasticflaps{
opacity = 1
@@ -53549,9 +53518,8 @@
/turf/simulated/floor/plasteel,
/area/station/security/warden)
"hvL" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -53591,9 +53559,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -53908,7 +53875,7 @@
icon_state = "1-4"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"hDr" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/r_n_d/circuit_imprinter,
@@ -54290,9 +54257,8 @@
},
/area/station/command/office/ce)
"hKb" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -54427,9 +54393,8 @@
req_access_txt = "66"
},
/obj/effect/turf_decal/stripes/corner,
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
@@ -54502,9 +54467,8 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 2;
@@ -54741,9 +54705,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/effect/landmark/start/security_officer,
/turf/simulated/floor/plasteel{
@@ -55124,7 +55087,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"hZZ" = (
/obj/structure/cable{
d1 = 1;
@@ -55652,9 +55615,8 @@
},
/area/station/engineering/break_room)
"imw" = (
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -55950,9 +55912,8 @@
/turf/space,
/area/space/nearstation)
"itt" = (
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-y"
+/obj/structure/disposalpipe/junction/y{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -56882,7 +56843,7 @@
"iMJ" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"iMW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -57282,9 +57243,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 2;
- icon_state = "pipe-j2s";
sort_type_txt = "7"
},
/turf/simulated/floor/plasteel,
@@ -57476,9 +57436,8 @@
/turf/simulated/floor/plating,
/area/station/command/bridge)
"jby" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -57542,9 +57501,8 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 4;
@@ -57731,9 +57689,8 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/north)
"jil" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -57968,9 +57925,8 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
@@ -58072,9 +58028,8 @@
/turf/simulated/floor/plating/airless,
/area/station/engineering/atmos)
"jsL" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 4;
@@ -58367,9 +58322,8 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/junction{
- dir = 2;
- icon_state = "pipe-y"
+/obj/structure/disposalpipe/junction/y{
+ dir = 2
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -58472,9 +58426,8 @@
},
/area/station/maintenance/aft)
"jDj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 2;
@@ -58971,9 +58924,8 @@
dir = 6
},
/obj/machinery/requests_console/directional/west,
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -59372,7 +59324,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"jRf" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
@@ -59457,7 +59409,7 @@
icon_state = "0-2"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"jSC" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/camera{
@@ -59470,9 +59422,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 4;
@@ -59838,9 +59789,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/turf/simulated/floor/carpet/red,
/area/station/command/office/hos)
@@ -59960,9 +59910,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"keu" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -60388,9 +60337,8 @@
/area/station/hallway/primary/fore/north)
"kpx" = (
/obj/effect/turf_decal/delivery,
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -61111,9 +61059,8 @@
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
"kFv" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -61326,7 +61273,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"kIP" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
@@ -61373,7 +61320,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"kLd" = (
/obj/structure/window/reinforced{
dir = 1
@@ -61949,9 +61896,8 @@
/turf/simulated/floor/plasteel,
/area/station/science/robotics)
"kWp" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/structure/cable{
d1 = 1;
@@ -62562,7 +62508,7 @@
/area/station/hallway/primary/central/north)
"lio" = (
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"liK" = (
/obj/structure/cable{
d1 = 1;
@@ -63050,9 +62996,8 @@
"lsz" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 4;
@@ -63140,9 +63085,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -63305,9 +63249,8 @@
},
/area/station/medical/medbay)
"lzQ" = (
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 8;
- icon_state = "pipe-j2s";
sort_type_txt = "17"
},
/obj/effect/turf_decal/stripes/line,
@@ -63453,9 +63396,8 @@
},
/area/station/science/break_room)
"lCk" = (
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 1;
- icon_state = "pipe-j2s";
sort_type_txt = "1"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -64314,7 +64256,7 @@
/area/station/engineering/atmos)
"lSh" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"lSn" = (
/obj/structure/window/reinforced{
dir = 1
@@ -64391,7 +64333,7 @@
"lVp" = (
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
-/area/station/maintenance/asmaint)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"lVy" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -65538,9 +65480,8 @@
/turf/simulated/floor/wood,
/area/station/service/bar)
"mwI" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/structure/cable{
d1 = 1;
@@ -65686,7 +65627,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"mzF" = (
/obj/structure/cable{
d1 = 4;
@@ -65699,9 +65640,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
@@ -65821,7 +65761,7 @@
/area/station/service/bar)
"mBn" = (
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/starboard)
+/area/station/engineering/solar/aft_starboard)
"mBr" = (
/obj/item/radio/intercom{
name = "west bump";
@@ -65857,9 +65797,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -66279,9 +66218,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/engimaint)
"mLn" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -66501,9 +66439,8 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
"mPq" = (
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 8;
- icon_state = "pipe-j2s";
sort_type_txt = "6"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -66777,7 +66714,7 @@
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"mVB" = (
/obj/structure/cable{
d1 = 1;
@@ -67105,9 +67042,8 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
@@ -67546,7 +67482,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"nic" = (
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
@@ -67667,9 +67603,8 @@
"nkh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -67765,9 +67700,8 @@
/turf/simulated/floor/plasteel,
/area/station/science/robotics/chargebay)
"nlS" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
@@ -67815,9 +67749,8 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/structure/cable{
@@ -67860,9 +67793,8 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/structure/cable{
d1 = 1;
@@ -68004,9 +67936,8 @@
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"nry" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -68370,9 +68301,8 @@
/turf/simulated/floor/plating,
/area/station/security/processing)
"nzO" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -68614,7 +68544,7 @@
/obj/effect/spawner/airlock/s_to_n,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"nEJ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -68788,9 +68718,8 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/structure/cable{
d1 = 1;
@@ -68857,9 +68786,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
@@ -69648,9 +69576,8 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "grimy"
@@ -69726,9 +69653,8 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/structure/cable{
d1 = 1;
@@ -69872,7 +69798,7 @@
/obj/effect/spawner/airlock/e_to_w/long,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"ohK" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
@@ -69916,7 +69842,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"ojt" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/autoname,
@@ -70193,9 +70119,8 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -70277,7 +70202,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"ovR" = (
/obj/structure/bookcase{
name = "bookcase (Adult)"
@@ -70541,9 +70466,8 @@
id = "ROBO";
pixel_x = -24
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -71676,9 +71600,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 2;
@@ -72264,9 +72187,8 @@
},
/area/station/science/xenobiology)
"pmW" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -72295,9 +72217,8 @@
},
/area/station/command/bridge)
"pnh" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -72439,7 +72360,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"pre" = (
/obj/structure/chair{
dir = 1
@@ -72900,7 +72821,7 @@
"pBu" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"pBB" = (
/obj/structure/sign/directions/engineering{
dir = 4;
@@ -73017,9 +72938,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
@@ -73035,9 +72955,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
@@ -73783,9 +73702,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -74053,9 +73971,8 @@
icon_state = "1-4"
},
/obj/effect/landmark/damageturf,
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
@@ -74422,7 +74339,7 @@
icon_state = "0-4"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"qfR" = (
/obj/machinery/porta_turret/ai_turret,
/turf/simulated/floor/plasteel{
@@ -74695,9 +74612,8 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -75058,7 +74974,7 @@
/obj/effect/spawner/airlock/long,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"quY" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -75137,9 +75053,8 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -75214,9 +75129,8 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -75459,9 +75373,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -75962,9 +75875,8 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 2;
- icon_state = "pipe-j2s";
sort_type_txt = "21"
},
/turf/simulated/floor/plasteel,
@@ -76062,9 +75974,8 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
-/obj/structure/disposalpipe/junction{
- dir = 2;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 2
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/ne)
@@ -76613,9 +76524,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/structure/cable{
d1 = 1;
@@ -77249,9 +77159,8 @@
/turf/simulated/floor/plating,
/area/station/hallway/primary/fore/east)
"rsb" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 4;
@@ -77547,9 +77456,8 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
@@ -78415,9 +78323,8 @@
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 4;
@@ -78601,9 +78508,8 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-y"
+/obj/structure/disposalpipe/junction/y{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -78614,9 +78520,8 @@
/area/station/hallway/primary/aft/north)
"rQt" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/structure/cable/yellow{
d1 = 1;
@@ -78764,9 +78669,8 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 2;
- icon_state = "pipe-j2s";
sort_type_txt = "19"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -78906,9 +78810,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
@@ -79138,9 +79041,8 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
@@ -79408,9 +79310,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"skq" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/structure/cable{
d1 = 2;
@@ -80052,9 +79953,8 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -80140,9 +80040,8 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -80322,7 +80221,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"sFS" = (
/obj/structure/cable{
d1 = 4;
@@ -80432,9 +80331,8 @@
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/alarm/directional/south,
/turf/simulated/floor/plasteel{
@@ -80448,7 +80346,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/port)
+/area/station/engineering/solar/aft_port)
"sHK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -81101,7 +80999,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/fore_starboard)
"sVD" = (
/obj/structure/mirror{
pixel_y = -34
@@ -81929,9 +81827,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -82012,9 +81909,8 @@
network = list("Research","SS13");
dir = 9
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -82058,9 +81954,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/junction{
- dir = 2;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 2
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -82203,9 +82098,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/structure/cable{
d1 = 4;
@@ -82724,9 +82618,8 @@
/turf/simulated/floor/carpet,
/area/station/legal/magistrate)
"tHo" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -83022,9 +82915,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"tPO" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -83286,7 +83178,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"tWl" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plasteel{
@@ -83723,9 +83615,8 @@
},
/area/station/public/locker)
"ueC" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -84110,9 +84001,8 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 8
},
/obj/structure/cable{
d1 = 2;
@@ -84235,7 +84125,7 @@
icon_state = "1-8"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"uqN" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/medical,
@@ -84416,9 +84306,8 @@
"uwB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/structure/cable{
d1 = 1;
@@ -84638,9 +84527,8 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 4;
- icon_state = "pipe-j2s";
sort_type_txt = "16"
},
/obj/effect/turf_decal/stripes/line{
@@ -84877,9 +84765,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/structure/cable{
d1 = 4;
@@ -85057,9 +84944,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -85305,9 +85191,8 @@
/turf/simulated/floor/wood,
/area/station/science/robotics/showroom)
"uPN" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 2;
@@ -85588,9 +85473,8 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -86165,9 +86049,8 @@
},
/area/station/hallway/secondary/bridge)
"vgv" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 4;
@@ -86225,9 +86108,8 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"vih" = (
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -86440,9 +86322,8 @@
/obj/machinery/light_construct/small{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -86950,9 +86831,8 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
dir = 8
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/structure/cable{
d1 = 2;
@@ -87240,7 +87120,7 @@
icon_state = "1-8"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"vIz" = (
/obj/structure/cable{
d1 = 4;
@@ -87378,9 +87258,8 @@
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"vMf" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/structure/cable{
d1 = 2;
@@ -87414,9 +87293,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -87473,9 +87351,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/turf/simulated/floor/carpet,
/area/station/command/office/hop)
@@ -87732,9 +87609,8 @@
},
/area/station/science/xenobiology)
"vUY" = (
-/obj/structure/disposalpipe/junction{
- dir = 2;
- icon_state = "pipe-j2"
+/obj/structure/disposalpipe/junction/reversed{
+ dir = 2
},
/obj/structure/cable{
d1 = 1;
@@ -88564,9 +88440,8 @@
/turf/space,
/area/space/nearstation)
"wpn" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -88672,7 +88547,7 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/obj/effect/mapping_helpers/airlock/autoname,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"wsN" = (
/obj/effect/landmark/start/research_director,
/turf/simulated/floor/plasteel{
@@ -89274,9 +89149,8 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 2;
- icon_state = "pipe-j2s";
sort_type_txt = "20"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -89372,9 +89246,8 @@
},
/area/station/science/toxins/launch)
"wIT" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -89472,9 +89345,8 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/garden)
"wMw" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/structure/cable{
d1 = 1;
@@ -89929,9 +89801,8 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/structure/cable{
d1 = 1;
@@ -90886,9 +90757,8 @@
},
/area/station/science/xenobiology)
"xpF" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -90980,9 +90850,8 @@
},
/area/station/engineering/ai_transit_tube)
"xrY" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -91190,7 +91059,7 @@
"xwJ" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"xxa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -91538,9 +91407,8 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -91753,9 +91621,8 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
},
/obj/machinery/light/small{
dir = 8
@@ -92034,9 +91901,8 @@
},
/area/station/science/xenobiology)
"xPl" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 1
},
/obj/structure/cable{
d1 = 1;
@@ -92327,9 +92193,8 @@
},
/area/station/medical/reception)
"xWQ" = (
-/obj/structure/disposalpipe/sortjunction{
+/obj/structure/disposalpipe/sortjunction/reversed{
dir = 2;
- icon_state = "pipe-j2s";
sort_type_txt = "13"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -92903,7 +92768,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore_port)
"yhT" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -92929,9 +92794,8 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
@@ -110945,7 +110809,7 @@ bZU
bZU
bZU
bZU
-cfc
+lSh
pBu
sFP
pBu
@@ -111202,7 +111066,7 @@ deH
cPA
jWJ
xPl
-cfc
+lSh
ckd
bOL
cMD
@@ -111353,9 +111217,9 @@ aaa
aaa
aaa
iMJ
-ajB
-ajB
-ajB
+cQJ
+cQJ
+cQJ
cQJ
anB
akt
@@ -111613,7 +111477,7 @@ hal
ajC
akv
ajE
-aky
+cQJ
anC
fuy
pxf
@@ -111716,7 +111580,7 @@ bZU
bZU
bZU
cwO
-cfc
+lSh
cpL
bXI
cNv
@@ -111973,10 +111837,10 @@ rbo
bZU
vCt
cwO
-cfc
-cfc
-cfc
-cfc
+lSh
+lSh
+lSh
+lSh
lSh
aaa
aaa
@@ -112127,7 +111991,7 @@ iMJ
anm
akx
alw
-aky
+cQJ
xrZ
bmq
bmr
@@ -112381,10 +112245,10 @@ laH
laH
laH
iMJ
-ajB
-ajB
-ajB
-aky
+cQJ
+cQJ
+cQJ
+cQJ
aky
uaH
aky
@@ -130473,7 +130337,7 @@ ifq
nyp
vQo
dSx
-bdN
+cQW
cQW
cQW
cQW
@@ -130730,7 +130594,7 @@ cJk
cPc
cNf
fbQ
-bdN
+cQW
cJm
fFW
cuq
@@ -131244,7 +131108,7 @@ cPc
cPc
nnA
bBg
-bdN
+cQW
cVr
cSx
cFJ
@@ -137061,9 +136925,9 @@ aaa
aaa
dPW
asU
-ans
-ans
-aBZ
+gDl
+gDl
+gDl
azr
avg
dAH
@@ -137320,7 +137184,7 @@ nEz
hbr
auj
arT
-aBZ
+gDl
heC
avA
avA
@@ -138088,10 +137952,10 @@ aaa
abq
aaa
dPW
-ans
-ans
+gDl
+gDl
asU
-aBZ
+gDl
dKL
bfb
cbc
diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm
index 9177cadefa35..f02edfa2158b 100644
--- a/_maps/map_files220/stations/boxstation.dmm
+++ b/_maps/map_files220/stations/boxstation.dmm
@@ -2293,7 +2293,7 @@
/obj/machinery/power/tracker,
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"alG" = (
/obj/machinery/economy/vending/cigarette/free,
/obj/machinery/status_display/directional/west,
@@ -2869,7 +2869,7 @@
/obj/machinery/power/tracker,
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"amW" = (
/obj/effect/landmark/burnturf,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
@@ -2944,7 +2944,7 @@
/obj/structure/cable,
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"anp" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/grille_often,
@@ -3018,7 +3018,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"anH" = (
/turf/simulated/wall/r_wall,
/area/station/security/main)
@@ -3527,7 +3527,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"apo" = (
/obj/structure/grille/broken,
/turf/space,
@@ -3543,7 +3543,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"apq" = (
/obj/structure/cable{
d2 = 8;
@@ -3555,7 +3555,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"aps" = (
/obj/item/kirbyplants,
/turf/simulated/floor/wood/fancy/cherry,
@@ -3963,7 +3963,7 @@
"aqZ" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"ara" = (
/obj/structure/table,
/obj/item/folder{
@@ -3987,7 +3987,7 @@
/obj/structure/cable,
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"arj" = (
/obj/structure/chair{
dir = 8
@@ -4134,7 +4134,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"arM" = (
/obj/structure/cable{
d1 = 4;
@@ -4153,7 +4153,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"arN" = (
/obj/structure/cable{
d2 = 8;
@@ -4161,7 +4161,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"arQ" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
@@ -4202,7 +4202,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"arX" = (
/obj/structure/cable{
d2 = 2;
@@ -4214,11 +4214,11 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"asb" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"asc" = (
/obj/structure/cable{
d1 = 4;
@@ -4386,7 +4386,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"asM" = (
/obj/structure/cable{
d1 = 2;
@@ -4400,7 +4400,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"asN" = (
/turf/simulated/floor/carpet,
/area/station/legal/lawoffice)
@@ -4646,7 +4646,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"atG" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/fore)
@@ -5581,7 +5581,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"awR" = (
/obj/structure/cable{
d2 = 8;
@@ -5589,7 +5589,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"awS" = (
/obj/machinery/shower{
dir = 8
@@ -5654,7 +5654,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"axr" = (
/obj/effect/decal/cleanable/dust,
/obj/effect/turf_decal/siding/white{
@@ -6720,7 +6720,7 @@
"azU" = (
/obj/structure/sign/electricshock,
/turf/simulated/wall,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"azV" = (
/obj/structure/closet/emcloset,
/obj/effect/decal/cleanable/dirt,
@@ -6804,7 +6804,7 @@
"aAd" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aAf" = (
/turf/simulated/wall,
/area/station/maintenance/abandonedbar)
@@ -7839,7 +7839,7 @@
name = "Fore Port Solar Control"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aDv" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/service/clown,
@@ -7853,7 +7853,7 @@
/area/station/service/clown)
"aDw" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aDx" = (
/obj/structure/sign/vacuum/external{
pixel_x = 32
@@ -7865,7 +7865,7 @@
filled = 0.05
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aDz" = (
/obj/structure/rack,
/obj/item/clothing/mask/cigarette/pipe,
@@ -7984,7 +7984,7 @@
"aDS" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aDV" = (
/obj/item/airlock_electronics,
/obj/structure/spider/stickyweb,
@@ -8152,7 +8152,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aED" = (
/obj/machinery/power/terminal,
/obj/machinery/light/small/directional/east,
@@ -8161,7 +8161,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aEE" = (
/obj/structure/cable{
d1 = 1;
@@ -8169,7 +8169,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aEF" = (
/obj/structure/table,
/obj/item/paper_bin,
@@ -8579,7 +8579,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aFR" = (
/obj/machinery/power/smes,
/obj/structure/cable{
@@ -8587,7 +8587,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aFS" = (
/obj/structure/cable{
d1 = 2;
@@ -8600,11 +8600,11 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aFT" = (
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aFU" = (
/obj/structure/table,
/obj/item/toy/figure/crew/detective,
@@ -8912,7 +8912,7 @@
/area/station/service/theatre)
"aGT" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aGU" = (
/obj/structure/cable{
d2 = 4;
@@ -8925,14 +8925,14 @@
name = "Fore Starboard Solar Control"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aGW" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
},
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aGX" = (
/turf/simulated/wall,
/area/station/maintenance/fsmaint)
@@ -9157,7 +9157,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aHJ" = (
/obj/structure/cable{
d2 = 8;
@@ -9166,13 +9166,13 @@
/obj/machinery/power/terminal,
/obj/machinery/light/small/directional/east,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aHK" = (
/obj/structure/chair/stool{
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aHM" = (
/obj/machinery/atmospherics/trinary/filter{
dir = 4
@@ -9379,7 +9379,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aIB" = (
/obj/structure/cable{
d2 = 4;
@@ -9387,7 +9387,7 @@
},
/obj/machinery/power/apc/directional/west,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aIC" = (
/obj/machinery/camera{
c_tag = "Fore Starboard Solars";
@@ -9399,7 +9399,7 @@
},
/obj/machinery/power/smes,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aID" = (
/obj/structure/closet/wardrobe/mixed,
/obj/item/clothing/shoes/jackboots,
@@ -9716,7 +9716,7 @@
"aJH" = (
/obj/structure/sign/electricshock,
/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aJI" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -11035,7 +11035,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"aPe" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
@@ -29267,7 +29267,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cmd" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk,
@@ -35870,7 +35870,7 @@
/obj/machinery/atmospherics/unary/portables_connector,
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cLz" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -36780,7 +36780,7 @@
/area/station/engineering/break_room)
"cPu" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cPv" = (
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
@@ -40625,7 +40625,7 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dcn" = (
/mob/living/simple_animal/parrot/Poly,
/turf/simulated/floor/plasteel{
@@ -41308,7 +41308,7 @@
"deE" = (
/obj/structure/sign/electricshock,
/turf/simulated/wall/r_wall,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"deF" = (
/obj/machinery/power/grounding_rod,
/obj/effect/turf_decal/stripes/line{
@@ -41390,7 +41390,7 @@
icon_state = "1-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"deO" = (
/turf/simulated/wall/r_wall,
/area/station/engineering/atmos/storage)
@@ -41427,7 +41427,7 @@
},
/obj/machinery/power/apc/directional/west,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"deU" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 9
@@ -41488,7 +41488,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dfa" = (
/obj/structure/cable{
d1 = 2;
@@ -41497,7 +41497,7 @@
},
/obj/effect/decal/remains/mouse,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dfb" = (
/obj/structure/chair/stool,
/obj/machinery/camera{
@@ -41505,7 +41505,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dfc" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
@@ -41533,7 +41533,7 @@
},
/obj/machinery/light/small/directional/east,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dfn" = (
/obj/machinery/power/solar_control{
dir = 1;
@@ -41544,7 +41544,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dfo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -41570,7 +41570,7 @@
},
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dfq" = (
/obj/machinery/atmospherics/pipe/simple/visible/green,
/turf/simulated/wall/r_wall,
@@ -42720,7 +42720,7 @@
/area/station/maintenance/asmaint)
"djQ" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"djR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -43225,7 +43225,7 @@
"dlT" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dlU" = (
/obj/structure/cable{
d1 = 4;
@@ -47169,7 +47169,7 @@
dir = 9
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"eeF" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/drinks/shaker{
@@ -48035,7 +48035,7 @@
req_one_access_txt = "13"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"eui" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/wall/r_wall,
@@ -49656,7 +49656,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"fah" = (
/obj/structure/closet/secure_closet/personal/patient,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -52347,7 +52347,7 @@
/area/station/public/storage/tools)
"fXL" = (
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"fXQ" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/door_control/shutter/west{
@@ -52914,7 +52914,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"gin" = (
/obj/structure/railing{
dir = 4
@@ -56517,7 +56517,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"hoJ" = (
/obj/effect/spawner/random_spawners/fungus_probably,
/turf/simulated/wall,
@@ -58908,7 +58908,7 @@
req_one_access_txt = "13"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"iip" = (
/obj/machinery/ai_status_display/west,
/obj/structure/cable{
@@ -59833,7 +59833,7 @@
/obj/structure/cable,
/obj/machinery/power/apc/directional/south,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"iCD" = (
/obj/machinery/light_construct/small/east,
/obj/item/trash/chips,
@@ -65544,7 +65544,7 @@
name = "Aft Port Solar Control"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"kIk" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -66495,7 +66495,7 @@
req_one_access_txt = "13"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"kYC" = (
/obj/effect/decal/cleanable/dust,
/obj/structure/disposalpipe/segment,
@@ -66571,7 +66571,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"laW" = (
/obj/structure/cable{
d1 = 1;
@@ -68018,7 +68018,7 @@
req_one_access_txt = "13"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"lCQ" = (
/obj/structure/closet/emcloset,
/obj/structure/sign/poster/official/random/west,
@@ -70832,7 +70832,7 @@
},
/obj/machinery/power/smes,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"mxz" = (
/obj/machinery/space_heater,
/obj/effect/spawner/random_spawners/cobweb_left_rare,
@@ -71199,7 +71199,7 @@
},
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"mDO" = (
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 4
@@ -73140,7 +73140,7 @@
icon_state = "1-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"npF" = (
/obj/machinery/door/poddoor{
id = "maints2";
@@ -76165,7 +76165,7 @@
vent_link_id = "apsolar_vent"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"osz" = (
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 4
@@ -77219,7 +77219,7 @@
"oKx" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"oLe" = (
/obj/structure/cable{
d1 = 1;
@@ -85787,7 +85787,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"rMX" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -88280,7 +88280,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"sDH" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan,
/turf/simulated/floor/plating,
@@ -88840,7 +88840,7 @@
req_one_access_txt = "13"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"sOE" = (
/obj/structure/table/reinforced,
/obj/structure/cable{
@@ -89145,7 +89145,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"sTQ" = (
/obj/structure/table,
/obj/item/reagent_containers/patch/styptic{
@@ -90877,7 +90877,7 @@
},
/obj/machinery/light/small/directional/north,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"tAp" = (
/obj/item/extinguisher,
/obj/item/extinguisher{
@@ -91480,7 +91480,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"tMU" = (
/obj/structure/disposalpipe/segment/corner{
dir = 8
@@ -91871,7 +91871,7 @@
req_one_access_txt = "13"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"tTf" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -93298,7 +93298,7 @@
vent_link_id = "fssolar_vent"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"utu" = (
/obj/machinery/hologram/holopad,
/obj/structure/cable{
@@ -94336,7 +94336,7 @@
"uLO" = (
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"uMa" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -100563,7 +100563,7 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/simulated/floor/plasteel,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"wXC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm
index e412951021ea..928d78d09c05 100644
--- a/_maps/map_files220/stations/deltastation.dmm
+++ b/_maps/map_files220/stations/deltastation.dmm
@@ -51,7 +51,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"abw" = (
/obj/machinery/economy/vending/coffee,
/turf/simulated/floor/wood/parquet/tile,
@@ -78,7 +78,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"acf" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -92,7 +92,7 @@
icon_state = "2-4"
},
/turf/space,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"acg" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -111,7 +111,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"ach" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -119,12 +119,12 @@
icon_state = "0-8"
},
/turf/space,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aci" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/turf/space,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"acj" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -132,7 +132,7 @@
icon_state = "0-4"
},
/turf/space,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"acn" = (
/obj/machinery/constructable_frame/machine_frame,
/obj/effect/turf_decal/delivery/hollow,
@@ -159,7 +159,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"acp" = (
/obj/machinery/power/tracker,
/obj/structure/cable{
@@ -169,7 +169,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"acs" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -197,7 +197,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"acF" = (
/obj/structure/lattice/catwalk,
/turf/space,
@@ -210,7 +210,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"acS" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable,
@@ -265,7 +265,7 @@
"adg" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"adh" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable,
@@ -590,7 +590,7 @@
/area/station/hallway/secondary/entry)
"afg" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"afh" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -600,7 +600,7 @@
"afi" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"afj" = (
/obj/item/kirbyplants,
/obj/effect/turf_decal/stripes/line{
@@ -655,7 +655,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"afx" = (
/obj/machinery/power/smes,
/obj/machinery/light/small/directional/north,
@@ -667,7 +667,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"afy" = (
/obj/machinery/camera{
c_tag = "Fore Starboard Solars";
@@ -679,7 +679,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"afz" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -737,7 +737,7 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/simulated/floor/plasteel,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"afN" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -753,7 +753,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"afO" = (
/obj/machinery/conveyor{
dir = 4;
@@ -774,7 +774,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"afU" = (
/obj/structure/chair{
dir = 4
@@ -924,7 +924,7 @@
icon_state = "1-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"agT" = (
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/suit/storage/hazardvest,
@@ -2439,7 +2439,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"apG" = (
/turf/simulated/wall,
/area/station/maintenance/electrical_shop)
@@ -3296,7 +3296,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"asl" = (
/obj/structure/table/wood,
/obj/item/clipboard,
@@ -3638,7 +3638,7 @@
icon_state = "1-4"
},
/turf/space,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"asW" = (
/obj/effect/turf_decal/delivery,
/obj/structure/cable{
@@ -3714,7 +3714,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"atb" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -3722,12 +3722,12 @@
icon_state = "0-8"
},
/turf/space,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"atc" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/turf/space,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"atd" = (
/turf/simulated/wall/r_wall,
/area/station/engineering/controlroom)
@@ -3933,7 +3933,7 @@
icon_state = "0-4"
},
/turf/space,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"atL" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -3952,7 +3952,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"atM" = (
/obj/machinery/conveyor/west{
dir = 1;
@@ -3998,7 +3998,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"atV" = (
/obj/machinery/alarm/directional/south,
/obj/effect/decal/cleanable/dirt,
@@ -4029,11 +4029,11 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"atZ" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aub" = (
/obj/effect/landmark/start/doctor,
/turf/simulated/floor/plasteel{
@@ -5645,7 +5645,7 @@
/obj/machinery/alarm/directional/south,
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"azO" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -6785,7 +6785,7 @@
icon_state = "0-2"
},
/turf/space,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aEc" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -6794,7 +6794,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aEd" = (
/obj/machinery/atmospherics/trinary/filter{
dir = 1;
@@ -6948,7 +6948,7 @@
},
/obj/structure/cable,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aEF" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -7608,10 +7608,10 @@
"aGX" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aGY" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aGZ" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/incinerator)
@@ -7984,7 +7984,7 @@
dir = 9
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aIr" = (
/obj/machinery/power/smes,
/obj/machinery/light/small/directional/north,
@@ -7996,7 +7996,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aIs" = (
/obj/machinery/camera{
c_tag = "Port Fore Solars";
@@ -8012,7 +8012,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aIt" = (
/obj/machinery/disposal,
/obj/structure/sign/deathsposal{
@@ -8397,7 +8397,7 @@
},
/obj/effect/landmark/spawner/nukedisc_respawn,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aJM" = (
/obj/structure/cable{
d1 = 1;
@@ -8413,7 +8413,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aJN" = (
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
@@ -8759,12 +8759,12 @@
dir = 10
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aKZ" = (
/obj/machinery/alarm/directional/south,
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aLb" = (
/obj/structure/rack,
/obj/item/storage/toolbox/emergency,
@@ -8782,7 +8782,7 @@
dir = 6
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aLf" = (
/obj/machinery/atmospherics/pipe/manifold/visible,
/obj/structure/cable{
@@ -8827,7 +8827,7 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aLs" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -10337,7 +10337,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"aSD" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 4
@@ -10708,7 +10708,7 @@
},
/obj/structure/cable,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aUu" = (
/turf/simulated/floor/plasteel{
icon_state = "yellowcorner"
@@ -32015,7 +32015,7 @@
dir = 6
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cyn" = (
/obj/machinery/status_display/directional/north,
/turf/simulated/floor/carpet,
@@ -36198,7 +36198,7 @@
/area/station/medical/reception)
"cPC" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cPD" = (
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
@@ -36251,7 +36251,7 @@
"cPS" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cPT" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance/three,
@@ -36279,7 +36279,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cQe" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -37026,7 +37026,7 @@
icon_state = "0-8"
},
/turf/space,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cTe" = (
/obj/machinery/computer/arcade/battle{
dir = 8
@@ -37299,7 +37299,7 @@
"cTN" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cTO" = (
/obj/structure/chair/office{
dir = 1
@@ -38746,7 +38746,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dam" = (
/obj/structure/disposalpipe/segment/corner{
dir = 8
@@ -38812,7 +38812,7 @@
icon_state = "0-4"
},
/turf/space,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"daH" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research/glass,
@@ -38899,7 +38899,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"daW" = (
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/ywflowers,
@@ -38940,7 +38940,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dbg" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
@@ -45844,7 +45844,7 @@
},
/obj/machinery/alarm/directional/north,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dKP" = (
/obj/machinery/light/small/directional/south,
/turf/simulated/floor/transparent/glass/reinforced,
@@ -46512,10 +46512,10 @@
"dPp" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dPq" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dPr" = (
/obj/structure/cable{
d1 = 2;
@@ -46703,7 +46703,7 @@
dir = 9
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dQa" = (
/obj/machinery/power/smes,
/obj/machinery/light/small/directional/north,
@@ -46715,7 +46715,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dQb" = (
/obj/structure/sign/electricshock,
/turf/simulated/wall/r_wall,
@@ -46873,7 +46873,7 @@
"dQB" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dQC" = (
/obj/machinery/field/generator{
anchored = 1;
@@ -46914,7 +46914,7 @@
},
/obj/effect/landmark/spawner/nukedisc_respawn,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dQN" = (
/obj/structure/table/reinforced,
/obj/item/stack/packageWrap,
@@ -46992,7 +46992,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dRc" = (
/obj/machinery/door/airlock/engineering,
/obj/effect/mapping_helpers/airlock/autoname,
@@ -47010,7 +47010,7 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/simulated/floor/plasteel,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dRj" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -47057,12 +47057,12 @@
dir = 10
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dRp" = (
/obj/machinery/alarm/directional/south,
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dRq" = (
/obj/machinery/power/apc/directional/south,
/obj/structure/cable,
@@ -47070,7 +47070,7 @@
dir = 6
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dRr" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -47747,7 +47747,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dTW" = (
/obj/structure/cable,
/obj/effect/spawner/window/reinforced/grilled,
@@ -48138,7 +48138,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dVo" = (
/obj/structure/table/wood,
/obj/item/taperecorder,
@@ -48255,7 +48255,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dWf" = (
/obj/docking_port/stationary{
dheight = 9;
@@ -48627,7 +48627,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dXI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -48825,7 +48825,7 @@
icon_state = "0-4"
},
/turf/space,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dYJ" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -48834,7 +48834,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dYK" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/glass/beaker/waterbottle,
@@ -48853,7 +48853,7 @@
icon_state = "1-4"
},
/turf/space,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dYM" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -48872,7 +48872,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dYN" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -48880,7 +48880,7 @@
icon_state = "0-8"
},
/turf/space,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dYO" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -48899,7 +48899,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dYP" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -48913,7 +48913,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dYR" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -48921,7 +48921,7 @@
icon_state = "0-2"
},
/turf/space,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dYS" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -48930,7 +48930,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"dYT" = (
/obj/structure/chair/wood{
dir = 1
@@ -50624,7 +50624,7 @@
icon_state = "0-2"
},
/turf/space,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"ewM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -57958,7 +57958,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"gLB" = (
/obj/structure/table/wood,
/obj/item/ashtray/plastic,
@@ -58863,7 +58863,7 @@
},
/obj/machinery/light/small/directional/west,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"gYP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -59788,7 +59788,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"hpo" = (
/obj/structure/table/reinforced,
/obj/item/clothing/head/welding{
@@ -62364,7 +62364,7 @@
icon_state = "1-8"
},
/turf/space,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"icL" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
@@ -67007,7 +67007,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"jtV" = (
/obj/machinery/firealarm/directional/north,
/turf/simulated/floor/plasteel{
@@ -67432,7 +67432,7 @@
icon_state = "4-8"
},
/turf/space,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"jzV" = (
/obj/machinery/sparker{
id = "toxinsigniter";
@@ -73399,7 +73399,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"lqL" = (
/obj/structure/cable{
d1 = 1;
@@ -75654,7 +75654,7 @@
c_tag = "Aft Starboard Solars"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"lZH" = (
/obj/machinery/recharge_station,
/obj/effect/turf_decal/delivery/hollow,
@@ -77495,7 +77495,7 @@
},
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"mDf" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/delivery,
@@ -78111,7 +78111,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"mQL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -78887,7 +78887,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"nbt" = (
/obj/structure/computerframe,
/obj/item/circuitboard/cyborgrecharger,
@@ -80624,7 +80624,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"nAZ" = (
/obj/structure/cable{
d1 = 4;
@@ -84213,7 +84213,7 @@
},
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"ozs" = (
/obj/structure/closet/secure_closet/security,
/obj/effect/decal/cleanable/dirt,
@@ -86567,7 +86567,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"pkv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -88214,7 +88214,7 @@
dir = 5
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"pIP" = (
/obj/structure/table/glass,
/obj/item/defibrillator/loaded{
@@ -93580,7 +93580,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"rnY" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
@@ -95716,7 +95716,7 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"rXC" = (
/obj/machinery/economy/vending/coffee,
/obj/effect/decal/cleanable/dirt,
@@ -99090,7 +99090,7 @@
},
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"sVu" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -102015,7 +102015,7 @@
dir = 10
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"tPX" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -102087,7 +102087,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"tRF" = (
/obj/structure/disposalpipe/junction{
dir = 4
@@ -103319,7 +103319,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"ujU" = (
/obj/structure/extinguisher_cabinet/directional/east,
/turf/simulated/floor/plasteel{
@@ -103731,7 +103731,7 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"upO" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
@@ -104051,7 +104051,7 @@
},
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"uvQ" = (
/obj/structure/girder,
/turf/simulated/floor/plating,
@@ -104821,7 +104821,7 @@
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/turf/space,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"uKo" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp{
@@ -107552,7 +107552,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"vzp" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -110732,7 +110732,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"wzJ" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -112959,7 +112959,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"xhz" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm
index 3e13e61669ce..bfd4c1256b63 100644
--- a/_maps/map_files220/stations/metastation.dmm
+++ b/_maps/map_files220/stations/metastation.dmm
@@ -83,7 +83,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"abU" = (
/obj/machinery/power/apc/directional/west,
/obj/structure/cable/yellow{
@@ -178,7 +178,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"acB" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -238,7 +238,7 @@
"adj" = (
/obj/structure/cable,
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"adk" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
@@ -300,7 +300,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"adM" = (
/obj/machinery/alarm/directional/east,
/obj/structure/table,
@@ -351,7 +351,7 @@
"aee" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"aef" = (
/obj/structure/lattice/catwalk,
/turf/space,
@@ -540,7 +540,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"afH" = (
/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_3)
@@ -572,7 +572,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"agg" = (
/obj/structure/cable/green{
icon_state = "0-10"
@@ -613,7 +613,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"agw" = (
/obj/structure/chair{
dir = 1
@@ -649,11 +649,11 @@
/area/station/maintenance/fore)
"agH" = (
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"agM" = (
/obj/structure/lattice/catwalk,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"agY" = (
/obj/structure/closet/secure_closet/detective,
/obj/item/restraints/handcuffs,
@@ -869,7 +869,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"aiR" = (
/obj/structure/cable{
d1 = 2;
@@ -877,7 +877,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"aiY" = (
/turf/simulated/wall,
/area/station/public/arcade)
@@ -991,7 +991,7 @@
/area/station/maintenance/disposal)
"ajB" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"ajC" = (
/obj/structure/cable{
d2 = 4;
@@ -1001,7 +1001,7 @@
name = "Fore Port Solar Control"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"ajD" = (
/mob/living/simple_animal/mouse,
/obj/effect/decal/cleanable/dirt,
@@ -1015,7 +1015,7 @@
/obj/machinery/light_switch/south,
/obj/machinery/power/apc/directional/west,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"ajJ" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -1034,7 +1034,7 @@
icon_state = "2-4"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"ajL" = (
/obj/structure/cable/yellow,
/obj/effect/spawner/window/reinforced/grilled,
@@ -1047,7 +1047,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"ajO" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -1139,7 +1139,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"akw" = (
/obj/effect/landmark/spawner/xeno,
/obj/structure/cable{
@@ -1148,7 +1148,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"akx" = (
/obj/structure/cable{
d2 = 8;
@@ -1158,7 +1158,7 @@
/obj/machinery/light/small/directional/east,
/obj/item/radio/intercom/directional/east,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"aky" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/fpmaint)
@@ -1297,7 +1297,7 @@
},
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"alw" = (
/obj/structure/cable/yellow{
d2 = 8;
@@ -1305,7 +1305,7 @@
},
/obj/machinery/power/smes,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"alx" = (
/obj/structure/table,
/obj/item/stack/medical/ointment{
@@ -1666,7 +1666,7 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"ann" = (
/turf/simulated/floor/plasteel{
dir = 4;
@@ -1680,7 +1680,7 @@
/area/station/maintenance/fore)
"ans" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"anv" = (
/obj/machinery/door/poddoor/preopen{
id_tag = "Disposal Exit";
@@ -1824,7 +1824,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"anN" = (
/obj/structure/morgue{
dir = 2
@@ -1926,7 +1926,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"aon" = (
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall,
@@ -2525,7 +2525,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"arD" = (
/obj/structure/disposaloutlet{
dir = 4
@@ -2560,7 +2560,7 @@
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"arJ" = (
/obj/structure/chair{
dir = 8
@@ -2599,7 +2599,7 @@
/obj/machinery/light_switch/south,
/obj/machinery/power/apc/directional/west,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"arU" = (
/obj/effect/landmark/spawner/xeno,
/turf/simulated/floor/plating,
@@ -2786,7 +2786,7 @@
"asU" = (
/obj/effect/spawner/random_spawners/wall_rusted_probably,
/turf/simulated/wall/r_wall,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"asV" = (
/obj/machinery/economy/vending/detdrobe,
/turf/simulated/floor/plasteel{
@@ -3070,7 +3070,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"atW" = (
/obj/machinery/economy/vending/cola,
/turf/simulated/floor/plasteel{
@@ -3087,7 +3087,7 @@
/obj/machinery/atmospherics/portable/canister/air,
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aub" = (
/obj/effect/spawner/lootdrop{
loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
@@ -3128,7 +3128,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"auk" = (
/obj/effect/landmark/spawner/xeno,
/obj/structure/cable{
@@ -3137,7 +3137,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aul" = (
/obj/structure/cable{
d2 = 8;
@@ -3147,7 +3147,7 @@
/obj/machinery/light/small/directional/east,
/obj/item/radio/intercom/directional/east,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"aup" = (
/obj/structure/lattice,
/obj/structure/grille/broken,
@@ -3192,7 +3192,7 @@
icon_state = "0-2"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"auw" = (
/obj/machinery/light/small/directional/west,
/obj/effect/turf_decal/stripes/line{
@@ -3512,7 +3512,7 @@
},
/obj/machinery/power/smes,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"avN" = (
/obj/machinery/porta_turret/ai_turret,
/obj/machinery/computer/security/telescreen/minisat{
@@ -3644,7 +3644,7 @@
},
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"awf" = (
/obj/machinery/light/directional/south,
/obj/effect/landmark/spawner/xeno,
@@ -4549,7 +4549,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"azC" = (
/obj/item/radio/intercom/department/security{
pixel_y = 22
@@ -4842,7 +4842,7 @@
icon_state = "2-4"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"aBu" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -5761,7 +5761,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"aED" = (
/obj/machinery/economy/vending/shoedispenser,
/obj/machinery/alarm/directional/east,
@@ -6087,7 +6087,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"aGl" = (
/obj/structure/chair{
dir = 4
@@ -9820,7 +9820,7 @@
icon_state = "1-4"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"aSJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -18552,7 +18552,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"brp" = (
/obj/machinery/light/directional/south,
/turf/simulated/floor/mineral/titanium/blue,
@@ -21910,7 +21910,7 @@
/area/station/service/theatre)
"bAC" = (
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"bAE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -23934,7 +23934,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"bHK" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -25694,7 +25694,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"bOn" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/unary/outlet_injector/on,
@@ -25838,7 +25838,7 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"bOM" = (
/obj/structure/chair{
dir = 1
@@ -27126,7 +27126,7 @@
/obj/machinery/light/small/directional/south,
/obj/item/radio/intercom/directional/south,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"bTl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -27477,7 +27477,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"bUy" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -28003,7 +28003,7 @@
},
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"bWm" = (
/obj/structure/rack,
/obj/item/storage/box,
@@ -28538,7 +28538,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"bXK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/obj/machinery/door/airlock/maintenance,
@@ -30124,7 +30124,7 @@
/obj/structure/lattice/catwalk,
/obj/item/stack/rods/ten,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"ccW" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -32254,7 +32254,7 @@
/obj/machinery/atmospherics/unary/portables_connector,
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cke" = (
/obj/structure/cable{
d2 = 8;
@@ -32271,7 +32271,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"ckf" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -32948,7 +32948,7 @@
},
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cmK" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/visible/green,
@@ -33590,7 +33590,7 @@
icon_state = "1-4"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"coU" = (
/obj/effect/spawner/lootdrop{
loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
@@ -33626,7 +33626,7 @@
dir = 8
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cpq" = (
/obj/machinery/atmospherics/binary/pump,
/turf/simulated/wall/r_wall,
@@ -33743,7 +33743,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cpM" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -34880,7 +34880,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cur" = (
/obj/structure/cable{
d2 = 4;
@@ -35924,7 +35924,7 @@
icon_state = "0-2"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"cyd" = (
/obj/structure/table,
/obj/structure/bedsheetbin{
@@ -37275,7 +37275,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"cCQ" = (
/obj/structure/extinguisher_cabinet/directional/east,
/turf/simulated/floor/plasteel{
@@ -38147,7 +38147,7 @@
pixel_x = 32
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cFN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -39214,7 +39214,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cJn" = (
/turf/simulated/floor/plasteel{
icon_state = "chapel"
@@ -39654,7 +39654,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cLg" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -39950,7 +39950,7 @@
pixel_y = -32
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cMF" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/drinks/bottle/holywater{
@@ -40148,7 +40148,7 @@
/obj/machinery/power/smes,
/obj/structure/cable/yellow,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cNw" = (
/obj/structure/closet/wardrobe/white,
/obj/effect/spawner/lootdrop/maintenance,
@@ -41073,7 +41073,7 @@
/area/station/hallway/secondary/exit)
"cQW" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cRc" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance,
@@ -41384,7 +41384,7 @@
/obj/item/radio/intercom/directional/east,
/obj/machinery/light/small/directional/east,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cSy" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
@@ -41794,7 +41794,7 @@
/area/station/science/toxins/test)
"cUm" = (
/turf/simulated/wall,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"cUr" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -42117,7 +42117,7 @@
/obj/machinery/light_switch/north,
/obj/machinery/power/apc/directional/east,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cVw" = (
/obj/structure/chair/sofa/pew/left,
/turf/simulated/floor/plasteel{
@@ -42995,7 +42995,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"cZD" = (
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
@@ -43437,7 +43437,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"dcj" = (
/obj/machinery/light/small/directional/west,
/turf/simulated/floor/plating,
@@ -43642,7 +43642,7 @@
/obj/effect/landmark/spawner/xeno,
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"ddK" = (
/obj/structure/reagent_dispensers/watertank,
/obj/item/reagent_containers/glass/bucket,
@@ -45552,7 +45552,7 @@
"dPW" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"dQb" = (
/turf/simulated/floor/plasteel{
icon_state = "darkneutralfull"
@@ -45758,7 +45758,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"dUF" = (
/obj/machinery/door/airlock/external{
id_tag = "soldock_door_ext";
@@ -46563,7 +46563,7 @@
icon_state = "2-4"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"eow" = (
/obj/machinery/atmospherics/pipe/manifold/visible,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -46595,7 +46595,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"epn" = (
/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
dir = 4
@@ -48444,7 +48444,7 @@
},
/obj/item/stack/rods/ten,
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"fho" = (
/obj/structure/chair/stool,
/turf/simulated/floor/plasteel{
@@ -49555,7 +49555,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"fFX" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -49703,7 +49703,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"fIA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -51250,7 +51250,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"gxC" = (
/obj/machinery/light/small/directional/east,
/turf/simulated/floor/engine,
@@ -52299,7 +52299,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"gVB" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -52523,7 +52523,7 @@
/obj/effect/spawner/airlock/s_to_n,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"hbc" = (
/obj/machinery/atmospherics/unary/tank/air,
/turf/simulated/floor/plating,
@@ -52537,7 +52537,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"hbB" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
@@ -53233,7 +53233,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"hpR" = (
/obj/structure/plasticflaps{
opacity = 1
@@ -53819,7 +53819,7 @@
icon_state = "1-4"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"hDr" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/r_n_d/circuit_imprinter,
@@ -56593,7 +56593,7 @@
"iMJ" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"iNe" = (
/obj/machinery/computer/mech_bay_power_console{
dir = 8
@@ -58655,7 +58655,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/auxstarboard)
+/area/station/engineering/solar/fore_starboard)
"jQZ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -58737,7 +58737,7 @@
icon_state = "0-2"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"jSC" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/camera{
@@ -60468,7 +60468,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"kIP" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
@@ -60529,7 +60529,7 @@
icon_state = "1-2"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"kLd" = (
/obj/structure/window/reinforced{
dir = 1
@@ -63415,7 +63415,7 @@
/area/station/engineering/atmos)
"lSh" = (
/turf/simulated/wall/r_wall,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"lSn" = (
/obj/structure/window/reinforced{
dir = 1
@@ -64658,7 +64658,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"mAa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -65580,7 +65580,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"mVB" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -67299,7 +67299,7 @@
/obj/effect/spawner/airlock/s_to_n,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"nEJ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -68410,7 +68410,7 @@
/obj/effect/spawner/airlock/e_to_w/long,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"ohK" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
@@ -68801,7 +68801,7 @@
icon_state = "2-8"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"owq" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -70575,7 +70575,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"pre" = (
/obj/structure/chair{
dir = 1
@@ -70928,7 +70928,7 @@
"pBu" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"pBB" = (
/obj/structure/sign/directions/engineering{
dir = 4;
@@ -72990,7 +72990,7 @@
/obj/effect/spawner/airlock/long,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"quW" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -77464,7 +77464,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"sFS" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -78211,7 +78211,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarstarboard)
+/area/station/maintenance/solar_maintenance/port)
"sVD" = (
/obj/structure/mirror{
pixel_y = -34
@@ -80243,7 +80243,7 @@
dir = 1
},
/turf/simulated/floor/plating,
-/area/station/maintenance/auxsolarport)
+/area/station/maintenance/solar_maintenance/fore_port)
"tWl" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plasteel{
@@ -81019,7 +81019,7 @@
icon_state = "1-8"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"uqN" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/medical,
@@ -83804,7 +83804,7 @@
icon_state = "1-8"
},
/turf/space,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"vIz" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -85017,7 +85017,7 @@
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
/turf/simulated/floor/plating,
-/area/station/maintenance/portsolar)
+/area/station/maintenance/solar_maintenance/aft_port)
"wsN" = (
/obj/effect/landmark/start/research_director,
/turf/simulated/floor/plasteel{
@@ -87182,7 +87182,7 @@
"xwJ" = (
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
-/area/station/maintenance/starboardsolar)
+/area/station/maintenance/solar_maintenance/aft_starboard)
"xxa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -88857,7 +88857,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating/airless,
-/area/station/engineering/solar/auxport)
+/area/station/engineering/solar/fore)
"yhT" = (
/obj/structure/sign/poster/random{
pixel_y = -32
diff --git a/code/__DEFINES/_ss220.dm b/code/__DEFINES/_ss220.dm
index 203e016a313f..0cf3257d7da9 100644
--- a/code/__DEFINES/_ss220.dm
+++ b/code/__DEFINES/_ss220.dm
@@ -1 +1,5 @@
#define MODPACK_CHAT_BADGES
+
+// TODO: someday preferences will use TGUI and you will probably be able to move it to modular_ss220\_defines220\code\preferences_defines.dm
+/// Interacts with the toggles220 bitflag
+#define PREFTOGGLE_TOGGLE220 220
diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
index 84d7fe10ce6e..07c33b97a78e 100644
--- a/code/__DEFINES/dcs/signals.dm
+++ b/code/__DEFINES/dcs/signals.dm
@@ -892,92 +892,6 @@
///from base of /obj/effect/decal/cleanable/blood/gibs/streak(): (list/directions, list/diseases)
#define COMSIG_GIBS_STREAK "gibs_streak"
-//Mood
-
-///called when you send a mood event from anywhere in the code.
-#define COMSIG_ADD_MOOD_EVENT "add_mood"
-///Mood event that only RnD members listen for
-#define COMSIG_ADD_MOOD_EVENT_RND "RND_add_mood"
-///called when you clear a mood event from anywhere in the code.
-#define COMSIG_CLEAR_MOOD_EVENT "clear_mood"
-
-//NTnet
-
-///called on an object by its NTNET connection component on receive. (sending_id(number), sending_netname(text), data(datum/netdata))
-#define COMSIG_COMPONENT_NTNET_RECEIVE "ntnet_receive"
-
-//Nanites
-
-///() returns TRUE if nanites are found
-#define COMSIG_HAS_NANITES "has_nanites"
-///() returns TRUE if nanites have stealth
-#define COMSIG_NANITE_IS_STEALTHY "nanite_is_stealthy"
-///() deletes the nanite component
-#define COMSIG_NANITE_DELETE "nanite_delete"
-///(list/nanite_programs) - makes the input list a copy the nanites' program list
-#define COMSIG_NANITE_GET_PROGRAMS "nanite_get_programs"
-///(amount) Returns nanite amount
-#define COMSIG_NANITE_GET_VOLUME "nanite_get_volume"
-///(amount) Sets current nanite volume to the given amount
-#define COMSIG_NANITE_SET_VOLUME "nanite_set_volume"
-///(amount) Adjusts nanite volume by the given amount
-#define COMSIG_NANITE_ADJUST_VOLUME "nanite_adjust"
-///(amount) Sets maximum nanite volume to the given amount
-#define COMSIG_NANITE_SET_MAX_VOLUME "nanite_set_max_volume"
-///(amount(0-100)) Sets cloud ID to the given amount
-#define COMSIG_NANITE_SET_CLOUD "nanite_set_cloud"
-///(method) Modify cloud sync status. Method can be toggle, enable or disable
-#define COMSIG_NANITE_SET_CLOUD_SYNC "nanite_set_cloud_sync"
-///(amount) Sets safety threshold to the given amount
-#define COMSIG_NANITE_SET_SAFETY "nanite_set_safety"
-///(amount) Sets regeneration rate to the given amount
-#define COMSIG_NANITE_SET_REGEN "nanite_set_regen"
-///(code(1-9999)) Called when sending a nanite signal to a mob.
-#define COMSIG_NANITE_SIGNAL "nanite_signal"
-///(comm_code(1-9999), comm_message) Called when sending a nanite comm signal to a mob.
-#define COMSIG_NANITE_COMM_SIGNAL "nanite_comm_signal"
-///(mob/user, full_scan) - sends to chat a scan of the nanites to the user, returns TRUE if nanites are detected
-#define COMSIG_NANITE_SCAN "nanite_scan"
-///(list/data, scan_level) - adds nanite data to the given data list - made for ui_data procs
-#define COMSIG_NANITE_UI_DATA "nanite_ui_data"
-///(datum/nanite_program/new_program, datum/nanite_program/source_program) Called when adding a program to a nanite component
-#define COMSIG_NANITE_ADD_PROGRAM "nanite_add_program"
- ///Installation successful
- #define COMPONENT_PROGRAM_INSTALLED (1<<0)
- ///Installation failed, but there are still nanites
- #define COMPONENT_PROGRAM_NOT_INSTALLED (1<<1)
-///(datum/component/nanites, full_overwrite, copy_activation) Called to sync the target's nanites to a given nanite component
-#define COMSIG_NANITE_SYNC "nanite_sync"
-
-// /datum/component/storage signals
-
-///() - returns bool.
-#define COMSIG_CONTAINS_STORAGE "is_storage"
-///(obj/item/inserting, mob/user, silent, force) - returns bool
-#define COMSIG_TRY_STORAGE_INSERT "storage_try_insert"
-///(mob/show_to, force) - returns bool.
-#define COMSIG_TRY_STORAGE_SHOW "storage_show_to"
-///(mob/hide_from) - returns bool
-#define COMSIG_TRY_STORAGE_HIDE_FROM "storage_hide_from"
-///returns bool
-#define COMSIG_TRY_STORAGE_HIDE_ALL "storage_hide_all"
-///(newstate)
-#define COMSIG_TRY_STORAGE_SET_LOCKSTATE "storage_lock_set_state"
-///() - returns bool. MUST CHECK IF STORAGE IS THERE FIRST!
-#define COMSIG_IS_STORAGE_LOCKED "storage_get_lockstate"
-///(type, atom/destination, amount = INFINITY, check_adjacent, force, mob/user, list/inserted) - returns bool - type can be a list of types.
-#define COMSIG_TRY_STORAGE_TAKE_TYPE "storage_take_type"
-///(type, amount = INFINITY, force = FALSE). Force will ignore max_items, and amount is normally clamped to max_items.
-#define COMSIG_TRY_STORAGE_FILL_TYPE "storage_fill_type"
-///(obj, new_loc, force = FALSE) - returns bool
-#define COMSIG_TRY_STORAGE_TAKE "storage_take_obj"
-///(loc) - returns bool - if loc is null it will dump at parent location.
-#define COMSIG_TRY_STORAGE_QUICK_EMPTY "storage_quick_empty"
-///(list/list_to_inject_results_into, recursively_search_inside_storages = TRUE)
-#define COMSIG_TRY_STORAGE_RETURN_INVENTORY "storage_return_inventory"
-///(obj/item/insertion_candidate, mob/user, silent) - returns bool
-#define COMSIG_TRY_STORAGE_CAN_INSERT "storage_can_equip"
-
// /datum/component/two_handed signals
///from base of datum/component/two_handed/proc/wield(mob/living/carbon/user): (/mob/user)
diff --git a/code/__DEFINES/dye_keys.dm b/code/__DEFINES/dye_keys.dm
new file mode 100644
index 000000000000..f78612924a26
--- /dev/null
+++ b/code/__DEFINES/dye_keys.dm
@@ -0,0 +1,37 @@
+#define DYE_REGISTRY_UNDER "under"
+#define DYE_REGISTRY_JUMPSKIRT "jumpskirt"
+#define DYE_REGISTRY_GLOVES "gloves"
+#define DYE_REGISTRY_BANDANA "bandana"
+#define DYE_REGISTRY_SHOES "shoes"
+#define DYE_REGISTRY_FANNYPACK "fannypack"
+#define DYE_REGISTRY_BEANIE "beanie"
+#define DYE_REGISTRY_BEDSHEET "bedsheet"
+#define DYE_REGISTRY_PLASMAMEN "plasmamen"
+#define DYE_REGISTRY_SYNDICATE_SUIT "syndicate_suit"
+#define DYE_REGISTRY_SYNDICATE_HELMET "syndicate_helmet"
+#define DYE_REGISTRY_VOID_SUIT "void_suit"
+#define DYE_REGISTRY_VOID_HELMET "void_helmet"
+
+#define DYE_RED "red"
+#define DYE_ORANGE "orange"
+#define DYE_YELLOW "yellow"
+#define DYE_GREEN "green"
+#define DYE_BLUE "blue"
+#define DYE_PURPLE "purple"
+#define DYE_BLACK "black"
+#define DYE_WHITE "white"
+#define DYE_RAINBOW "rainbow"
+#define DYE_MIME "mime"
+#define DYE_COSMIC "cosmic"
+#define DYE_SYNDICATE "syndicate"
+#define DYE_QM "qm"
+#define DYE_LAW "law"
+#define DYE_CAPTAIN "captain"
+#define DYE_HOP "hop"
+#define DYE_HOS "hos"
+#define DYE_NTREP "ntrep"
+#define DYE_CE "ce"
+#define DYE_RD "rd"
+#define DYE_CMO "cmo"
+#define DYE_CLOWN "clown"
+#define DYE_CENTCOM "centcom"
diff --git a/code/__DEFINES/misc_defines.dm b/code/__DEFINES/misc_defines.dm
index 12c0b6362d41..491520bba20d 100644
--- a/code/__DEFINES/misc_defines.dm
+++ b/code/__DEFINES/misc_defines.dm
@@ -420,7 +420,7 @@
#define INVESTIGATE_HOTMIC "hotmic"
// The SQL version required by this version of the code
-#define SQL_VERSION 592206
+#define SQL_VERSION 592207
// Vending machine stuff
#define CAT_NORMAL (1<<0)
@@ -600,8 +600,9 @@
// Request console message priority defines
#define RQ_NONEW_MESSAGES 0 // RQ_NONEWMESSAGES = no new message
-#define RQ_NORMALPRIORITY 1 // RQ_NORMALPRIORITY = normal priority
-#define RQ_HIGHPRIORITY 2 // RQ_HIGHPRIORITY = high priority
+#define RQ_LOWPRIORITY 1 // RQ_LOWPRIORITY = low priority
+#define RQ_NORMALPRIORITY 2 // RQ_NORMALPRIORITY = normal priority
+#define RQ_HIGHPRIORITY 3 // RQ_HIGHPRIORITY = high priority
/**
* Reading books can help with brain damage!
diff --git a/code/_globalvars/lists/dye_registry.dm b/code/_globalvars/lists/dye_registry.dm
new file mode 100644
index 000000000000..c3a61c8dcc3e
--- /dev/null
+++ b/code/_globalvars/lists/dye_registry.dm
@@ -0,0 +1,219 @@
+/*
+ * Dye Registry
+ *
+ * This is the easiest way to expand the range of dyeable clothes in-game.
+ * Adding an entry to one of the registry lists allows all types with that dyeing_key to
+ * be dyed to one of the included paths (given a specific dye key) unless otherwise precluded
+ * by setting dyeable to FALSE
+ *
+ * For example, /obj/item/clothing/under dyeing_key is set to
+*/
+
+
+//dye registry, add dye colors and their resulting output here if you want the sprite to change
+GLOBAL_LIST_INIT(dye_registry, list(
+ DYE_REGISTRY_UNDER = list(
+ DYE_RED = /obj/item/clothing/under/color/red,
+ DYE_ORANGE = /obj/item/clothing/under/color/orange,
+ DYE_YELLOW = /obj/item/clothing/under/color/yellow,
+ DYE_GREEN = /obj/item/clothing/under/color/green,
+ DYE_BLUE = /obj/item/clothing/under/color/blue,
+ DYE_PURPLE = /obj/item/clothing/under/color/lightpurple,
+ DYE_BLACK = /obj/item/clothing/under/color/black,
+ DYE_WHITE = /obj/item/clothing/under/color/white,
+ DYE_RAINBOW = /obj/item/clothing/under/color/rainbow,
+ DYE_MIME = /obj/item/clothing/under/rank/civilian/mime,
+ DYE_CLOWN = /obj/item/clothing/under/rank/civilian/clown,
+ DYE_QM = /obj/item/clothing/under/rank/cargo/qm,
+ DYE_LAW = /obj/item/clothing/under/suit/black,
+ DYE_CAPTAIN = /obj/item/clothing/under/rank/captain,
+ DYE_HOP = /obj/item/clothing/under/rank/civilian/hop,
+ DYE_HOS = /obj/item/clothing/under/rank/security/head_of_security,
+ DYE_CE = /obj/item/clothing/under/rank/engineering/chief_engineer,
+ DYE_RD = /obj/item/clothing/under/rank/rnd/research_director,
+ DYE_CMO = /obj/item/clothing/under/rank/medical/chief_medical_officer,
+ DYE_SYNDICATE = /obj/item/clothing/under/syndicate,
+ DYE_CENTCOM = /obj/item/clothing/under/rank/centcom/commander,
+ ),
+ DYE_REGISTRY_JUMPSKIRT = list(
+ DYE_RED = /obj/item/clothing/under/dress/plaid_red,
+ DYE_BLUE = /obj/item/clothing/under/dress/plaid_blue,
+ DYE_PURPLE = /obj/item/clothing/under/dress/plaid_purple,
+ DYE_BLACK = /obj/item/clothing/under/dress/blackskirt,
+ DYE_MIME = /obj/item/clothing/under/rank/civilian/mime/skirt,
+ DYE_QM = /obj/item/clothing/under/rank/cargo/qm/skirt,
+ DYE_CAPTAIN = /obj/item/clothing/under/rank/captain/dress,
+ DYE_HOP = /obj/item/clothing/under/rank/civilian/hop/skirt,
+ DYE_HOS = /obj/item/clothing/under/rank/security/head_of_security/skirt,
+ DYE_CE = /obj/item/clothing/under/rank/engineering/chief_engineer/skirt,
+ DYE_RD = /obj/item/clothing/under/rank/rnd/research_director/dress,
+ DYE_CMO = /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt,
+ ),
+ DYE_REGISTRY_GLOVES = list(
+ DYE_RED = /obj/item/clothing/gloves/color/red,
+ DYE_ORANGE = /obj/item/clothing/gloves/color/orange,
+ DYE_YELLOW = /obj/item/clothing/gloves/color/yellow,
+ DYE_GREEN = /obj/item/clothing/gloves/color/green,
+ DYE_BLUE = /obj/item/clothing/gloves/color/blue,
+ DYE_PURPLE = /obj/item/clothing/gloves/color/purple,
+ DYE_BLACK = /obj/item/clothing/gloves/color/black,
+ DYE_WHITE = /obj/item/clothing/gloves/color/white,
+ DYE_RAINBOW = /obj/item/clothing/gloves/color/rainbow,
+ DYE_MIME = /obj/item/clothing/gloves/color/white,
+ DYE_CLOWN = /obj/item/clothing/gloves/color/rainbow,
+ DYE_QM = /obj/item/clothing/gloves/color/brown,
+ DYE_CAPTAIN = /obj/item/clothing/gloves/color/blue,
+ DYE_HOP = /obj/item/clothing/gloves/color/grey,
+ DYE_HOS = /obj/item/clothing/gloves/color/black,
+ DYE_CE = /obj/item/clothing/gloves/color/yellow,
+ DYE_RD = /obj/item/clothing/gloves/color/grey,
+ DYE_CMO = /obj/item/clothing/gloves/color/blue,
+ DYE_SYNDICATE = /obj/item/clothing/gloves/combat,
+ DYE_CENTCOM = /obj/item/clothing/gloves/combat
+ ),
+ DYE_REGISTRY_BANDANA = list(
+ DYE_RED = /obj/item/clothing/mask/bandana/red,
+ DYE_ORANGE = /obj/item/clothing/mask/bandana/orange,
+ DYE_YELLOW = /obj/item/clothing/mask/bandana/gold,
+ DYE_GREEN = /obj/item/clothing/mask/bandana/green,
+ DYE_BLUE = /obj/item/clothing/mask/bandana/blue,
+ DYE_PURPLE = /obj/item/clothing/mask/bandana/purple,
+ DYE_BLACK = /obj/item/clothing/mask/bandana/black,
+ ),
+ DYE_REGISTRY_BEANIE = list(
+ DYE_BLACK = /obj/item/clothing/head/beanie/black,
+ DYE_WHITE = /obj/item/clothing/head/beanie,
+ DYE_RED = /obj/item/clothing/head/beanie/red,
+ DYE_GREEN = /obj/item/clothing/head/beanie/green,
+ DYE_CAPTAIN = /obj/item/clothing/head/beanie/darkblue,
+ DYE_NTREP = /obj/item/clothing/head/beanie/darkblue,
+ DYE_PURPLE = /obj/item/clothing/head/beanie/purple,
+ DYE_RD = /obj/item/clothing/head/beanie/purple,
+ DYE_YELLOW = /obj/item/clothing/head/beanie/yellow,
+ DYE_CE = /obj/item/clothing/head/beanie/orange,
+ DYE_ORANGE = /obj/item/clothing/head/beanie/orange,
+ DYE_CMO = /obj/item/clothing/head/beanie/cyan,
+ DYE_BLUE = /obj/item/clothing/head/beanie/cyan,
+
+
+ ),
+ DYE_REGISTRY_SHOES = list(
+ DYE_RED = /obj/item/clothing/shoes/red,
+ DYE_ORANGE = /obj/item/clothing/shoes/orange,
+ DYE_YELLOW = /obj/item/clothing/shoes/yellow,
+ DYE_GREEN = /obj/item/clothing/shoes/green,
+ DYE_BLUE = /obj/item/clothing/shoes/blue,
+ DYE_PURPLE = /obj/item/clothing/shoes/purple,
+ DYE_BLACK = /obj/item/clothing/shoes/black,
+ DYE_WHITE = /obj/item/clothing/shoes/white,
+ DYE_RAINBOW = /obj/item/clothing/shoes/rainbow,
+ DYE_MIME = /obj/item/clothing/shoes/black,
+ DYE_CLOWN = /obj/item/clothing/shoes/rainbow,
+ DYE_QM = /obj/item/clothing/shoes/brown,
+ DYE_CAPTAIN = /obj/item/clothing/shoes/brown,
+ DYE_HOP = /obj/item/clothing/shoes/brown,
+ DYE_CE = /obj/item/clothing/shoes/brown,
+ DYE_RD = /obj/item/clothing/shoes/brown,
+ DYE_CMO = /obj/item/clothing/shoes/brown,
+ DYE_SYNDICATE = /obj/item/clothing/shoes/combat,
+ DYE_CENTCOM = /obj/item/clothing/shoes/combat
+ ),
+ DYE_REGISTRY_FANNYPACK = list(
+ DYE_RED = /obj/item/storage/belt/fannypack/red,
+ DYE_ORANGE = /obj/item/storage/belt/fannypack/orange,
+ DYE_YELLOW = /obj/item/storage/belt/fannypack/yellow,
+ DYE_GREEN = /obj/item/storage/belt/fannypack/green,
+ DYE_BLUE = /obj/item/storage/belt/fannypack/blue,
+ DYE_PURPLE = /obj/item/storage/belt/fannypack/purple,
+ DYE_BLACK = /obj/item/storage/belt/fannypack/black,
+ DYE_WHITE = /obj/item/storage/belt/fannypack/white,
+ DYE_SYNDICATE = /obj/item/storage/belt/military
+ ),
+ DYE_REGISTRY_BEDSHEET = list(
+ DYE_RED = /obj/item/bedsheet/red,
+ DYE_ORANGE = /obj/item/bedsheet/orange,
+ DYE_YELLOW = /obj/item/bedsheet/yellow,
+ DYE_GREEN = /obj/item/bedsheet/green,
+ DYE_BLUE = /obj/item/bedsheet/blue,
+ DYE_PURPLE = /obj/item/bedsheet/purple,
+ DYE_BLACK = /obj/item/bedsheet/black,
+ DYE_WHITE = /obj/item/bedsheet,
+ DYE_RAINBOW = /obj/item/bedsheet/rainbow,
+ DYE_MIME = /obj/item/bedsheet/mime,
+ DYE_CLOWN = /obj/item/bedsheet/clown,
+ DYE_QM = /obj/item/bedsheet/qm,
+ DYE_LAW = /obj/item/bedsheet/black,
+ DYE_CAPTAIN = /obj/item/bedsheet/captain,
+ DYE_HOP = /obj/item/bedsheet/hop,
+ DYE_HOS = /obj/item/bedsheet/hos,
+ DYE_CE = /obj/item/bedsheet/ce,
+ DYE_RD = /obj/item/bedsheet/rd,
+ DYE_CMO = /obj/item/bedsheet/cmo,
+ DYE_SYNDICATE = /obj/item/bedsheet/syndie,
+ DYE_CENTCOM = /obj/item/bedsheet/centcom
+ ),
+ DYE_REGISTRY_PLASMAMEN = list(
+ DYE_RED = /obj/item/clothing/under/plasmaman/security,
+ DYE_ORANGE = /obj/item/clothing/under/plasmaman,
+ DYE_YELLOW = /obj/item/clothing/under/plasmaman/engineering,
+ DYE_GREEN = /obj/item/clothing/under/plasmaman/botany,
+ DYE_BLUE = /obj/item/clothing/under/plasmaman/atmospherics,
+ DYE_PURPLE = /obj/item/clothing/under/plasmaman/janitor,
+ DYE_BLACK = /obj/item/clothing/under/plasmaman/robotics,
+ DYE_WHITE = /obj/item/clothing/under/plasmaman/chef,
+ DYE_MIME = /obj/item/clothing/under/plasmaman/mime,
+ DYE_CLOWN = /obj/item/clothing/under/plasmaman/clown,
+ DYE_QM = /obj/item/clothing/under/plasmaman/cargo,
+ DYE_LAW = /obj/item/clothing/under/plasmaman/security/warden,
+ DYE_CAPTAIN = /obj/item/clothing/under/plasmaman/captain,
+ DYE_HOP = /obj/item/clothing/under/plasmaman/hop,
+ DYE_HOS =/obj/item/clothing/under/plasmaman/security/hos,
+ DYE_CE = /obj/item/clothing/under/plasmaman/engineering/ce,
+ DYE_RD = /obj/item/clothing/under/plasmaman/rd,
+ DYE_CMO = /obj/item/clothing/under/plasmaman/cmo,
+ ),
+ DYE_REGISTRY_VOID_SUIT = list(
+ DYE_RED = /obj/item/clothing/suit/space/nasavoid,
+ DYE_GREEN = /obj/item/clothing/suit/space/nasavoid/green,
+ DYE_BLUE = /obj/item/clothing/suit/space/nasavoid/ltblue,
+ DYE_PURPLE = /obj/item/clothing/suit/space/nasavoid/purple,
+ DYE_YELLOW = /obj/item/clothing/suit/space/nasavoid/yellow,
+ DYE_CAPTAIN = /obj/item/clothing/suit/space/nasavoid/captain,
+ DYE_SYNDICATE = /obj/item/clothing/suit/space/nasavoid/syndi,
+ DYE_HOP = /obj/item/clothing/suit/space/nasavoid/ntblue,
+ DYE_NTREP = /obj/item/clothing/suit/space/nasavoid/ntblue,
+ ),
+ DYE_REGISTRY_VOID_HELMET = list(
+ DYE_RED = /obj/item/clothing/head/helmet/space/nasavoid,
+ DYE_GREEN = /obj/item/clothing/head/helmet/space/nasavoid/green,
+ DYE_BLUE = /obj/item/clothing/head/helmet/space/nasavoid/ltblue,
+ DYE_PURPLE = /obj/item/clothing/head/helmet/space/nasavoid/purple,
+ DYE_YELLOW = /obj/item/clothing/head/helmet/space/nasavoid/yellow,
+ DYE_CAPTAIN = /obj/item/clothing/head/helmet/space/nasavoid/captain,
+ DYE_SYNDICATE = /obj/item/clothing/head/helmet/space/nasavoid/syndi,
+ DYE_HOP = /obj/item/clothing/head/helmet/space/nasavoid/ntblue,
+ DYE_NTREP = /obj/item/clothing/head/helmet/space/nasavoid/ntblue,
+ ),
+ DYE_REGISTRY_SYNDICATE_SUIT = list(
+ DYE_RED = /obj/item/clothing/suit/space/syndicate,
+ DYE_GREEN = /obj/item/clothing/suit/space/syndicate/green,
+ DYE_ORANGE = /obj/item/clothing/suit/space/syndicate/orange,
+ DYE_BLUE = /obj/item/clothing/suit/space/syndicate/blue,
+ DYE_YELLOW = /obj/item/clothing/suit/space/syndicate/black/engie,
+ DYE_BLACK = /obj/item/clothing/suit/space/syndicate/black,
+ DYE_CMO = /obj/item/clothing/suit/space/syndicate/black/med,
+ DYE_CE = /obj/item/clothing/suit/space/syndicate/black/engie,
+ DYE_NTREP = /obj/item/clothing/suit/space/syndicate/blue,
+ ),
+ DYE_REGISTRY_SYNDICATE_HELMET = list(
+ DYE_RED = /obj/item/clothing/head/helmet/space/syndicate,
+ DYE_GREEN = /obj/item/clothing/head/helmet/space/syndicate/green,
+ DYE_ORANGE = /obj/item/clothing/head/helmet/space/syndicate/orange,
+ DYE_BLUE = /obj/item/clothing/head/helmet/space/syndicate/blue,
+ DYE_YELLOW = /obj/item/clothing/head/helmet/space/syndicate/black/engie,
+ DYE_BLACK = /obj/item/clothing/head/helmet/space/syndicate/black,
+ DYE_CMO = /obj/item/clothing/head/helmet/space/syndicate/black/med,
+ DYE_CE = /obj/item/clothing/head/helmet/space/syndicate/black/engie,
+ DYE_NTREP = /obj/item/clothing/head/helmet/space/syndicate/blue,
+ ),
+))
diff --git a/code/controllers/subsystem/SSjobs.dm b/code/controllers/subsystem/SSjobs.dm
index 500440bb6429..ddaa5fa635e7 100644
--- a/code/controllers/subsystem/SSjobs.dm
+++ b/code/controllers/subsystem/SSjobs.dm
@@ -520,6 +520,8 @@ SUBSYSTEM_DEF(jobs)
continue
if(locate(/mob/living) in sloc.loc)
continue
+ if(drunken_spawning && sloc.name == "AI")
+ continue
S = sloc
break
if(!S)
diff --git a/code/controllers/subsystem/SSticker.dm b/code/controllers/subsystem/SSticker.dm
index b23f2470e7ec..bb8f61f59066 100644
--- a/code/controllers/subsystem/SSticker.dm
+++ b/code/controllers/subsystem/SSticker.dm
@@ -547,6 +547,7 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/proc/declare_completion()
GLOB.nologevent = TRUE //end of round murder and shenanigans are legal; there's no need to jam up attack logs past this point.
+ GLOB.disable_explosions = TRUE // that said, if people want to be """FUNNY""" and bomb at EORG, they can fuck themselves up
set_observer_default_invisibility(0) //spooks things up
//Round statistics report
var/datum/station_state/ending_station_state = new /datum/station_state()
diff --git a/code/datums/beam.dm b/code/datums/beam.dm
index f67b5f2ed4c9..f35cc240ac8a 100644
--- a/code/datums/beam.dm
+++ b/code/datums/beam.dm
@@ -133,7 +133,7 @@
/obj/effect/ebeam/deadly/Crossed(atom/A, oldloc)
..()
- A.ex_act(1)
+ A.ex_act(EXPLODE_DEVASTATE)
/obj/effect/ebeam/vetus/Destroy()
for(var/mob/living/M in get_turf(src))
diff --git a/code/datums/components/parry.dm b/code/datums/components/parry.dm
index 285353bd8418..b2e55c3b0206 100644
--- a/code/datums/components/parry.dm
+++ b/code/datums/components/parry.dm
@@ -79,6 +79,8 @@
/datum/component/parry/proc/start_parry(mob/living/L)
SIGNAL_HANDLER
var/time_since_parry = world.time - time_parried
+ if(L.stat != CONSCIOUS)
+ return
if(requires_two_hands && !HAS_TRAIT(parent, TRAIT_WIELDED)) // If our item has special conditions before being able to parry.
return
if(requires_activation && !HAS_TRAIT(parent, TRAIT_ITEM_ACTIVE)) // If our item requires an activation to be able to parry. [E-sword / Teleshield, etc.]
diff --git a/code/game/area/areas/ruins/blackmarketpackers.dm b/code/game/area/areas/ruins/blackmarketpackers.dm
index a2e3c8f53cae..aea5fb124144 100644
--- a/code/game/area/areas/ruins/blackmarketpackers.dm
+++ b/code/game/area/areas/ruins/blackmarketpackers.dm
@@ -7,17 +7,17 @@
requires_power = TRUE
/area/ruin/unpowered/BMPship/Aft
- name = "\improper Aft Block"
+ name = "\improper BMP Aft Block"
icon_state = "away1"
/area/ruin/unpowered/BMPship/Midship
- name = "\improper Midship Block"
+ name = "\improper BMP Midship Block"
icon_state = "away2"
/area/ruin/unpowered/BMPship/Fore
- name = "\improper Fore Block"
+ name = "\improper BMP Fore Block"
icon_state = "away3"
/area/ruin/unpowered/BMPship/Delta
- name = "\improper Delta Block"
+ name = "\improper BMP Delta Block"
icon_state = "away4"
diff --git a/code/game/area/areas/ruins/space_areas.dm b/code/game/area/areas/ruins/space_areas.dm
index 24c227220404..2681a49c1c6a 100644
--- a/code/game/area/areas/ruins/space_areas.dm
+++ b/code/game/area/areas/ruins/space_areas.dm
@@ -28,19 +28,19 @@
// Ruins of "onehalf" ship
/area/ruin/space/onehalf/hallway
- name = "Hallway"
+ name = "DK Excavator 453 Hallway"
icon_state = "hallC"
/area/ruin/space/onehalf/drone_bay
- name = "Mining Drone Bay"
+ name = "DK Excavator 453 Mining Drone Bay"
icon_state = "engine"
/area/ruin/space/onehalf/dorms_med
- name = "Crew Quarters"
+ name = "DK Excavator 453 Crew Quarters"
icon_state = "Sleep"
/area/ruin/space/onehalf/abandonedbridge
- name = "Abandoned Bridge"
+ name = "DK Excavator 453 Abandoned Bridge"
icon_state = "bridge"
//DJSTATION
@@ -108,11 +108,11 @@
/area/ruin/space/derelict/solar_control
name = "\improper Derelict Solar Control"
- icon_state = "GENsolar"
+ icon_state = "general_solar_control"
/area/ruin/space/derelict/se_solar
- name = "South East Solars"
- icon_state = "GENsolar"
+ name = "\improper Derelict South East Solars"
+ icon_state = "general_solars"
/area/ruin/space/derelict/crew_quarters
name = "\improper Derelict Crew Quarters"
@@ -187,32 +187,32 @@
requires_power = TRUE
/area/ruin/space/powered/casino/docked_ships
- name = "Shuttle"
+ name = "Dorian Casino Shuttle"
requires_power = FALSE
/area/ruin/space/powered/casino/arrivals
- name = "Arrivals"
+ name = "Dorian Casino Arrivals"
/area/ruin/space/powered/casino/kitchen
- name = "Dining and Kitchen"
+ name = "Dorian Casino Dining and Kitchen"
/area/ruin/space/powered/casino/floor
- name = "Casino Floor"
+ name = "Dorian Casino Casino Floor"
/area/ruin/space/powered/casino/hall
- name = "Main Hall"
+ name = "Dorian Casino Main Hall"
/area/ruin/space/powered/casino/engine
- name = "Engine Room"
+ name = "Dorian Casino Engine Room"
/area/ruin/space/powered/casino/security
- name = "Security"
+ name = "Dorian Casino Security"
/area/ruin/space/powered/casino/teleporter
- name = "Teleporter"
+ name = "Dorian Casino Teleporter"
/area/ruin/space/powered/casino/maints
- name = "Service Tunnels"
+ name = "Dorian Casino Service Tunnels"
/// telecomms: Alternative telecomms sat
/area/ruin/space/telecomms
@@ -248,3 +248,6 @@
/area/ruin/space/sec_shuttle
name = "Abandoned Security Shuttle"
apc_starts_off = TRUE
+
+/area/ruin/space/syndicakefactory
+ name = "Syndicake factory"
diff --git a/code/game/area/ss13_areas/engineering_areas.dm b/code/game/area/ss13_areas/engineering_areas.dm
index d42c827b215b..71c05c7f5d0b 100644
--- a/code/game/area/ss13_areas/engineering_areas.dm
+++ b/code/game/area/ss13_areas/engineering_areas.dm
@@ -61,7 +61,7 @@
icon_state = "gravgen"
/area/station/engineering/ai_transit_tube
- name = "\improper Ai Minisat Tranit Tube"
+ name = "\improper AI Minisat Tranit Tube"
icon_state = "ai"
sound_environment = SOUND_AREA_SMALL_ENCLOSED
@@ -78,31 +78,47 @@
//Solars
/area/station/engineering/solar
+ name = "\improper Solar Array"
+ icon_state = "general_solars"
requires_power = FALSE
valid_territory = FALSE
dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT
ambientsounds = ENGINEERING_SOUNDS
sound_environment = SOUND_AREA_SPACE
-/area/station/engineering/solar/auxport
- name = "\improper Fore Port Solar Array"
- icon_state = "FPsolars"
+/area/station/engineering/solar/fore
+ name = "\improper Fore Solar Array"
+ icon_state = "fore_solars"
-/area/station/engineering/solar/auxstarboard
- name = "\improper Fore Starboard Solar Array"
- icon_state = "FSsolars"
+/area/station/engineering/solar/fore_starboard
+ name = "\improper Fore-Starboard Solar Array"
+ icon_state = "fore_starboard_solars"
+
+/area/station/engineering/solar/fore_port
+ name = "\improper Fore-Port Solar Array"
+ icon_state = "fore_port_solars"
+
+/area/station/engineering/solar/aft
+ name = "\improper Aft Solar Array"
+ icon_state = "aft_solars"
+
+/area/station/engineering/solar/aft_starboard
+ name = "\improper Aft-Starboard Solar Array"
+ icon_state = "aft_starboard_solars"
+
+/area/station/engineering/solar/aft_port
+ name = "\improper Aft-Port Solar Array"
+ icon_state = "aft_port_solars"
/area/station/engineering/solar/starboard
name = "\improper Starboard Solar Array"
- icon_state = "Ssolars"
-
-/area/station/engineering/solar/starboard/aft
- name = "\improper Aft Starboard Solar Array"
- icon_state = "ASsolars"
+ icon_state = "starboard_solars"
/area/station/engineering/solar/port
- name = "\improper Aft Port Solar Array"
- icon_state = "APsolars"
+ name = "\improper Port Solar Array"
+ icon_state = "port_solars"
+
+// Other
/area/station/engineering/secure_storage
name = "Engineering Secure Storage"
diff --git a/code/game/area/ss13_areas/maintenance_areas.dm b/code/game/area/ss13_areas/maintenance_areas.dm
index c2e3256b3a03..e6585764e4d9 100644
--- a/code/game/area/ss13_areas/maintenance_areas.dm
+++ b/code/game/area/ss13_areas/maintenance_areas.dm
@@ -129,25 +129,43 @@
name = "Gambling Den"
icon_state = "yellow"
-/area/station/maintenance/auxsolarport
- name = "\improper Fore Port Solar Maintenance"
- icon_state = "FPctrl"
+// Solars
-/area/station/maintenance/starboardsolar
- name = "\improper Starboard Solar Maintenance"
- icon_state = "ASctrl"
+/area/station/maintenance/solar_maintenance
+ name = "\improper Solar Maintenance"
+ icon_state = "general_solar_control"
+
+/area/station/maintenance/solar_maintenance/fore
+ name = "\improper Fore Solar Maintenance"
+ icon_state = "fore_solar_control"
+
+/area/station/maintenance/solar_maintenance/fore_starboard
+ name = "\improper Fore-Starboard Solar Maintenance"
+ icon_state = "fore_starboard_solar_control"
+
+/area/station/maintenance/solar_maintenance/fore_port
+ name = "\improper Fore-Port Solar Maintenance"
+ icon_state = "fore_port_solar_control"
-/area/station/maintenance/starboardsolar/aft
- name = "\improper Aft Starboard Solar Maintenance"
- icon_state = "ASctrl"
+/area/station/maintenance/solar_maintenance/aft
+ name = "\improper Aft Solar Maintenance"
+ icon_state = "aft_solar_control"
-/area/station/maintenance/portsolar
- name = "\improper Aft Port Solar Maintenance"
- icon_state = "APctrl"
+/area/station/maintenance/solar_maintenance/aft_starboard
+ name = "\improper Aft-Starboard Solar Maintenance"
+ icon_state = "aft_starboard_solar_control"
+
+/area/station/maintenance/solar_maintenance/aft_port
+ name = "\improper Aft-Port Solar Maintenance"
+ icon_state = "aft_port_solar_control"
+
+/area/station/maintenance/solar_maintenance/starboard
+ name = "\improper Starboard Solar Maintenance"
+ icon_state = "starboard_solar_control"
-/area/station/maintenance/auxsolarstarboard
- name = "\improper Fore Starboard Solar Maintenance"
- icon_state = "FSctrl"
+/area/station/maintenance/solar_maintenance/port
+ name = "\improper Port Solar Maintenance"
+ icon_state = "port_solar_control"
/// Derelict Assembly Line
/area/station/maintenance/assembly_line
diff --git a/code/game/gamemodes/cult/blood_magic.dm b/code/game/gamemodes/cult/blood_magic.dm
index 543218ac6296..ce0699b4a03f 100644
--- a/code/game/gamemodes/cult/blood_magic.dm
+++ b/code/game/gamemodes/cult/blood_magic.dm
@@ -188,7 +188,7 @@
return
owner.visible_message("[owner]'s body flashes a bright blue!", \
"You speak the cursed words, channeling an electromagnetic pulse from your body.")
- owner.emp_act(2)
+ owner.emp_act(EMP_LIGHT)
INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(empulse), owner, 2, 5, TRUE, "cult")
owner.whisper(invocation)
charges--
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
index 1d7302d6a391..2d13e0c5c49e 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
@@ -223,7 +223,7 @@ CONTENTS:
if(isradio(I))
var/obj/item/radio/R = I
R.listening = FALSE // Prevents the radio from buzzing due to the EMP, preserving possible stealthiness.
- R.emp_act(1)
+ R.emp_act(EMP_HEAVY)
/obj/item/gun/energy/alien
name = "alien pistol"
diff --git a/code/game/gamemodes/miniantags/guardian/host_actions.dm b/code/game/gamemodes/miniantags/guardian/host_actions.dm
index c7e795030fac..f2c736edbf50 100644
--- a/code/game/gamemodes/miniantags/guardian/host_actions.dm
+++ b/code/game/gamemodes/miniantags/guardian/host_actions.dm
@@ -5,7 +5,7 @@
*/
/datum/action/guardian
name = "Generic guardian host action"
- button_background_icon = 'icons/mob/guardian.dmi'
+ button_overlay_icon = 'icons/mob/guardian.dmi'
button_overlay_icon_state = "base"
var/mob/living/simple_animal/hostile/guardian/guardian
diff --git a/code/game/gamemodes/miniantags/guardian/types/explosive_guardian.dm b/code/game/gamemodes/miniantags/guardian/types/explosive_guardian.dm
index 52538dcbab3c..cd90466c93f1 100644
--- a/code/game/gamemodes/miniantags/guardian/types/explosive_guardian.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/explosive_guardian.dm
@@ -86,7 +86,7 @@
to_chat(spawner, "Success! Your trap on [src] caught [user]!")
stored_obj.forceMove(get_turf(loc))
playsound(get_turf(src),'sound/effects/explosion2.ogg', 200, 1)
- user.ex_act(2)
+ user.ex_act(EXPLODE_HEAVY)
user.Stun(3 SECONDS)//A bomb went off in your hands. Actually lets people follow up with it if they bait someone, right now it is unreliable.
qdel(src)
diff --git a/code/game/gamemodes/miniantags/guardian/types/protector.dm b/code/game/gamemodes/miniantags/guardian/types/protector.dm
index 81507dec87f1..2be939f8cff5 100644
--- a/code/game/gamemodes/miniantags/guardian/types/protector.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/protector.dm
@@ -15,7 +15,7 @@
var/list/connected_shields = list()
/mob/living/simple_animal/hostile/guardian/protector/ex_act(severity)
- if(severity == 1)
+ if(severity == EXPLODE_DEVASTATE)
adjustBruteLoss(200) //if in protector mode, will do 20 damage and not actually necessarily kill the summoner
else
..()
diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
index bdd4a5768105..4e0dad4425f4 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
@@ -441,7 +441,7 @@
to_chat(src, "You feel [pick("your sense of direction flicker out", "a stabbing pain in your head", "your mind fill with static")].")
new /obj/effect/temp_visual/revenant(loc)
if(cause_emp)
- emp_act(1)
+ emp_act(EMP_HEAVY)
/mob/living/simple_animal/bot/rev_malfunction(cause_emp = TRUE)
if(!emagged)
@@ -456,7 +456,7 @@
new /obj/effect/temp_visual/revenant(loc)
emag_act(usr)
else if(cause_emp)
- emp_act(1)
+ emp_act(EMP_HEAVY)
/obj/machinery/clonepod/rev_malfunction(cause_emp = TRUE)
..(cause_emp = FALSE)
@@ -472,7 +472,7 @@
new /obj/effect/temp_visual/revenant(loc)
spark_system.start()
if(cause_emp)
- emp_act(1)
+ emp_act(EMP_HEAVY)
/turf/defile()
if(flags & BLESSED_TILE)
diff --git a/code/game/gamemodes/wizard/magic_tarot.dm b/code/game/gamemodes/wizard/magic_tarot.dm
index 6c206797abc2..1d75095916ca 100644
--- a/code/game/gamemodes/wizard/magic_tarot.dm
+++ b/code/game/gamemodes/wizard/magic_tarot.dm
@@ -176,6 +176,11 @@
. += "[card_desc]"
. += "Alt-Shift-Click to flip the card over."
+/obj/item/magic_tarot_card/examine_more(mob/user)
+ . = ..()
+ if(!face_down)
+ . += "[src] [our_tarot.extended_desc]"
+
/obj/item/magic_tarot_card/attack_self(mob/user)
poof()
if(has_been_activated)
@@ -257,6 +262,8 @@
var/name = "XXII - The Unknown."
/// Desc used for the card description of the card
var/desc = "Untold answers... wait what? This is a bug, report this as an issue on github!"
+ /// Extended desc for the cards. For what they do
+ var/extended_desc = "asks you to report this as a bug on GitHub!"
/// What icon is used for the card?
var/card_icon = "the_unknown"
/// Are we reversed? Used for the card back.
@@ -274,6 +281,7 @@
/datum/tarot/the_fool
name = "0 - The Fool"
desc = "Where journey begins."
+ extended_desc = "returns the affected user to the arrival point of this forsaken journey."
card_icon = "the_fool"
/datum/tarot/the_fool/activate(mob/living/target)
@@ -283,6 +291,7 @@
/datum/tarot/the_magician
name = "I - The Magician"
desc = "May you never miss your goal."
+ extended_desc = "makes the user feel extraordinarily badass for a couple of minutes."
card_icon = "the_magician"
/datum/tarot/the_magician/activate(mob/living/target)
@@ -292,6 +301,7 @@
/datum/tarot/the_high_priestess
name = "II - The High Priestess"
desc = "Mother is watching you."
+ extended_desc = "alerts bubblegum to the user, who will strike them down. The user will receive heavy damage and will be immobilized."
card_icon = "the_high_priestess"
/datum/tarot/the_high_priestess/activate(mob/living/target)
@@ -327,6 +337,7 @@
/datum/tarot/the_empress
name = "III - The Empress"
desc = "May your rage bring power."
+ extended_desc = "gives the user a temporary boost of speed. This includes attack speed."
card_icon = "the_empress"
/datum/tarot/the_empress/activate(mob/living/target)
@@ -338,6 +349,7 @@
/datum/tarot/the_emperor
name = "IV - The Emperor"
desc = "Challenge me!"
+ extended_desc = "warps the user to where command commonly resides. Be ready for a fight."
card_icon = "the_emperor"
/datum/tarot/the_emperor/activate(mob/living/target)
@@ -357,6 +369,7 @@
/datum/tarot/the_hierophant
name = "V - The Hierophant"
desc = "Two prayers for the lost."
+ extended_desc = "enchants the user's suit with magic that's strong enough to negate three attacks."
card_icon = "the_hierophant"
/datum/tarot/the_hierophant/activate(mob/living/target)
@@ -371,6 +384,7 @@
/datum/tarot/the_lovers
name = "VI - The Lovers"
desc = "May you prosper and be in good health."
+ extended_desc = "will restore the overall health of the user."
card_icon = "the_lovers"
/datum/tarot/the_lovers/activate(mob/living/target)
@@ -388,6 +402,7 @@
/datum/tarot/the_chariot
name = "VII - The Chariot"
desc = "May nothing stand before you."
+ extended_desc = "imbues the user with immense power and speed, rendering them practically immortal for 10 seconds, at the cost of being unable to harm another living thing."
card_icon = "the_chariot"
/datum/tarot/the_chariot/activate(mob/living/target)
@@ -397,6 +412,7 @@
/datum/tarot/justice
name = "VIII - Justice"
desc = "May your future become balanced."
+ extended_desc = "grants the user a medical first aid kit, a magical key that can open a single door, and 100 credits."
card_icon = "justice"
/datum/tarot/justice/activate(mob/living/target)
@@ -409,6 +425,7 @@
/datum/tarot/the_hermit
name = "IX - The Hermit"
desc = "May you see what life has to offer."
+ extended_desc = "teleports the user to a random vending machine within the station."
card_icon = "the_hermit"
/datum/tarot/the_hermit/activate(mob/living/target)
@@ -428,6 +445,7 @@
/datum/tarot/wheel_of_fortune
name = "X - Wheel of Fortune"
desc = "Spin the wheel of destiny."
+ extended_desc = "summons a random vending machine."
card_icon = "wheel_of_fortune"
/datum/tarot/wheel_of_fortune/activate(mob/living/target)
@@ -441,6 +459,7 @@
/datum/tarot/strength
name = "XI - Strength"
desc = "May your power bring rage."
+ extended_desc = "grants the user strength beyond belief, but renders them unable to handle ranged weapons."
card_icon = "strength"
/datum/tarot/strength/activate(mob/living/target)
@@ -450,6 +469,7 @@
/datum/tarot/the_hanged_man
name = "XII - The Hanged Man"
desc = "May you find enlightenment."
+ extended_desc = "allows the user to fly for a minute."
card_icon = "the_hanged_man"
/datum/tarot/the_hanged_man/activate(mob/living/target)
@@ -461,6 +481,7 @@
/datum/tarot/death
name = "XIII - Death"
desc = "Lay waste to all that oppose you."
+ extended_desc = "deals damage to all those the user can see. Aside from themselves, of course."
card_icon = "death"
/datum/tarot/death/activate(mob/living/target)
@@ -471,6 +492,7 @@
/datum/tarot/temperance
name = "XIV - Temperance"
desc = "May you be pure in heart."
+ extended_desc = "cures all ailments the user has. Also reinvigorates their organs."
card_icon = "temperance"
/datum/tarot/temperance/activate(mob/living/target)
@@ -495,6 +517,7 @@
/datum/tarot/the_devil
name = "XV - The Devil"
desc = "Revel in the power of darkness."
+ extended_desc = "steals the life-force of everyone around the user."
card_icon = "the_devil"
/datum/tarot/the_devil/activate(mob/living/target)
@@ -503,6 +526,7 @@
/datum/tarot/the_tower
name = "XVI - The Tower"
desc = "Destruction brings creation."
+ extended_desc = "summons a self-replicating bomb."
card_icon = "the_tower"
/datum/tarot/the_tower/activate(mob/living/target)
@@ -513,6 +537,7 @@
/datum/tarot/the_stars
name = "XVII - The Stars"
desc = "May you find what you desire."
+ extended_desc = "teleports the user to the station's evidence room, and opens a single locker within."
card_icon = "the_stars"
/datum/tarot/the_stars/activate(mob/living/target)
@@ -538,6 +563,7 @@
/datum/tarot/the_moon
name = "XVIII - The Moon"
desc = "May you find all you have lost."
+ extended_desc = "teleports the user to a random place of interest, starting with the sector the user is in first."
card_icon = "the_moon"
/datum/tarot/the_moon/activate(mob/living/target)
@@ -576,6 +602,7 @@
/datum/tarot/the_sun
name = "XIX - The Sun"
desc = "May the light heal and enlighten you."
+ extended_desc = "fully rejuvenates the user back to their peak strength."
card_icon = "the_sun"
/datum/tarot/the_sun/activate(mob/living/target)
@@ -584,6 +611,7 @@
/datum/tarot/judgement
name = "XX - Judgement"
desc = "Judge lest ye be judged."
+ extended_desc = "alerts the denizens of the afterlife to the user's existence. Prepare to be judged."
card_icon = "judgement"
/datum/tarot/judgement/activate(mob/living/target)
@@ -592,6 +620,7 @@
/datum/tarot/the_world
name = "XXI - The World"
desc = "Open your eyes and see."
+ extended_desc = "bellows out smoke and grants the user full x-ray vision for two minutes."
card_icon = "the_world"
/datum/tarot/the_world/activate(mob/living/target)
@@ -607,6 +636,7 @@
/datum/tarot/reversed/the_fool
name = "0 - The Fool?"
desc = "Let go and move on."
+ extended_desc = "removes all items from the user, leaving them completely naked."
card_icon = "the_fool?"
/datum/tarot/reversed/the_fool/activate(mob/living/target)
@@ -621,6 +651,7 @@
/datum/tarot/reversed/the_magician
name = "I - The Magician?"
desc = "May no harm come to you."
+ extended_desc = "will repulse everything away from the user."
card_icon = "the_magician?"
/datum/tarot/reversed/the_magician/activate(mob/living/target)
@@ -654,6 +685,7 @@
/datum/tarot/reversed/the_high_priestess
name = "II - The High Priestess?"
desc = "Run."
+ extended_desc = "summons Bubblegum to tear portals open around the user that will grab and damage everyone nearby."
card_icon = "the_high_priestess?"
/datum/tarot/reversed/the_high_priestess/activate(mob/living/target)
@@ -663,6 +695,7 @@
/datum/tarot/reversed/the_empress
name = "III - The Empress?"
desc = "May your love bring protection."
+ extended_desc = "pacifies everyone in range, except for the user, for 40 seconds."
card_icon = "the_empress?"
/datum/tarot/reversed/the_empress/activate(mob/living/target)
@@ -672,6 +705,7 @@
/datum/tarot/reversed/the_emperor
name = "IV - The Emperor?"
desc = "May you find a worthy opponent."
+ extended_desc = "teleports the user to a random head of staff."
card_icon = "the_emperor?"
/datum/tarot/reversed/the_emperor/activate(mob/living/target)
@@ -691,6 +725,7 @@
/datum/tarot/reversed/the_hierophant
name = "V - The Hierophant?"
desc = "Two prayers for the forgotten."
+ extended_desc = "makes the Hierophant attack two random mobs in range."
card_icon = "the_hierophant?"
/datum/tarot/reversed/the_hierophant/activate(mob/living/target)
@@ -709,6 +744,7 @@
/datum/tarot/reversed/the_lovers
name = "VI - The Lovers?"
desc = "May your heart shatter to pieces."
+ extended_desc = "causes the user of this card to experience true heartbreak - leaving their chest broken and battered."
card_icon = "the_lovers?"
/datum/tarot/reversed/the_lovers/activate(mob/living/target)
@@ -726,6 +762,7 @@
/datum/tarot/reversed/the_chariot
name = "VII - The Chariot?"
desc = "May nothing walk past you."
+ extended_desc = "will petrify the user for two minutes, rendering them completely indestructible."
card_icon = "the_chariot?"
/datum/tarot/reversed/the_chariot/activate(mob/living/target)
@@ -735,6 +772,7 @@
/datum/tarot/reversed/justice
name = "VIII - Justice?"
desc = "May your sins come back to torment you."
+ extended_desc = "creates a random orderable crate. This can include crates Supply would otherwise not have access to at the time."
card_icon = "justice?"
/datum/tarot/reversed/justice/activate(mob/living/target)
@@ -752,6 +790,7 @@
/datum/tarot/reversed/the_hermit
name = "IX - The Hermit?"
desc = "May you see the value of all things in life."
+ extended_desc = "will sell all loose guns, grenades, batons, and armor around the user, transforming them directly into cash."
card_icon = "the_hermit?"
/datum/tarot/reversed/the_hermit/activate(mob/living/target) //Someone can improve this in the future (hopefully comment will not be here in 10 years.)
@@ -773,6 +812,7 @@
/datum/tarot/reversed/wheel_of_fortune
name = "X - Wheel of Fortune?"
desc = "Throw the dice of fate."
+ extended_desc = "forces the user to roll for a powerful magical artifact. The outcome can be highly positive or highly negative; it is up to fate."
card_icon = "wheel_of_fortune?"
/datum/tarot/reversed/wheel_of_fortune/activate(mob/living/target)
@@ -782,6 +822,7 @@
/datum/tarot/reversed/strength
name = "XI - Strength?"
desc = "May you break their resolve."
+ extended_desc = "breaks the minds of those around the user, dealing heavy brain damage, and causing two minutes of hallucinations."
card_icon = "strength?"
/datum/tarot/reversed/strength/activate(mob/living/target)
@@ -793,6 +834,7 @@
/datum/tarot/reversed/the_hanged_man
name = "XII - The Hanged Man?"
desc = "May your greed know no bounds."
+ extended_desc = "forces the user to spin a cursed slot machine."
card_icon = "the_hanged_man?"
/datum/tarot/reversed/the_hanged_man/activate(mob/living/target)
@@ -804,6 +846,7 @@
/datum/tarot/reversed/death
name = "XIII - Death?"
desc = "May life spring forth from the fallen."
+ extended_desc = "grants the user a soulstone and a construct to freely use on the dead."
card_icon = "death?"
/datum/tarot/reversed/death/activate(mob/living/target)
@@ -813,6 +856,7 @@
/datum/tarot/reversed/temperance
name = "XIV - Temperance?"
desc = "May your hunger be satiated."
+ extended_desc = "forces the user to eat five pills containing random reagents."
card_icon = "temperance?"
/datum/tarot/reversed/temperance/activate(mob/living/target)
@@ -829,6 +873,7 @@
/datum/tarot/reversed/the_devil
name = "XV - The Devil?"
desc = "Bask in the light of your mercy."
+ extended_desc = "summons a primed cluster flashbang at the user's feet."
card_icon = "the_devil?"
/datum/tarot/reversed/the_devil/activate(mob/living/target)
@@ -838,6 +883,7 @@
/datum/tarot/reversed/the_tower
name = "XVI - The Tower?"
desc = "Creation brings destruction."
+ extended_desc = "will create large stone walls that erupt from the ground around the user."
card_icon = "the_tower?"
/datum/tarot/reversed/the_tower/activate(mob/living/target)
@@ -853,6 +899,7 @@
/datum/tarot/reversed/the_stars
name = "XVII - The Stars?"
desc = "May your loss bring fortune."
+ extended_desc = "will cause a large amount of genetic decomposition to the user, as well as hurting a limb. However, it will reward the user with two additional cards."
card_icon = "the_stars?"
/datum/tarot/reversed/the_stars/activate(mob/living/target) //Heavy clone damage hit, but gain 2 cards. Not teathered to the card producer. Could lead to card stacking, but would require the sun to fix easily
@@ -880,6 +927,7 @@
/datum/tarot/reversed/the_moon
name = "XVIII - The Moon?"
desc = "May you remember lost memories."
+ extended_desc = "will reveal the memories of everyone in range to the user."
card_icon = "the_moon?"
/datum/tarot/reversed/the_moon/activate(mob/living/target)
@@ -889,6 +937,7 @@
/datum/tarot/reversed/the_sun
name = "XIX - The Sun?"
desc = "May the darkness swallow all around you."
+ extended_desc = "makes the user emit darkness, freezing anyone nearby. They will also become nearsighted for the duration, however."
card_icon = "the_sun?"
/datum/tarot/reversed/the_sun/activate(mob/living/target)
@@ -897,6 +946,7 @@
/datum/tarot/reversed/judgement
name = "XX - Judgement?"
desc = "May you redeem those found wanting" //Who wants more, but ghosts for something interesting
+ extended_desc = "nudges the future events of this shift to be more... interesting."
card_icon = "judgement?"
/datum/tarot/reversed/judgement/activate(mob/living/target)
@@ -908,6 +958,7 @@
/datum/tarot/reversed/the_world
name = "XXI - The World?"
desc = "Step into the abyss."
+ extended_desc = "teleports the user to the mining outpost."
card_icon = "the_world?"
/datum/tarot/reversed/the_world/activate(mob/living/target)
diff --git a/code/game/jobs/job/engineering_jobs.dm b/code/game/jobs/job/engineering_jobs.dm
index c10217f21c43..11dcf39776b9 100644
--- a/code/game/jobs/job/engineering_jobs.dm
+++ b/code/game/jobs/job/engineering_jobs.dm
@@ -27,7 +27,7 @@
uniform = /obj/item/clothing/under/rank/engineering/chief_engineer
belt = /obj/item/storage/belt/utility/chief/full
- gloves = /obj/item/clothing/gloves/color/black/ce
+ gloves = /obj/item/clothing/gloves/color/black
shoes = /obj/item/clothing/shoes/brown
head = /obj/item/clothing/head/hardhat/white
l_ear = /obj/item/radio/headset/heads/ce
diff --git a/code/game/jobs/job/security_jobs.dm b/code/game/jobs/job/security_jobs.dm
index 24fc08d0b94a..3d67a3622688 100644
--- a/code/game/jobs/job/security_jobs.dm
+++ b/code/game/jobs/job/security_jobs.dm
@@ -50,7 +50,7 @@
uniform = /obj/item/clothing/under/rank/security/head_of_security
suit = /obj/item/clothing/suit/armor/hos
- gloves = /obj/item/clothing/gloves/color/black/hos
+ gloves = /obj/item/clothing/gloves/color/black
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/HoS
l_ear = /obj/item/radio/headset/heads/hos/alt
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index ba8c47942fef..2c22054d06d9 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -75,7 +75,7 @@
for(var/turf/T in linkedholodeck)
if(prob(30))
do_sparks(2, 1, T)
- T.ex_act(3)
+ T.ex_act(EXPLODE_LIGHT)
T.hotspot_expose(1000,500,1)
/obj/machinery/computer/HolodeckControl/proc/loadProgram(area/A)
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 1a9b2a908715..481b309979ca 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -39,9 +39,9 @@
return
var/num_of_prizes = 0
switch(severity)
- if(1)
+ if(EMP_HEAVY)
num_of_prizes = rand(1,4)
- if(2)
+ if(EMP_LIGHT)
num_of_prizes = rand(0,2)
for(var/i = num_of_prizes; i > 0; i--)
prizevend()
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index 5bfa0113ad48..374f3e9cefb6 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -116,10 +116,10 @@
/obj/machinery/computer/emp_act(severity)
..()
switch(severity)
- if(1)
+ if(EMP_HEAVY)
if(prob(50))
obj_break(ENERGY)
- if(2)
+ if(EMP_LIGHT)
if(prob(10))
obj_break(ENERGY)
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 406bb468e1d6..1a4a3ca793b8 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -549,6 +549,13 @@ to destroy them and players will be able to make replacements.
/obj/item/stock_parts/matter_bin = 1,
/obj/item/stock_parts/manipulator = 1)
+/obj/item/circuitboard/washing_machine
+ board_name = "Washing Machine"
+ icon_state = "generic"
+ build_path = /obj/machinery/washing_machine
+ board_type = "machine"
+ origin_tech = "programming=1"
+
/obj/item/circuitboard/smartfridge
board_name = "Smartfridge"
build_path = /obj/machinery/smartfridge
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index 72cf7fbdbe92..a620857c3683 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -397,7 +397,7 @@
qdel(src)
/obj/structure/dropwall_generator/ex_act(severity)
- if(protected && severity > 1) //We would throw the explosion at the shield, but it is already getting hit
+ if(protected && severity > EXPLODE_DEVASTATE) //We would throw the explosion at the shield, but it is already getting hit
return
qdel(src)
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index d41d4495f024..6ebb3b387c45 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -543,7 +543,7 @@
throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(L, src)))
SEND_SOUND(L, pick(sound('sound/hallucinations/turn_around1.ogg', 0, 1, 50), sound('sound/hallucinations/turn_around2.ogg', 0, 1, 50)))
L.KnockDown(4 SECONDS)
- L.throw_at(throwtarget, 5, 1,src)
+ L.throw_at(throwtarget, 5, 1)
return FALSE
/obj/machinery/door/airlock/cult/screwdriver_act(mob/user, obj/item/I)
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index 6b0d2fb5ec32..3b0fbd5dbb5e 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -50,7 +50,7 @@
//"BLAST" doors are obviously stronger than regular doors when it comes to BLASTS.
/obj/machinery/door/poddoor/ex_act(severity)
- if(severity == 3)
+ if(severity == EXPLODE_LIGHT)
return
..()
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 41b5a28b42a3..18cc38eac8b7 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -195,21 +195,26 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
switch(action)
if("writeInput")
- if(reject_bad_text(params["write"]))
- recipient = params["write"] //write contains the string of the receiving department's name
- var/new_message = tgui_input_text(usr, "Write your message:", "Awaiting Input", encode = FALSE)
- if(isnull(new_message))
- reset_message(FALSE)
- return
- message = new_message
- screen = RCS_MESSAUTH
- switch(params["priority"])
- if("1")
- priority = RQ_NORMALPRIORITY
- if("2")
- priority = RQ_HIGHPRIORITY
- else
- priority = RQ_NONEW_MESSAGES
+ if(!reject_bad_text(params["write"]))
+ return
+ recipient = params["write"] //write contains the string of the receiving department's name
+ var/new_message = tgui_input_text(usr, "Write your message:", "Awaiting Input", encode = FALSE)
+ if(isnull(new_message))
+ reset_message(FALSE)
+ return
+ message = new_message
+ screen = RCS_MESSAUTH
+ var/new_priority = text2num(params["priority"])
+ switch(new_priority)
+ if(RQ_LOWPRIORITY)
+ priority = RQ_LOWPRIORITY
+ if(RQ_NORMALPRIORITY)
+ priority = RQ_NORMALPRIORITY
+ if(RQ_HIGHPRIORITY)
+ priority = RQ_HIGHPRIORITY
+ else
+ // Forcibly update UI state
+ return TRUE
if("writeAnnouncement")
var/new_message = tgui_input_text(usr, "Write your message:", "Awaiting Input", message, multiline = TRUE, encode = FALSE)
@@ -354,7 +359,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
if(!silent)
playsound(loc, 'sound/machines/twobeep.ogg', 50, TRUE)
atom_say(title)
- if(reminder_timer_id == TIMER_ID_NULL)
+ if(reminder_timer_id == TIMER_ID_NULL && priority > RQ_LOWPRIORITY)
reminder_timer_id = addtimer(CALLBACK(src, PROC_REF(remind_unread_messages)), 5 MINUTES, TIMER_STOPPABLE | TIMER_LOOP)
switch(priority)
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index 6e3243d9c6b6..b30d3fc11493 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -1,11 +1,10 @@
-#define OPEN_EMPTY 1
-#define CLOSED_EMPTY 2
-#define OPEN_FULL 3
-#define CLOSED_FULL 4
-#define RUNNING 5
-//#define OPEN_BLOODY 6 is tied to an unused icon state
-#define CLOSED_BLOODY 7
-#define RUNNING_BLOODY 8
+#define DEFAULT_TUB_CAPACITY 20
+
+#define WM_STATE_EMPTY 1
+#define WM_STATE_FULL 2
+#define WM_STATE_RUNNING 3
+#define WM_STATE_BLOODY 4
+#define WM_STATE_RUNNING_BLOODY 5
/obj/machinery/washing_machine
name = "washing machine"
@@ -14,306 +13,383 @@
icon_state = "wm_10"
density = TRUE
anchored = TRUE
- /// Integer ID corresponding to whether the machine can accept more items, is running, will produce gibs, etc.
- var/state = OPEN_EMPTY
- var/panel = FALSE
- var/gibs_ready = FALSE
- var/obj/crayon
- /// Typecache of washable items
- var/list/can_be_washed = list(
- /obj/item/stack/sheet/hairlesshide,
- /obj/item/clothing/under,
- /obj/item/clothing/mask,
- /obj/item/clothing/head,
- /obj/item/clothing/gloves,
- /obj/item/clothing/shoes,
- /obj/item/clothing/suit,
- /obj/item/bedsheet
- )
- /// Typecache of items that do not fit, overrides the whitelist
- var/list/does_not_fit = list(
- /obj/item/clothing/under/plasmaman,
- /obj/item/clothing/suit/space,
- /obj/item/clothing/suit/syndicatefake,
- /obj/item/clothing/suit/cyborg_suit,
- /obj/item/clothing/suit/bomb_suit,
- /obj/item/clothing/suit/armor,
- /obj/item/clothing/mask/gas,
- /obj/item/clothing/mask/cigarette,
- /obj/item/clothing/head/syndicatefake,
- /obj/item/clothing/head/helmet,
- /obj/item/clothing/gloves/furgloves
- )
-
-/obj/machinery/washing_machine/Initialize(mapload)
- . = ..()
- can_be_washed = typecacheof(can_be_washed)
- does_not_fit = typecacheof(does_not_fit)
+ var/washing_state = WM_STATE_EMPTY
+
+ /// LAZYLIST of insert obj/item's inside the washer tub
+ var/list/inserted_items
+ /// LAZYLIST of inserted mob/living's inside the washer tube
+ var/list/inserted_mobs
+
+ /// Is the washer in the middle of a wash cycle? Used to regulate certain interactions with the washer
+ var/washing = FALSE
+ /// Is the washer currently open?
+ var/door_open = FALSE
+ /// How much shit is currently in this laundry machine? Used to cap how much stuff you can put in here
+ var/current_tub_capacity = 0
+ /// The cap for how much stuff you can shove in here
+ var/max_tub_capacity = DEFAULT_TUB_CAPACITY
+ /// Is the washing machine tub filled with gibs/blood? Effects the sprite it uses
+ var/bloody_mess = FALSE
+ /// Where is our DYE color coming from?
+ var/obj/item/color_source
+ /// What DYE color are we dyeing stuff?
+ var/wash_color
+
+/obj/machinery/washing_machine/Destroy()
+ eject_tub_contents() // cleans up refs & signals
+ return ..()
+
+/obj/machinery/washing_machine/update_icon_state()
+ icon_state = "wm_[washing_state][door_open ? 1 : 0][panel_open ? "_panel" : ""]"
+
+/// Determines which "WM state" to apply based on if the machine is a bloody mess, full/empty, washing, etc and then updates the icon state accordingly
+/obj/machinery/washing_machine/proc/update_washing_state()
+ if(bloody_mess)
+ washing_state = washing ? WM_STATE_RUNNING_BLOODY : WM_STATE_BLOODY
+ update_appearance(UPDATE_ICON_STATE)
+ return
+ if(washing)
+ washing_state = WM_STATE_RUNNING
+ update_appearance(UPDATE_ICON_STATE)
+ return
+ washing_state = current_tub_capacity ? WM_STATE_FULL : WM_STATE_EMPTY
+ update_appearance(UPDATE_ICON_STATE)
/obj/machinery/washing_machine/examine(mob/user)
. = ..()
- . += "You can Alt-Click [src] to start its washing cycle."
+ . += "Its door is currently [door_open ? "open" : "closed"]."
+ if(washing)
+ . += "It is currently in its wash cycle."
+ else
+ . += "You can Alt-Click [src] to start its washing cycle."
+ if(bloody_mess)
+ . += "The inside is covered in blood and gibs, you will need to clean it out with soap first."
+ else
+ var/total_contents = LAZYLEN(inserted_items) + LAZYLEN(inserted_mobs)
+ . += "It has [total_contents] item\s inside."
/obj/machinery/washing_machine/AltClick(mob/user)
- if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
+ if(user.stat != CONSCIOUS || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
return
- start(user)
-
-/obj/machinery/washing_machine/proc/start(mob/user)
- if(state != CLOSED_FULL)
- to_chat(user, "The washing machine cannot run in this state.")
+ if(stat & (NOPOWER|BROKEN))
return
+ if(!washing && !door_open)
+ start_wash_cycle()
- if(locate(/mob) in src)
- state = RUNNING_BLOODY
- else
- state = RUNNING
- update_icon(UPDATE_ICON_STATE)
- sleep(200)
- for(var/atom/A in src)
- A.clean_blood()
-
- //Tanning!
- for(var/obj/item/stack/sheet/hairlesshide/HH in src)
- new /obj/item/stack/sheet/wetleather(src, HH.amount)
- qdel(HH)
-
-
- if(crayon)
- var/wash_color
- if(istype(crayon, /obj/item/toy/crayon))
- var/obj/item/toy/crayon/CR = crayon
- wash_color = CR.colourName
- else if(istype(crayon, /obj/item/stamp))
- var/obj/item/stamp/ST = crayon
- wash_color = ST.item_color
-
- if(wash_color)
- var/new_jumpsuit_icon_state
- var/new_jumpsuit_item_state
- var/new_jumpsuit_name
- var/new_glove_icon_state
- var/new_glove_item_state
- var/new_glove_name
- var/new_bandana_icon_state
- var/new_bandana_item_state
- var/new_bandana_name
- var/new_shoe_icon_state
- var/new_shoe_name
- var/new_sheet_icon_state
- var/new_sheet_name
- var/new_sheet_item_state
- var/new_softcap_icon_state
- var/new_softcap_name
- var/new_desc = "The colors are a bit dodgy."
- for(var/T in typesof(/obj/item/clothing/under))
- var/obj/item/clothing/under/J = new T
- if(wash_color == J.item_color)
- new_jumpsuit_icon_state = J.icon_state
- new_jumpsuit_item_state = J.item_state
- new_jumpsuit_name = J.name
- qdel(J)
- break
- qdel(J)
- for(var/T in typesof(/obj/item/clothing/gloves/color))
- var/obj/item/clothing/gloves/color/G = new T
- if(wash_color == G.item_color)
- new_glove_icon_state = G.icon_state
- new_glove_item_state = G.item_state
- new_glove_name = G.name
- qdel(G)
- break
- qdel(G)
- for(var/T in typesof(/obj/item/clothing/shoes))
- var/obj/item/clothing/shoes/S = new T
- if(wash_color == S.item_color)
- new_shoe_icon_state = S.icon_state
- new_shoe_name = S.name
- qdel(S)
- break
- qdel(S)
- for(var/T in typesof(/obj/item/clothing/mask/bandana))
- var/obj/item/clothing/mask/bandana/M = new T
- if(wash_color == M.item_color)
- new_bandana_icon_state = M.icon_state
- new_bandana_item_state = M.item_state
- new_bandana_name = M.name
- qdel(M)
- break
- qdel(M)
- for(var/T in typesof(/obj/item/bedsheet))
- var/obj/item/bedsheet/B = new T
- if(wash_color == B.item_color)
- new_sheet_icon_state = B.icon_state
- new_sheet_name = B.name
- new_sheet_item_state = B.item_state
- qdel(B)
- break
- qdel(B)
- for(var/T in typesof(/obj/item/clothing/head/soft))
- var/obj/item/clothing/head/soft/H = new T
- if(wash_color == H.item_color)
- new_softcap_icon_state = H.icon_state
- new_softcap_name = H.name
- qdel(H)
- break
- qdel(H)
- if(new_jumpsuit_icon_state && new_jumpsuit_item_state && new_jumpsuit_name)
- for(var/obj/item/clothing/under/J in src)
- if(!J.dyeable)
- continue
- J.item_state = new_jumpsuit_item_state
- J.icon_state = new_jumpsuit_icon_state
- J.item_color = wash_color
- J.name = new_jumpsuit_name
- J.desc = new_desc
- if(new_glove_icon_state && new_glove_item_state && new_glove_name)
- for(var/obj/item/clothing/gloves/color/G in src)
- if(!G.dyeable)
- continue
- G.item_state = new_glove_item_state
- G.icon_state = new_glove_icon_state
- G.item_color = wash_color
- G.name = new_glove_name
- if(!istype(G, /obj/item/clothing/gloves/color/black/thief))
- G.desc = new_desc
- if(new_shoe_icon_state && new_shoe_name)
- for(var/obj/item/clothing/shoes/S in src)
- if(!S.dyeable)
- continue
- if(S.chained)
- S.chained = FALSE
- S.slowdown = SHOES_SLOWDOWN
- new /obj/item/restraints/handcuffs(src)
- S.icon_state = new_shoe_icon_state
- S.item_color = wash_color
- S.name = new_shoe_name
- S.desc = new_desc
- if(new_bandana_icon_state && new_bandana_name)
- for(var/obj/item/clothing/mask/bandana/M in src)
- if(!M.dyeable)
- continue
- M.item_state = new_bandana_item_state
- M.icon_state = new_bandana_icon_state
- M.item_color = wash_color
- M.name = new_bandana_name
- M.desc = new_desc
- if(new_sheet_icon_state && new_sheet_name)
- for(var/obj/item/bedsheet/B in src)
- B.icon_state = new_sheet_icon_state
- B.item_color = wash_color
- B.item_state = new_sheet_item_state
- B.name = new_sheet_name
- B.desc = new_desc
- if(new_softcap_icon_state && new_softcap_name)
- for(var/obj/item/clothing/head/soft/H in src)
- if(!H.dyeable)
- continue
- H.icon_state = new_softcap_icon_state
- H.item_color = wash_color
- H.name = new_softcap_name
- H.desc = new_desc
- QDEL_NULL(crayon)
-
-
- if(locate(/mob) in src)
- state = CLOSED_BLOODY
- gibs_ready = TRUE
- else
- state = CLOSED_FULL
- update_icon(UPDATE_ICON_STATE)
+/obj/machinery/washing_machine/attack_hand(mob/user)
+ if(washing && !door_open)
+ to_chat(user, "[src]'s door is shut, you will need to wait until the end of the cycle.")
+ return
+ toggle_door()
-/obj/machinery/washing_machine/update_icon_state()
- icon_state = "wm_[state][panel]"
/obj/machinery/washing_machine/attackby(obj/item/W, mob/user, params)
+ if(user.a_intent == INTENT_HARM)
+ return ..()
if(default_unfasten_wrench(user, W))
return
- if(istype(W, /obj/item/toy/crayon) || istype(W, /obj/item/stamp))
- if(state in list(OPEN_EMPTY, OPEN_FULL))
- if(!crayon)
- user.drop_item()
- crayon = W
- crayon.forceMove(src)
- update_icon(UPDATE_ICON_STATE)
- else
- return ..()
- else
- return ..()
- else if(istype(W, /obj/item/grab))
- if(state == OPEN_EMPTY)
- var/obj/item/grab/G = W
- if(ishuman(G.assailant) && iscorgi(G.affecting))
- G.affecting.forceMove(src)
+ if(default_deconstruction_screwdriver(user, icon_state, icon_state, W))
+ update_appearance(UPDATE_ICON_STATE)
+ return
+ if(default_deconstruction_crowbar(user, W, FALSE))
+ return
+ if(istype(W, /obj/item/soap))
+ return ..() // need to be able to clean washing machine without putting stuff into the washing machine :D
+ if(istype(W, /obj/item/grab))
+ var/obj/item/grab/G = W
+ if(isliving(G.assailant))
+ if(attempt_insert(user, G.affecting))
qdel(G)
- state = OPEN_FULL
- update_icon(UPDATE_ICON_STATE)
- else
- return ..()
- else if(is_type_in_typecache(W, can_be_washed))
- if(is_type_in_typecache(W, does_not_fit))
- to_chat(user, "This item does not fit.")
- return
- if(istype(W, /obj/item/clothing/gloves/color/black/krav_maga/sec))
- to_chat(user, "Washing these gloves would fry the electronics!")
- return
- if(W.flags & NODROP)
- to_chat(user, "[W] is stuck to your hand!")
+ return
+ if(istype(W))
+ if(attempt_insert(user, W))
return
+ return ..()
+
+
+/*
+ * # attempt_insert
+ *
+ * First part in the insert chain for putting items into the laundry machine, does some sanity checks on both the user and atom
+ * moveable that's about to be shoved inside. Makes sure the user can actually perform this action and then calls the next proper
+ * proc in the insert chain depending if they're a mob or obj/item
+*/
+/obj/machinery/washing_machine/proc/attempt_insert(mob/user, atom/movable/atom_to_insert)
+ if(!anchored || (stat & BROKEN) || (stat & NOPOWER))
+ return FALSE
+ if(!door_open)
+ to_chat(user, "[src]'s door is closed!")
+ return FALSE // simply not possible (or is it?)
+ if(!istype(atom_to_insert) || !istype(user))
+ return FALSE
+ if(user.stat != CONSCIOUS || !Adjacent(user) || !atom_to_insert.Adjacent(user))
+ return FALSE
+ if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
+ to_chat(user, "You try to insert [atom_to_insert] into [src] but your hands are blocked!")
+ return FALSE
+ if(isliving(atom_to_insert)) // not ismob() b/c we only want living creatures, ghosts could just float out of the washing machine whenever they wanted
+ var/mob/living/sacrifice = atom_to_insert
+ if(sacrifice.mob_size >= MOB_SIZE_HUMAN) // prevents some most mobs from being washed even if it would be really really funny
+ to_chat(user, "You try to insert [sacrifice] into [src] but [sacrifice.p_theyre()] too large to fit inside!")
+ return FALSE
+ if(sacrifice.buckled)
+ to_chat(user, "You try to insert [sacrifice] into [src] but [sacrifice.p_theyre()] still buckled to something!")
+ return FALSE
+ return insert_mob_into_tub(user, sacrifice)
+ if(isitem(atom_to_insert)) // Restricting this to only item types prevents a lot of issues, you really only wanna shove items in here anyway...
+ var/obj/item/item_to_insert = atom_to_insert
+ if(item_to_insert.anchored)
+ return FALSE
+ if(item_to_insert.w_class >= WEIGHT_CLASS_HUGE)
+ to_chat(user, "You try to insert [item_to_insert] into [src] but [item_to_insert.p_them()] is too large to fit inside!")
+ return FALSE
+ return insert_item_into_tub(user, item_to_insert)
+
+/// Handles inserting mobs into the washing machines, checks machines capacity, does a do_after, and then applys appropriate signals and updates machines state
+/obj/machinery/washing_machine/proc/insert_mob_into_tub(mob/user, mob/living/mob_to_insert)
+ var/mob_content_size = mob_to_insert.mob_size
+ if(max_tub_capacity < (mob_content_size * 2) + current_tub_capacity)
+ to_chat(user, "You try to insert [mob_to_insert] into [src] but it is too full for [mob_to_insert.p_them()]!")
+ return FALSE
+ mob_to_insert.visible_message("[user] starts shoving [mob_to_insert] into [src]!", "[user] starts shoving you into [src]!")
+ if(!do_after_once(user, (3 SECONDS * mob_content_size), target = src, attempt_cancel_message = "You stop inserting [mob_to_insert] into [src]."))
+ return FALSE
+ mob_to_insert.forceMove(src)
+ RegisterSignal(mob_to_insert, COMSIG_PARENT_QDELETING, PROC_REF(check_tub_contents))
+ RegisterSignal(mob_to_insert, COMSIG_MOVABLE_MOVED, PROC_REF(check_tub_contents))
+ LAZYADD(inserted_mobs, mob_to_insert)
+ calculate_tub_capacity()
+ update_washing_state()
+ add_attack_logs(user, mob_to_insert, "Shoved into washing machine.")
+ to_chat(mob_to_insert, "[user] shoves you into [src]. Oh shit!")
+ mob_to_insert.visible_message("[user] shoves [mob_to_insert] into [src].", "You shove [mob_to_insert] into [src].")
+ return TRUE
+
+/// Handles inserting obj/items into the washing machines, checks machines capacity, does a do_after, and then applys appropriate signals and updates machines state
+/obj/machinery/washing_machine/proc/insert_item_into_tub(mob/user, obj/item/item_to_insert)
+ var/item_content_size = item_to_insert.w_class
+ if(max_tub_capacity < (item_content_size + current_tub_capacity))
+ to_chat(user, "You try to insert [item_to_insert] into [src] but [src] is too full for [item_to_insert.p_them()]!")
+ return FALSE
+ if(!do_after_once(user, (1 SECONDS * (item_to_insert.w_class / 3)), target = src, attempt_cancel_message = "You stop inserting [item_to_insert] into [src]."))
+ return FALSE
+ if(!user.drop_item())
+ to_chat(user, "[item_to_insert] is stuck to your hand!")
+ return FALSE
+ item_to_insert.forceMove(src)
+ RegisterSignal(item_to_insert, COMSIG_PARENT_QDELETING, PROC_REF(check_tub_contents))
+ RegisterSignal(item_to_insert, COMSIG_MOVABLE_MOVED, PROC_REF(check_tub_contents))
+ LAZYADD(inserted_items, item_to_insert)
+ calculate_tub_capacity()
+ update_washing_state()
+ to_chat(user, "You insert [item_to_insert] into [src].")
+ return TRUE
+
+/*
+ * # check_tub_contents()
+ *
+ * Managing tons of contents inside the object is messy business, you never know when something is deleted, teleported, or moved into your obj
+ * without your machine knowing, this clears bad references for GC/tracking purposes and adds references when something is added randomly to
+ * our contents. This ensures we don't nullspace shit (such as a mob dropping a wrench or something) and spit it all back out afterwards even
+ * if we didn't add it our selves!
+ *
+ * This proc is called via COMSIG_PARENT_QDELETING for objects we put inside through the insert proc
+*/
+/obj/machinery/washing_machine/proc/check_tub_contents()
+ SIGNAL_HANDLER
- if(length(contents) < 5)
- if(state in list(OPEN_EMPTY, OPEN_FULL))
- user.drop_item()
- W.forceMove(src)
- state = OPEN_FULL
- else
- to_chat(user, "The door is closed!")
- else
- to_chat(user, "[src] is full!")
- update_icon(UPDATE_ICON_STATE)
+ if(LAZYLEN(inserted_items))
+ for(var/obj/item/I in inserted_items)
+ if(QDELETED(I) || I.loc != src)
+ if(!QDELETED(I))
+ UnregisterSignal(I, COMSIG_PARENT_QDELETING)
+ UnregisterSignal(I, COMSIG_MOVABLE_MOVED)
+ LAZYREMOVE(inserted_items, I)
+ if(LAZYLEN(inserted_mobs))
+ for(var/mob/living/L in inserted_mobs)
+ if(QDELETED(L) || L.loc != src)
+ if(!QDELETED(L))
+ UnregisterSignal(L, COMSIG_PARENT_QDELETING)
+ UnregisterSignal(L, COMSIG_MOVABLE_MOVED)
+ LAZYREMOVE(inserted_mobs, L)
+ for(var/obj/item/I in contents)
+ if(!LAZYIN(inserted_items, I))
+ LAZYADD(inserted_items, I)
+ RegisterSignal(I, COMSIG_PARENT_QDELETING, PROC_REF(check_tub_contents))
+ for(var/mob/living/L in contents)
+ if(!LAZYIN(inserted_mobs, L))
+ LAZYADD(inserted_mobs, L)
+ RegisterSignal(L, COMSIG_PARENT_QDELETING, PROC_REF(check_tub_contents))
+ calculate_tub_capacity()
+ update_washing_state()
+
+/// Moves all Items/Mobs out of the laundry machine onto the Washing Machine's Loc, unregisters signals, then nulls the tracking lists
+/obj/machinery/washing_machine/proc/eject_tub_contents()
+ if(bloody_mess)
+ playsound(loc, 'sound/effects/splat.ogg', 50, TRUE)
+ check_tub_contents() // one last time, we wanna make sure nothing got teleported out
+ if(LAZYLEN(inserted_items))
+ for(var/obj/item/I in inserted_items)
+ if(bloody_mess)
+ I.add_blood() // what a mess!
+ I.forceMove(loc)
+ UnregisterSignal(I, COMSIG_PARENT_QDELETING)
+ UnregisterSignal(I, COMSIG_MOVABLE_MOVED)
+ LAZYNULL(inserted_items)
+ if(LAZYLEN(inserted_mobs))
+ for(var/mob/living/L in inserted_mobs)
+ L.forceMove(loc)
+ UnregisterSignal(L, COMSIG_PARENT_QDELETING)
+ UnregisterSignal(L, COMSIG_MOVABLE_MOVED)
+ LAZYNULL(inserted_mobs)
+ calculate_tub_capacity()
+ update_washing_state()
+
+/// Calculates the total capacity of the contents of the tub,
+/obj/machinery/washing_machine/proc/calculate_tub_capacity()
+ var/new_capacity = 0
+ if(LAZYLEN(inserted_items))
+ for(var/obj/item/I in inserted_items)
+ new_capacity += I.w_class
+ if(LAZYLEN(inserted_mobs))
+ for(var/mob/living/L in inserted_mobs)
+ new_capacity += L.mob_size * 2
+ current_tub_capacity = new_capacity
+
+/obj/machinery/washing_machine/proc/toggle_door()
+ door_open = !door_open
+ if(door_open)
+ eject_tub_contents()
+ update_washing_state()
+
+/// Attempts to locate stamps or crayons for dyeing purposes
+/obj/machinery/washing_machine/proc/locate_color_source()
+ var/list/color_sources = list()
+ for(var/obj/item/toy/crayon/C in contents)
+ color_sources += C
+ for(var/obj/item/stamp/S in contents)
+ color_sources += S
+ if(!length(color_sources))
+ return
+ color_source = pick(color_sources)
+ if(istype(color_source, /obj/item/toy/crayon))
+ var/obj/item/toy/crayon/C = color_source
+ wash_color = C.dye_color
+ if(istype(color_source, /obj/item/stamp))
+ var/obj/item/stamp/S = color_source
+ wash_color = S.dye_color
+
+/obj/machinery/washing_machine/proc/start_wash_cycle()
+ if(stat & (NOPOWER|BROKEN))
+ return
+ locate_color_source()
+ washing = TRUE
+ playsound(loc, 'sound/machines/click.ogg', 50, TRUE)
+ atom_say("Beginning Wash Cycle!")
+ sleep(1 SECONDS)
+ update_washing_state()
+ use_power(100)
+ playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE)
+ addtimer(CALLBACK(src, PROC_REF(wash_cycle)), 15 SECONDS)
+
+/obj/machinery/washing_machine/proc/wash_cycle()
+ for(var/obj/item/I in inserted_items)
+ I.machine_wash(src)
+ for(var/mob/living/L in inserted_mobs)
+ L.machine_wash(src)
+ update_washing_state()
+ use_power(50 * current_tub_capacity)
+ playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE)
+ addtimer(CALLBACK(src, PROC_REF(end_wash_cycle)), 15 SECONDS)
+
+/obj/machinery/washing_machine/proc/end_wash_cycle()
+ if(bloody_mess)
+ for(var/obj/item/I in inserted_items)
+ I.add_blood(I.blood_DNA)
+ QDEL_NULL(color_source)
+ playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE)
+ washing = FALSE
+ atom_say("Wash Cycle Complete!")
+ sleep(1 SECONDS)
+ playsound(loc, 'sound/machines/ding.ogg', 50, TRUE)
+ update_washing_state()
+
+/obj/machinery/washing_machine/container_resist(mob/living/L)
+ . = ..()
+ if(washing)
+ return
+ if(!door_open)
+ toggle_door()
+ return
else
- return ..()
+ L.forceMove(loc)
-/obj/machinery/washing_machine/attack_hand(mob/user)
- switch(state)
- if(OPEN_EMPTY)
- state = CLOSED_EMPTY
- if(CLOSED_EMPTY)
- for(var/atom/movable/O in src)
- O.forceMove(loc)
- crayon = null
- state = OPEN_EMPTY
- if(OPEN_FULL)
- state = CLOSED_FULL
- if(CLOSED_FULL)
- for(var/atom/movable/O in src)
- O.forceMove(loc)
- crayon = null
- state = OPEN_EMPTY
- if(RUNNING)
- to_chat(user, "[src] is busy.")
- if(CLOSED_BLOODY)
- if(gibs_ready)
- gibs_ready = FALSE
- if(locate(/mob) in src)
- var/mob/M = locate() in src
- M.gib()
- for(var/atom/movable/O in src)
- O.forceMove(loc)
- crayon = null
- state = OPEN_EMPTY
-
- update_icon(UPDATE_ICON_STATE)
/obj/machinery/washing_machine/deconstruct(disassembled = TRUE)
- new /obj/item/stack/sheet/metal(drop_location(), 2)
+ eject_tub_contents()
+ new /obj/item/stack/sheet/metal(drop_location(), 5)
+ new /obj/item/circuitboard/washing_machine(drop_location(), 2)
qdel(src)
-#undef OPEN_EMPTY
-#undef CLOSED_EMPTY
-#undef OPEN_FULL
-#undef CLOSED_FULL
-#undef RUNNING
-#undef CLOSED_BLOODY
-#undef RUNNING_BLOODY
+/obj/machinery/washing_machine/AllowDrop()
+ return TRUE // so gibs and dropped items end up inside of the washing machine instead when dropped
+
+/obj/machinery/washing_machine/cleaning_act(mob/user, atom/cleaner, cleanspeed, text_verb, text_description, text_targetname)
+ if(washing)
+ to_chat(user, "[src]'s door is shut, you will need to wait until the end of the cycle to clean it out.")
+ return
+ . = ..()
+ if(. && !washing)
+ bloody_mess = FALSE
+ update_washing_state()
+
+/obj/item/machine_wash(obj/machinery/washing_machine/washer)
+ . = ..()
+ if(washer.color_source)
+ dye_item(washer.wash_color)
+
+/obj/item/holder/machine_wash(obj/machinery/washing_machine/washer)
+ . = ..()
+ for(var/mob/living/held_mob in contents)
+ held_mob.machine_wash(washer)
+
+/obj/item/stack/sheet/hairlesshide/machine_wash(obj/machinery/washing_machine/washer)
+ . = ..()
+ new /obj/item/stack/sheet/wetleather(loc, amount)
+ qdel(src)
+
+/mob/living/simple_animal/machine_wash(obj/machinery/washing_machine/washer)
+ if(mob_size >= MOB_SIZE_HUMAN)
+ return
+ washer.bloody_mess = TRUE
+ add_attack_logs(washer, src, "gibbed by washing machine")
+ gib() //warcrime time!
+
+#undef DEFAULT_TUB_CAPACITY
+#undef WM_STATE_EMPTY
+#undef WM_STATE_FULL
+#undef WM_STATE_RUNNING
+#undef WM_STATE_BLOODY
+#undef WM_STATE_RUNNING_BLOODY
+
+//
+// , ,, ,
+// | || | ,/ _____ \.
+// \_||_/ ||_/ \_||
+// || \_| . . |_/
+// || | L |
+// ,|| |`==='|
+// |>| ___`> -<'___
+// |>|\ / |
+// \>| \ / , . . |
+// || \/ /| . | . | |
+// ||\ ` / | ___|___ | | (
+// (( || `--' | _______ | | )) (
+// ( )\|| ( )\ | - --- - | -| ( ( \ ))
+// (\/ || ))/ ( | -- - -- | | )) ) \((
+// ( ()||((( ())| | |( (( () )hjm
+//
+// "Allow this Devil to stand testament to the
+// the shitcode that once haunted this file"
+//
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 9160090461d8..1980ded01727 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -409,7 +409,7 @@
breakthrough = TRUE
else if(istype(obstacle, /obj/structure/reagent_dispensers/fueltank))
- obstacle.ex_act(1)
+ obstacle.ex_act(EXPLODE_DEVASTATE)
else if(isliving(obstacle))
var/mob/living/L = obstacle
diff --git a/code/game/objects/cleaning.dm b/code/game/objects/cleaning.dm
index 304285513b8c..5c81fd4b27bb 100644
--- a/code/game/objects/cleaning.dm
+++ b/code/game/objects/cleaning.dm
@@ -55,4 +55,25 @@
/atom/proc/post_clean(atom/target, mob/user) //For specific cleaning object behaviors after cleaning, such as mops making floors slippery.
return
+/*
+ * # machine_wash()
+ *
+ * Called by machinery/washing_machine during its wash cycle
+ * allows custom behaviour to be implemented on items that are put through the washing machine
+ * by default it un cmag's objects and cleans all contaminents off of the item
+ *
+ * source - the washing_machine that is responsible for the washing, used by overrides to detect color to dye with
+*/
+/atom/movable/proc/machine_wash(obj/machinery/washing_machine/source)
+ if(HAS_TRAIT(src, TRAIT_CMAGGED)) //If we've cleaned a cmagged object
+ uncmag()
+ REMOVE_TRAIT(src, TRAIT_CMAGGED, CLOWN_EMAG)
+
+ //Generic cleaning functionality
+ var/obj/effect/decal/cleanable/C = locate() in src
+ if(!QDELETED(C))
+ qdel(C)
+ clean_blood()
+
+
#undef CMAG_CLEANTIME
diff --git a/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm b/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm
index 1d39a7cfd943..cb0270cf3d02 100644
--- a/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm
+++ b/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm
@@ -232,7 +232,7 @@
mergeable_decal = FALSE
/obj/effect/decal/cleanable/shreds/ex_act(severity, target)
- if(severity == 1) //so shreds created during an explosion aren't deleted by the explosion.
+ if(severity == EXPLODE_DEVASTATE) //so shreds created during an explosion aren't deleted by the explosion.
qdel(src)
/obj/effect/decal/cleanable/shreds/Initialize(mapload)
diff --git a/code/game/objects/effects/snowcloud.dm b/code/game/objects/effects/snowcloud.dm
index 76a2f8127b19..796015521b25 100644
--- a/code/game/objects/effects/snowcloud.dm
+++ b/code/game/objects/effects/snowcloud.dm
@@ -113,7 +113,7 @@
qdel(src)
/obj/effect/snow/ex_act(severity)
- if(severity == 3 && prob(50))
+ if(severity == EXPLODE_LIGHT && prob(50))
return
qdel(src)
diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm
index f8519f205b30..a83c6b0336a8 100644
--- a/code/game/objects/empulse.dm
+++ b/code/game/objects/empulse.dm
@@ -37,16 +37,16 @@
var/will_affect = FALSE
if(distance < heavy_range)
- will_affect = T.emp_act(1)
+ will_affect = T.emp_act(EMP_HEAVY)
else if(distance == heavy_range)
if(prob(50))
- will_affect = T.emp_act(1)
+ will_affect = T.emp_act(EMP_HEAVY)
else
- will_affect = T.emp_act(2)
+ will_affect = T.emp_act(EMP_LIGHT)
else if(distance <= light_range)
- will_affect = T.emp_act(2)
+ will_affect = T.emp_act(EMP_LIGHT)
if(will_affect)
if(cause == "cult")
diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm
index d68802eb4134..b1cf0e0af37f 100644
--- a/code/game/objects/explosion.dm
+++ b/code/game/objects/explosion.dm
@@ -13,6 +13,19 @@
if(!epicenter)
return
+ // If we are in end round, make explosions gib the user
+ // Why? Its funny
+ if(GLOB.disable_explosions && usr && istype(usr, /mob/living/carbon/human))
+ to_chat(usr, "Your explosive backfires!")
+ var/mob/living/carbon/human/H = usr
+ H.gib() // lol
+ return
+
+ // If explosions are disabled, and there isnt a user, or the user isnt an admin, abort
+ // Admins can still ruin things :P
+ if(GLOB.disable_explosions && ((!usr) || !is_admin(usr)))
+ return
+
// Archive the uncapped explosion for the doppler array
var/orig_dev_range = devastation_range
var/orig_heavy_range = heavy_impact_range
@@ -182,7 +195,7 @@
if(breach)
T.ex_act(dist)
else
- T.ex_act(3)
+ T.ex_act(EXPLODE_LIGHT)
CHECK_TICK
@@ -206,7 +219,7 @@
/proc/secondaryexplosion(turf/epicenter, range)
for(var/turf/tile in spiral_range_turfs(range, epicenter))
- tile.ex_act(2)
+ tile.ex_act(EXPLODE_HEAVY)
/client/proc/check_bomb_impacts()
set name = "Check Bomb Impact"
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 8374e17145d0..51920e44569d 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -78,6 +78,10 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
/// Since any item can now be a piece of clothing, this has to be put here so all items share it.
/// This flag is used to determine when items in someone's inventory cover others. IE helmets making it so you can't see glasses, etc.
var/flags_inv
+ /// The associated key to the dye registry GLOB list, used to transform/color this piece of clothing through dyeing
+ var/dyeing_key
+ /// If this item is put into a washing machine to be dyed, can objects of this type be dyed into a different color/icon?
+ var/dyeable = FALSE
var/item_color
/// What bodyflags does this item cover? See setup.dm for appropriate bit flags
var/body_parts_covered = 0
@@ -307,7 +311,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
..()
/obj/item/attack_hand(mob/user as mob, pickupfireoverride = FALSE)
- if(!user)
+ if(!user)
return FALSE
if(ishuman(user))
var/mob/living/carbon/human/H = user
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 68dbda7c4cf8..107beb353738 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -20,7 +20,8 @@
var/list/letters = list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z")
var/uses = 30 //0 for unlimited uses
var/instant = 0
- var/colourName = "red" //for updateIcon purposes
+ /// What color will this crayon dye clothes, cables, etc? used for for updateIcon purposes on other objs
+ var/dye_color = DYE_RED
var/dat
var/busy = FALSE
var/list/validSurfaces = list(/turf/simulated/floor)
@@ -167,37 +168,37 @@
name = "red crayon"
icon_state = "crayonred"
colour = COLOR_RED
- colourName = "red"
+ dye_color = DYE_RED
/obj/item/toy/crayon/orange
name = "orange crayon"
icon_state = "crayonorange"
colour = COLOR_ORANGE
- colourName = "orange"
+ dye_color = DYE_ORANGE
/obj/item/toy/crayon/yellow
name = "yellow crayon"
icon_state = "crayonyellow"
colour = COLOR_YELLOW
- colourName = "yellow"
+ dye_color = DYE_YELLOW
/obj/item/toy/crayon/green
name = "green crayon"
icon_state = "crayongreen"
colour = COLOR_GREEN
- colourName = "green"
+ dye_color = DYE_GREEN
/obj/item/toy/crayon/blue
name = "blue crayon"
icon_state = "crayonblue"
colour = COLOR_BLUE
- colourName = "blue"
+ dye_color = DYE_BLUE
/obj/item/toy/crayon/purple
name = "purple crayon"
icon_state = "crayonpurple"
colour = COLOR_PURPLE
- colourName = "purple"
+ dye_color = DYE_PURPLE
/obj/item/toy/crayon/random/New()
icon_state = pick("crayonred", "crayonorange", "crayonyellow", "crayongreen", "crayonblue", "crayonpurple")
@@ -205,40 +206,40 @@
if("crayonred")
name = "red crayon"
colour = COLOR_RED
- colourName = "red"
+ dye_color = DYE_RED
if("crayonorange")
name = "orange crayon"
colour = COLOR_ORANGE
- colourName = "orange"
+ dye_color = DYE_ORANGE
if("crayonyellow")
name = "yellow crayon"
colour = COLOR_YELLOW
- colourName = "yellow"
+ dye_color = DYE_YELLOW
if("crayongreen")
name = "green crayon"
- colour =COLOR_GREEN
- colourName = "green"
+ colour = COLOR_GREEN
+ dye_color = DYE_GREEN
if("crayonblue")
name = "blue crayon"
colour = COLOR_BLUE
- colourName = "blue"
+ dye_color = DYE_BLUE
if("crayonpurple")
name = "purple crayon"
colour = COLOR_PURPLE
- colourName = "purple"
+ dye_color = DYE_PURPLE
..()
/obj/item/toy/crayon/black
name = "black crayon"
icon_state = "crayonblack"
colour = "#000000"
- colourName = "black"
+ dye_color = DYE_BLACK
/obj/item/toy/crayon/white
name = "white crayon"
icon_state = "crayonwhite"
colour = "#FFFFFF"
- colourName = "white"
+ dye_color = DYE_WHITE
/obj/item/toy/crayon/white/chalk
name = "detective's chalk"
@@ -251,7 +252,7 @@
desc = "A very sad-looking crayon."
icon_state = "crayonmime"
colour = "#FFFFFF"
- colourName = "mime"
+ dye_color = DYE_MIME
uses = 0
/obj/item/toy/crayon/mime/attack_self(mob/living/user as mob)
@@ -277,7 +278,7 @@
name = "rainbow crayon"
icon_state = "crayonrainbow"
colour = "#FFF000"
- colourName = "rainbow"
+ dye_color = DYE_RAINBOW
uses = 0
/obj/item/toy/crayon/rainbow/attack_self(mob/living/user as mob)
@@ -308,6 +309,7 @@
var/capped = TRUE
instant = TRUE
validSurfaces = list(/turf/simulated/floor,/turf/simulated/wall)
+ dye_color = null // not technically a crayon, so we're not gonna have it dye stuff in the laundry machine
/obj/item/toy/crayon/spraycan/New()
..()
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index e52f5fd5e661..b5fe142722f2 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -205,6 +205,7 @@
/obj/item/flash/cyborg
origin_tech = null
+ can_overcharge = FALSE
/obj/item/flash/cyborg/attack(mob/living/M, mob/user)
..()
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index eb19e9b13953..3a992cd935c7 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -393,7 +393,7 @@
var/mob/M = A
add_attack_logs(user, M, "Hit with EMP-light")
to_chat(user, "[src] now has [emp_cur_charges] charge\s.")
- A.emp_act(1)
+ A.emp_act(EMP_HEAVY)
else
to_chat(user, "\The [src] needs time to recharge!")
return
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index dcd7c9002a5a..b7a45a27a06a 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -129,7 +129,7 @@
else if(istype(target, /obj/machinery/camera))
var/obj/machinery/camera/C = target
if(prob(effectchance * diode.rating))
- C.emp_act(1)
+ C.emp_act(EMP_HEAVY)
outmsg = "You hit the lens of [C] with [src], temporarily disabling the camera!"
log_admin("[key_name(user)] EMPd a camera with a laser pointer")
diff --git a/code/game/objects/items/dyeing.dm b/code/game/objects/items/dyeing.dm
new file mode 100644
index 000000000000..3c240c1e1af3
--- /dev/null
+++ b/code/game/objects/items/dyeing.dm
@@ -0,0 +1,48 @@
+/**
+ * Updates an item's appearance to mimic the appearance of another item in the dye_registry's dictionary
+ * what types of items (beanie, jumpsuit, shoes, etc) src is dyed into depends on the dye_key unless an
+ * overidden dye_key is specified. For example if our dye_key is DYE_REGISTRY_UNDER and we specify to dye to
+ * DYE_RED, our item's appearance would then mimic /obj/item/clothing/under/color/red; see [dye_registry.dm] for this dictionary
+ *
+ * once everything is updated, the target type path that we dyed the item into is returned
+ *
+ * Arguments:
+ * - dye_color: the DYE_COLOR specifies which dye color we look up to copy apearances from in the dye_registry; cannot be null
+ * - dye_key_override: this overrides the items `dyeing_key` which allows you to force the proc to use a specific lookup key for the dye_registry; this can be null
+ */
+/obj/item/proc/dye_item(dye_color, dye_key_override)
+ if(!dyeable || !dye_color)
+ return
+ var/dye_key_selector = dye_key_override ? dye_key_override : dyeing_key
+ if(!dye_key_selector)
+ return FALSE
+ if(!GLOB.dye_registry[dye_key_selector])
+ stack_trace("Item just tried to be dyed with an invalid registry key: [dye_key_selector]")
+ return FALSE
+ var/obj/item/target_type = GLOB.dye_registry[dye_key_selector][dye_color]
+ if(!target_type)
+ return FALSE
+ // update icons
+ icon = initial(target_type.icon)
+ icon_state = initial(target_type.icon_state)
+ item_state = initial(target_type.item_state)
+ sprite_sheets = initial(target_type.sprite_sheets)
+
+ // update inhand sprites
+ lefthand_file = initial(target_type.lefthand_file)
+ righthand_file = initial(target_type.righthand_file)
+ inhand_x_dimension = initial(target_type.inhand_x_dimension)
+ inhand_y_dimension = initial(target_type.inhand_y_dimension)
+
+ // update the name/description
+ name = initial(target_type.name)
+ desc += "\nThe colors look a little dodgy."
+ update_appearance(ALL)
+ return target_type
+
+/// Beanies use the color var for their appearance, we don't normally copy this over but we have to for beanies
+/obj/item/clothing/head/beanie/dye_item(dye_color, dye_key_override)
+ . = ..()
+ if(.)
+ var/obj/item/target_type = .
+ color = initial(target_type.color)
diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm
index e7afcbc4a9bd..c949612017f1 100644
--- a/code/game/objects/items/flag.dm
+++ b/code/game/objects/items/flag.dm
@@ -145,32 +145,32 @@
/obj/item/flag/cargo
name = "\improper Cargonia flag"
- desc = "The flag of the independent, sovereign nation of Cargonia."
+ desc = "The flag of the independent, sovereign nation of Cargonia. Merely glimpsing this majestic banner fills you with the urge to buy enough guns to equip a small army."
icon_state = "cargoflag"
/obj/item/flag/med
name = "\improper Medistan flag"
- desc = "The flag of the independent, sovereign nation of Medistan."
+ desc = "The flag of the independent, sovereign nation of Medistan. Looking at this beautiful white and green banner fills you with a powerful compulsion to file malpractice lawsuits."
icon_state = "medflag"
/obj/item/flag/sec
name = "\improper Brigston flag"
- desc = "The flag of the independent, sovereign nation of Brigston."
+ desc = "The flag of the independent, sovereign nation of Brigston. The red of the flag represents blood shed in defense of the station, the amount of which varies heavily between shifts."
icon_state = "secflag"
/obj/item/flag/rnd
name = "\improper Scientopia flag"
- desc = "The flag of the independent, sovereign nation of Scientopia."
+ desc = "The flag of the independent, sovereign nation of Scientopia. Looking at this laminated beauty of a flag fills you with an irresstible urge to perform SCIENCE!."
icon_state = "rndflag"
/obj/item/flag/atmos
name = "\improper Atmosia flag"
- desc = "The flag of the independent, sovereign nation of Atmosia."
+ desc = "The flag of the independent, sovereign nation of Atmosia. This flag has survived dozens of plasmafires, and will endure more, if Atmosia has any say in things."
icon_state = "atmosflag"
/obj/item/flag/command
name = "\improper Command flag"
- desc = "The flag of the independent, sovereign nation of Command."
+ desc = "The flag of the independent, sovereign nation of Command. Apparently the budget was all spent on this flag, rather than a creative name."
icon_state = "ntflag"
//Antags
@@ -182,27 +182,27 @@
/obj/item/flag/syndi
name = "\improper Syndicate flag"
- desc = "A flag proudly boasting the logo of the Syndicate, in defiance of NT."
+ desc = "A flag proudly boasting the crimson and black colors of the Syndicate, the largest organized criminal entity in the Sector."
icon_state = "syndiflag"
/obj/item/flag/wiz
name = "\improper Wizard Federation flag"
- desc = "A flag proudly boasting the logo of the Wizard Federation, sworn enemies of NT."
+ desc = "A flag proudly boasting the logo of the Wizard Federation, a loose collection of magical terrorist cells."
icon_state = "wizflag"
/obj/item/flag/cult
name = "\improper Nar'Sie Cultist flag"
- desc = "A flag proudly boasting the logo of the cultists, sworn enemies of NT."
+ desc = "A flag proudly boasting the unholy symbols of the Cult of Nar'sie. Merely possessing this flag is illegal in many polities."
icon_state = "cultflag"
/obj/item/flag/ussp
name = "\improper USSP flag"
- desc = "A flag proudly boasting the logo of the USSP, a noticeable faction in the galaxy."
+ desc = "A flag proudly flying the hammer & sickle of the USSP, a powerful socialist nation in the Sector's North."
icon_state = "usspflag"
/obj/item/flag/solgov
name = "\improper Trans-Solar Federation flag"
- desc = "A flag proudly boasting the logo of the SolGov, allied to NT government originated from Earth."
+ desc = "A flag proudly flying the golden sun of the Trans-Solar Federation, the militaristic de-facto superpower of the sector, based on Earth."
icon_state = "solgovflag"
//Chameleon
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 1ce36a89618d..0f77bd6fecba 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -305,4 +305,4 @@
if(istype(I, /obj/item/toy/crayon))
var/obj/item/toy/crayon/C = I
- cable_color(C.colourName)
+ cable_color(C.dye_color)
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index be43682943e4..a383b313f3b2 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -69,6 +69,13 @@
if(response == "Yes")
user.visible_message("[user] grins as [user.p_they()] begin[user.p_s()] to put a Bag of Holding into a Bag of Holding!", "You begin to put the Bag of Holding into the Bag of Holding!")
if(do_after(user, 30, target=src))
+ if(GLOB.disable_explosions)
+ if(istype(user))
+ to_chat(user, "You seem to stuff yourself into the quantum hellscape between the two bags. That wasn't wise.")
+ user.gib()
+
+ return
+
investigate_log("has become a singularity. Caused by [user.key]","singulo")
user.visible_message("[user] erupts in evil laughter as [user.p_they()] put[user.p_s()] the Bag of Holding into another Bag of Holding!", "You can't help but laugh wildly as you put the Bag of Holding into another Bag of Holding, complete darkness surrounding you."," You hear the sound of scientific evil brewing!")
qdel(W)
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index be79a9c285b4..4476daa3b963 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -591,7 +591,7 @@
/obj/item/storage/belt/bandolier
name = "bandolier"
desc = "A bandolier for holding shotgun ammunition."
- icon_state = "bandolier"
+ icon_state = "bandolier_0"
item_state = "bandolier"
storage_slots = 16
max_combined_w_class = 16
@@ -608,7 +608,7 @@
new /obj/item/ammo_casing/shotgun/rubbershot(src)
/obj/item/storage/belt/bandolier/update_icon_state()
- icon_state = "[initial(icon_state)]_[min(length(contents), 8)]"
+ icon_state = "bandolier_[min(length(contents), 8)]"
/obj/item/storage/belt/bandolier/attackby(obj/item/I, mob/user)
var/amount = length(contents)
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 80be7a26b857..d44683a5b997 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -149,12 +149,12 @@
. = ..()
. += image('icons/obj/crayons.dmi',"crayonbox")
for(var/obj/item/toy/crayon/crayon in contents)
- . += image('icons/obj/crayons.dmi',crayon.colourName)
+ . += image('icons/obj/crayons.dmi', crayon.dye_color)
/obj/item/storage/fancy/crayons/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/toy/crayon))
var/obj/item/toy/crayon/C = I
- switch(C.colourName)
+ switch(C.dye_color)
if("mime")
to_chat(usr, "This crayon is too sad to be contained in this box.")
return
diff --git a/code/game/objects/items/weapons/storage/surgical_tray.dm b/code/game/objects/items/weapons/storage/surgical_tray.dm
index c7c91677d8d2..de68f6ccecf5 100644
--- a/code/game/objects/items/weapons/storage/surgical_tray.dm
+++ b/code/game/objects/items/weapons/storage/surgical_tray.dm
@@ -18,7 +18,8 @@
/obj/item/bonegel,
/obj/item/bonesetter,
/obj/item/stack/medical/bruise_pack,
- /obj/item/stack/medical/ointment
+ /obj/item/stack/medical/ointment,
+ /obj/item/surgical_drapes
)
/obj/item/storage/surgical_tray/Initialize(mapload)
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 79825ab09dd7..4d3204ce5d76 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -722,12 +722,12 @@
if(HAS_TRAIT(src, TRAIT_WIELDED))
if(iswallturf(A))
var/turf/simulated/wall/Z = A
- Z.ex_act(2)
+ Z.ex_act(EXPLODE_HEAVY)
charged = 3
playsound(user, 'sound/weapons/marauder.ogg', 50, 1)
else if(isstructure(A) || ismecha(A))
var/obj/Z = A
- Z.ex_act(2)
+ Z.ex_act(EXPLODE_HEAVY)
charged = 3
playsound(user, 'sound/weapons/marauder.ogg', 50, 1)
@@ -808,6 +808,8 @@
icon_state = "pyro"
can_be_cut = FALSE
actions_types = list(/datum/action/item_action/toggle)
+ dyeable = FALSE
+
var/on_cooldown = FALSE
var/obj/item/assembly/signaler/anomaly/pyro/core
var/next_spark_time
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 5d037490ddbe..ff5a40bcfe2f 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -272,7 +272,7 @@
var/atom/throw_target = get_edge_target_turf(target, user.dir)
user.visible_message("It's a home run!")
target.throw_at(throw_target, rand(8,10), 14, user)
- target.ex_act(2)
+ target.ex_act(EXPLODE_HEAVY)
playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1)
homerun_ready = 0
return
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 90ddae2fd6d8..e4d99b404fe6 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -20,8 +20,9 @@ LINEN BINS
item_color = "white"
resistance_flags = FLAMMABLE
slot_flags = SLOT_FLAG_BACK
-
dog_fashion = /datum/dog_fashion/head/ghost
+ dyeing_key = DYE_REGISTRY_BEDSHEET
+
var/list/dream_messages = list("white")
var/list/nightmare_messages = list("black")
var/comfort = 0.5
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 71dc7aa0f6e0..a1aa4868f9a0 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -160,7 +160,7 @@
if(destination in announce_beacons)
for(var/obj/machinery/requests_console/D in GLOB.allRequestConsoles)
if(D.department in announce_beacons[destination])
- D.createMessage(name, "Your Crate has Arrived!", msg, 1)
+ D.createMessage(name, "Your Crate has Arrived!", msg, RQ_NORMALPRIORITY)
/obj/structure/closet/crate/secure
desc = "A secure crate."
diff --git a/code/game/objects/structures/depot_structures.dm b/code/game/objects/structures/depot_structures.dm
index ebdb7cdfc61d..0137faaf4f5c 100644
--- a/code/game/objects/structures/depot_structures.dm
+++ b/code/game/objects/structures/depot_structures.dm
@@ -28,7 +28,7 @@
return ..()
/obj/structure/fusionreactor/ex_act(severity)
- if(severity < 3)
+ if(severity < EXPLODE_LIGHT)
obj_integrity = 0
healthcheck()
diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm
index e95355137716..5ff8c68f188d 100644
--- a/code/game/objects/structures/kitchen_spike.dm
+++ b/code/game/objects/structures/kitchen_spike.dm
@@ -103,7 +103,7 @@
"[user] tries to slam [victim] onto the meat spike!",
"[user] tries to slam you onto the meat spike!"
)
- if(do_mob(user, src, 6 SECONDS))
+ if(do_mob(user, victim, 6 SECONDS))
end_spike(victim, user)
/obj/structure/kitchenspike/proc/end_spike(mob/living/victim, mob/user)
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 534ff6134dd8..3bdda3532c45 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -71,7 +71,7 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama
return
/turf/simulated/floor/burn_down()
- ex_act(2)
+ ex_act(EXPLODE_HEAVY)
/turf/simulated/floor/is_shielded()
for(var/obj/structure/A in contents)
diff --git a/code/modules/admin/misc_admin_procs.dm b/code/modules/admin/misc_admin_procs.dm
index 59279382fc7b..18d88eb0bcbf 100644
--- a/code/modules/admin/misc_admin_procs.dm
+++ b/code/modules/admin/misc_admin_procs.dm
@@ -1,5 +1,9 @@
-GLOBAL_VAR_INIT(BSACooldown, 0)
-GLOBAL_VAR_INIT(nologevent, 0)
+/// Is admin BSA (damage a user) currently on cooldown?
+GLOBAL_VAR_INIT(BSACooldown, FALSE)
+/// Are we in a no-log event (EORG, highlander, etc)?
+GLOBAL_VAR_INIT(nologevent, FALSE)
+/// Are explosions currently disabled for EORG?
+GLOBAL_VAR_INIT(disable_explosions, FALSE)
////////////////////////////////
/proc/message_admins(msg)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index ab00577823e3..5fac4cafa053 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1829,9 +1829,8 @@
to_chat(owner, "Standby. Reload cycle in progress. Gunnery crews ready in five seconds!")
return
- GLOB.BSACooldown = 1
- spawn(50)
- GLOB.BSACooldown = 0
+ GLOB.BSACooldown = TRUE
+ addtimer(VARSET_CALLBACK(GLOB, BSACooldown, FALSE), 5 SECONDS)
to_chat(M, "You've been hit by bluespace artillery!")
log_admin("[key_name(M)] has been hit by Bluespace Artillery fired by [key_name(owner)]")
diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index dfc1daf5746f..44b17907e2a5 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -658,6 +658,10 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
dat += "| [(toggles & toggle.preftoggle_bitflag) ? "Enabled" : "Disabled"] | "
if(PREFTOGGLE_TOGGLE2)
dat += "[(toggles2 & toggle.preftoggle_bitflag) ? "Enabled" : "Disabled"] | "
+ // SS220 ADDITION - START
+ if(PREFTOGGLE_TOGGLE220)
+ dat += "[(toggles220 & toggle.preftoggle_bitflag) ? "Enabled" : "Disabled"] | "
+ // SS220 ADDITION - END
if(PREFTOGGLE_SOUND)
dat += "[(sound & toggle.preftoggle_bitflag) ? "Enabled" : "Disabled"] | "
if(PREFTOGGLE_LIGHT)
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 8c258013d33d..5623d28449c2 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -425,6 +425,7 @@
icon_override = 'icons/mob/clothing/head/softcap.dmi'
icon_state = "greysoft"
item_color = "grey"
+ dyeable = FALSE
resistance_flags = NONE
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
@@ -467,6 +468,7 @@
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
+ dyeable = FALSE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
@@ -522,6 +524,7 @@
icon_state = "black"
item_color = "black"
desc = "A pair of black shoes."
+ dyeable = FALSE
permeability_coefficient = 0.05
resistance_flags = NONE
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
@@ -656,6 +659,7 @@
chameleon_action.emp_randomise(INFINITY)
/obj/item/stamp/chameleon
+ dye_color = DYE_RAINBOW
var/datum/action/item_action/chameleon/change/chameleon_action
/obj/item/stamp/chameleon/Initialize(mapload)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index d11c5947d21a..672e5a445841 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -38,7 +38,6 @@
var/cooldown = 0
var/species_disguise = null
var/magical = FALSE
- var/dyeable = FALSE
/// Do we block AI tracking?
var/blockTracking
w_class = WEIGHT_CLASS_SMALL
@@ -266,14 +265,17 @@
body_parts_covered = HANDS
slot_flags = SLOT_FLAG_GLOVES
attack_verb = list("challenged")
+ strip_delay = 2 SECONDS
+ put_on_delay = 4 SECONDS
+ dyeing_key = DYE_REGISTRY_GLOVES
+
var/transfer_prints = FALSE
///Master pickpocket?
var/pickpocket = FALSE
var/clipped = FALSE
///Do they protect the wearer from poison ink?
var/safe_from_poison = FALSE
- strip_delay = 20
- put_on_delay = 40
+
///Amount of times touching something with these gloves will spill blood on it
var/transfer_blood = 0
@@ -409,9 +411,11 @@
icon = 'icons/obj/clothing/masks.dmi'
body_parts_covered = HEAD
slot_flags = SLOT_FLAG_MASK
+ strip_delay = 4 SECONDS
+ put_on_delay = 4 SECONDS
+ dyeable = FALSE
+
var/adjusted_flags = null
- strip_delay = 40
- put_on_delay = 40
//Proc that moves gas/breath masks out of the way
/obj/item/clothing/mask/proc/adjustmask(mob/user)
@@ -492,6 +496,20 @@
icon = 'icons/obj/clothing/shoes.dmi'
desc = "Comfortable-looking shoes."
gender = PLURAL //Carn: for grammatically correct text-parsing
+
+ body_parts_covered = FEET
+ slot_flags = SLOT_FLAG_FEET
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_SHOES
+
+ permeability_coefficient = 0.50
+ slowdown = SHOES_SLOWDOWN
+
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/shoes.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/shoes.dmi'
+ )
+
var/chained = FALSE
var/can_cut_open = FALSE
var/cut_open = FALSE
@@ -499,19 +517,11 @@
var/knife_slot = FALSE
var/obj/item/kitchen/knife/combat/hidden_blade
- body_parts_covered = FEET
- slot_flags = SLOT_FLAG_FEET
var/blood_state = BLOOD_STATE_NOT_BLOODY
var/list/bloody_shoes = list(BLOOD_STATE_HUMAN = 0, BLOOD_STATE_XENO = 0, BLOOD_STATE_NOT_BLOODY = 0, BLOOD_BASE_ALPHA = BLOODY_FOOTPRINT_BASE_ALPHA)
- permeability_coefficient = 0.50
- slowdown = SHOES_SLOWDOWN
- sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/shoes.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/shoes.dmi'
- )
/obj/item/clothing/shoes/equipped(mob/user, slot)
. = ..()
@@ -618,12 +628,14 @@
/obj/item/clothing/suit
name = "suit"
icon = 'icons/obj/clothing/suits.dmi'
- var/fire_resist = T0C+100
allowed = list(/obj/item/tank/internals/emergency_oxygen)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
drop_sound = 'sound/items/handling/cloth_drop.ogg'
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
slot_flags = SLOT_FLAG_OCLOTHING
+ dyeable = FALSE
+
+ var/fire_resist = T0C + 100
var/blood_overlay_type = "suit"
var/suit_toggled = FALSE
var/suit_adjusted = FALSE
@@ -635,6 +647,7 @@
///How long to break out of the suits
var/breakouttime
+
/obj/item/clothing/suit/Initialize(mapload)
. = ..()
setup_shielding()
@@ -789,7 +802,6 @@
resistance_flags = NONE
dog_fashion = null
-
/obj/item/clothing/suit/space
name = "space suit"
desc = "A suit that protects against low pressure environments. Has a big 13 on the back."
@@ -829,6 +841,7 @@
equip_sound = 'sound/items/equip/jumpsuit_equip.ogg'
drop_sound = 'sound/items/handling/cloth_drop.ogg'
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
+ dyeing_key = DYE_REGISTRY_UNDER
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/misc.dmi',
diff --git a/code/modules/clothing/gloves/colored_gloves.dm b/code/modules/clothing/gloves/colored_gloves.dm
index 40f263be7e01..0493b1ac1c25 100644
--- a/code/modules/clothing/gloves/colored_gloves.dm
+++ b/code/modules/clothing/gloves/colored_gloves.dm
@@ -8,8 +8,9 @@
item_state = "ygloves"
siemens_coefficient = 0
permeability_coefficient = 0.05
- item_color="yellow"
+ item_color = "yellow"
resistance_flags = NONE
+ dyeable = TRUE
/obj/item/clothing/gloves/color/yellow/fake
siemens_coefficient = 1
@@ -56,13 +57,6 @@
"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi',
)
-
-/obj/item/clothing/gloves/color/black/hos
- item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way.
-
-/obj/item/clothing/gloves/color/black/ce
- item_color = "chief" //Exists for washing machines. Is not different from black gloves in any way.
-
/obj/item/clothing/gloves/color/black/thief
pickpocket = 1
@@ -144,13 +138,7 @@
desc = "A pair of gloves, they don't look special in any way."
icon_state = "gray"
item_state = "graygloves"
- item_color="grey"
-
-/obj/item/clothing/gloves/color/grey/rd
- item_color = "director" //Exists for washing machines. Is not different from gray gloves in any way.
-
-/obj/item/clothing/gloves/color/grey/hop
- item_color = "hop" //Exists for washing machines. Is not different from gray gloves in any way.
+ item_color = "grey"
/obj/item/clothing/gloves/color/light_brown
name = "light brown gloves"
@@ -166,9 +154,6 @@
item_state = "browngloves"
item_color="brown"
-/obj/item/clothing/gloves/color/brown/cargo
- item_color = "cargo" //Exists for washing machines. Is not different from brown gloves in any way.
-
/obj/item/clothing/gloves/color/latex
name = "latex gloves"
desc = "Cheap sterile gloves made from latex."
@@ -176,7 +161,7 @@
item_state = "lgloves"
siemens_coefficient = 0.30
permeability_coefficient = 0.01
- item_color="white"
+ item_color = "white"
transfer_prints = TRUE
resistance_flags = NONE
@@ -201,9 +186,6 @@
"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi',
)
-/obj/item/clothing/gloves/color/white/redcoat
- item_color = "redcoat" //Exists for washing machines. Is not different from white gloves in any way.
-
/obj/item/clothing/gloves/color/captain
name = "captain's gloves"
@@ -232,3 +214,4 @@
icon_state = "furglovesico"
item_state = "furgloves"
transfer_prints = TRUE
+ dyeable = FALSE
diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm
index 21e0bc2b4a7c..fb47355dffa7 100644
--- a/code/modules/clothing/head/beanie.dm
+++ b/code/modules/clothing/head/beanie.dm
@@ -13,6 +13,7 @@
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
)
dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_BEANIE
/obj/item/clothing/head/beanie/black
name = "black beanie"
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index e1075378113a..f63c0f0c727a 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -14,6 +14,7 @@
max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/helmet
+ dyeable = FALSE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
"Drask" = 'icons/mob/clothing/species/drask/helmet.dmi',
diff --git a/code/modules/clothing/masks/misc_masks.dm b/code/modules/clothing/masks/misc_masks.dm
index 2369f6de0216..96e4145c63b3 100644
--- a/code/modules/clothing/masks/misc_masks.dm
+++ b/code/modules/clothing/masks/misc_masks.dm
@@ -405,6 +405,7 @@
adjusted_flags = SLOT_FLAG_HEAD
icon_state = "bandbotany"
dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_BANDANA
can_toggle = TRUE
sprite_sheets = list(
diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
index 6f0c5aa35158..60f6998a7291 100644
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -10,9 +10,6 @@
max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
dyeable = TRUE
-/obj/item/clothing/shoes/black/redcoat
- item_color = "redcoat" //Exists for washing machines. Is not different from black shoes in any way.
-
/obj/item/clothing/shoes/black/greytide
flags = NODROP
@@ -22,24 +19,6 @@
icon_state = "brown"
item_color = "brown"
-/obj/item/clothing/shoes/brown/captain
- item_color = "captain" //Exists for washing machines. Is not different from brown shoes in any way.
-
-/obj/item/clothing/shoes/brown/hop
- item_color = "hop" //Exists for washing machines. Is not different from brown shoes in any way.
-
-/obj/item/clothing/shoes/brown/ce
- item_color = "chief" //Exists for washing machines. Is not different from brown shoes in any way.
-
-/obj/item/clothing/shoes/brown/rd
- item_color = "director" //Exists for washing machines. Is not different from brown shoes in any way.
-
-/obj/item/clothing/shoes/brown/cmo
- item_color = "medical" //Exists for washing machines. Is not different from brown shoes in any way.
-
-/obj/item/clothing/shoes/brown/qm
- item_color = "cargo" //Exists for washing machines. Is not different from brown shoes in any way.
-
/obj/item/clothing/shoes/blue
name = "blue shoes"
icon_state = "blue"
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index 9514ee602c5e..308aea6b03c3 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -3,6 +3,12 @@
desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle."
icon_state = "magboots0"
origin_tech = "materials=3;magnets=4;engineering=4"
+ dyeable = FALSE
+ actions_types = list(/datum/action/item_action/toggle)
+ strip_delay = 7 SECONDS
+ put_on_delay = 7 SECONDS
+ resistance_flags = FIRE_PROOF
+
var/magboot_state = "magboots"
var/magpulse = FALSE
var/slowdown_active = 2
@@ -10,10 +16,6 @@
var/magpulse_name = "mag-pulse traction system"
///If a pair of magboots has different icons for being on or off
var/multiple_icons = TRUE
- actions_types = list(/datum/action/item_action/toggle)
- strip_delay = 70
- put_on_delay = 70
- resistance_flags = FIRE_PROOF
/obj/item/clothing/shoes/magboots/water_act(volume, temperature, source, method)
. = ..()
diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm
index 681f25935ba7..5c66cd8382d3 100644
--- a/code/modules/clothing/shoes/misc_shoes.dm
+++ b/code/modules/clothing/shoes/misc_shoes.dm
@@ -2,6 +2,7 @@
name = "mime shoes"
icon_state = "mime"
item_color = "mime"
+ dyeable = TRUE
/// basic syndicate combat boots for nuke ops and mob corpses
/obj/item/clothing/shoes/combat
@@ -15,6 +16,7 @@
strip_delay = 70
resistance_flags = NONE
knife_slot = TRUE
+ dyeable = FALSE
/// overpowered gimmick boots
/obj/item/clothing/shoes/combat/swat
@@ -31,17 +33,20 @@
strip_delay = 50
put_on_delay = 50
magical = TRUE
+ dyeable = FALSE
/obj/item/clothing/shoes/sandal/marisa
name = "magic shoes"
desc = "A pair of magic, black shoes."
icon_state = "black"
resistance_flags = FIRE_PROOF | ACID_PROOF
+ dyeable = FALSE
/obj/item/clothing/shoes/sandal/magic
name = "magical sandals"
desc = "A pair of sandals imbued with magic."
resistance_flags = FIRE_PROOF | ACID_PROOF
+ dyeable = FALSE
/obj/item/clothing/shoes/galoshes
name = "galoshes"
@@ -53,6 +58,7 @@
strip_delay = 50
put_on_delay = 50
resistance_flags = NONE
+ dyeable = FALSE
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 35, ACID = 150)
/obj/item/clothing/shoes/galoshes/dry
@@ -84,12 +90,13 @@
item_state = "clown_shoes"
slowdown = SHOES_SLOWDOWN+1
item_color = "clown"
- var/enabled_waddle = TRUE
// "Dyeable" in this case is a bit of an understatement, washing these
// with a crayon will give them the appearance and name of normal
// shoes, but the functionality of clown shoes.
dyeable = TRUE
+ var/enabled_waddle = TRUE
+
/obj/item/clothing/shoes/clown_shoes/Initialize(mapload)
. = ..()
AddComponent(/datum/component/squeak, list('sound/effects/clownstep1.ogg' = 1, 'sound/effects/clownstep2.ogg' = 1), 50, falloff_exponent = 20) //die off quick please
@@ -111,6 +118,10 @@
return
toggle_waddle(user)
+/obj/item/clothing/shoes/clown_shoes/machine_wash(obj/machinery/washing_machine/washer)
+ . = ..()
+ playsound(src, 'sound/items/bikehorn.ogg', 25, TRUE, 1)
+
/obj/item/clothing/shoes/clown_shoes/proc/toggle_waddle(mob/living/user)
if(!enabled_waddle)
to_chat(user, "You switch off the waddle dampeners!")
@@ -137,7 +148,7 @@
actions_types = list(/datum/action/item_action/slipping)
enabled_waddle = FALSE
slowdown = 0
- dyeable = FALSE
+
var/slide_distance = 6
var/recharging_rate = 8 SECONDS
var/recharging_time = 0
@@ -189,6 +200,7 @@
strip_delay = 50
put_on_delay = 50
resistance_flags = NONE
+ dyeable = FALSE
/obj/item/clothing/shoes/jackboots/jacksandals
name = "jacksandals"
@@ -196,10 +208,12 @@
can_cut_open = 0
icon_state = "jacksandal"
item_color = "jacksandal"
+ dyeable = FALSE
/obj/item/clothing/shoes/jackboots/noisy
name = "heavy jackboots"
desc = "Outdated heavier versions of the standard Nanotrasen-issue Security combat boots. Pick up that can."
+ dyeable = FALSE
/obj/item/clothing/shoes/jackboots/noisy/Initialize(mapload)
. = ..()
@@ -210,6 +224,7 @@
desc = "Thick-soled boots for industrial work environments."
can_cut_open = 1
icon_state = "workboots"
+ dyeable = FALSE
/obj/item/clothing/shoes/workboots/mining
name = "mining boots"
@@ -221,6 +236,7 @@
heat_protection = FEET|LEGS
max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
knife_slot = TRUE
+ dyeable = FALSE
/obj/item/clothing/shoes/winterboots
name = "winter boots"
@@ -231,6 +247,7 @@
min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
heat_protection = FEET|LEGS
max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
+ dyeable = FALSE
/obj/item/clothing/shoes/cult
name = "boots"
@@ -244,29 +261,34 @@
heat_protection = FEET
max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
magical = TRUE
+ dyeable = FALSE
/obj/item/clothing/shoes/cyborg
name = "cyborg boots"
desc = "Shoes for a cyborg costume"
icon_state = "boots"
+ dyeable = FALSE
/obj/item/clothing/shoes/slippers
name = "bunny slippers"
desc = "Fluffy!"
icon_state = "slippers"
item_state = "slippers"
+ dyeable = FALSE
/obj/item/clothing/shoes/slippers_worn
name = "worn bunny slippers"
desc = "Fluffy..."
icon_state = "slippers_worn"
item_state = "slippers_worn"
+ dyeable = FALSE
/obj/item/clothing/shoes/laceup
name = "laceup shoes"
desc = "The height of fashion, and they're pre-polished!"
icon_state = "laceups"
put_on_delay = 50
+ dyeable = FALSE
/obj/item/clothing/shoes/roman
name = "roman sandals"
@@ -275,17 +297,20 @@
item_state = "roman"
strip_delay = 100
put_on_delay = 100
+ dyeable = FALSE
/obj/item/clothing/shoes/centcom
name = "dress shoes"
desc = "They appear impeccably polished."
icon_state = "laceups"
+ dyeable = FALSE
/obj/item/clothing/shoes/griffin
name = "griffon boots"
desc = "A pair of costume boots fashioned after bird talons."
icon_state = "griffinboots"
item_state = "griffinboots"
+ dyeable = FALSE
/obj/item/clothing/shoes/fluff/noble_boot
@@ -294,12 +319,14 @@
icon_state = "noble_boot"
item_color = "noble_boot"
item_state = "noble_boot"
+ dyeable = FALSE
/obj/item/clothing/shoes/furboots
name = "fur boots"
desc = "Warm, furry boots."
icon_state = "furboots"
item_state = "furboots"
+ dyeable = FALSE
/obj/item/clothing/shoes/sandal/white
name = "white sandals"
@@ -352,12 +379,14 @@
desc = "These boots were made for dancing."
icon_state = "bsing"
put_on_delay = 50
+ dyeable = FALSE
/obj/item/clothing/shoes/cowboy
name = "cowboy boots"
desc = "A pair a' brown boots."
icon_state = "cowboy_brown"
item_color = "cowboy_brown"
+ dyeable = FALSE
/obj/item/clothing/shoes/cowboy/black
name = "black cowboy boots"
@@ -410,6 +439,7 @@
item_state = "clothwrap"
force = 0
w_class = WEIGHT_CLASS_SMALL
+ dyeable = FALSE
/obj/item/clothing/shoes/bhop
name = "jump boots"
@@ -422,6 +452,8 @@
permeability_coefficient = 0.05
can_cut_open = FALSE
knife_slot = TRUE
+ dyeable = FALSE
+
var/jumpdistance = 5 //-1 from to see the actual distance, e.g 4 goes over 3 tiles
var/jumpspeed = 3
var/recharging_rate = 6 SECONDS //default 6 seconds between each dash
diff --git a/code/modules/clothing/spacesuits/alien_suits.dm b/code/modules/clothing/spacesuits/alien_suits.dm
index 748427fd9a68..d38a9944f255 100644
--- a/code/modules/clothing/spacesuits/alien_suits.dm
+++ b/code/modules/clothing/spacesuits/alien_suits.dm
@@ -79,6 +79,7 @@
armor = list(MELEE = 35, BULLET = 35, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 20, FIRE = 200, ACID = 285)
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
+ dyeable = FALSE
icon = 'icons/obj/clothing/species/vox/suits.dmi'
species_restricted = list("Vox")
sprite_sheets = list(
diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm
index 719e0bcb8e3b..b8140922a33e 100644
--- a/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/code/modules/clothing/spacesuits/chronosuit.dm
@@ -26,6 +26,8 @@
actions_types = list(/datum/action/item_action/toggle)
armor = list(MELEE = 75, BULLET = 75, LASER = 75, ENERGY = 75, BOMB = 30, RAD = 90, FIRE = INFINITY, ACID = INFINITY)
resistance_flags = FIRE_PROOF | ACID_PROOF
+ dyeable = FALSE
+
var/obj/item/clothing/head/helmet/space/chronos/helmet = null
var/obj/effect/chronos_cam/camera = null
var/activating = FALSE
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 9baed58985b7..c4e7304ed4c9 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -138,7 +138,7 @@
/obj/item/clothing/head/helmet/space/hardsuit/emp_act(severity)
..()
- display_visor_message("[severity > 1 ? "Light" : "Strong"] electromagnetic pulse detected!")
+ display_visor_message("[severity > EMP_HEAVY ? "Light" : "Strong"] electromagnetic pulse detected!")
/obj/item/clothing/suit/space/hardsuit
name = "hardsuit"
@@ -149,10 +149,8 @@
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5, RAD = 150, FIRE = 50, ACID = 150)
allowed = list(/obj/item/flashlight,/obj/item/tank/internals,/obj/item/t_scanner, /obj/item/rcd, /obj/item/rpd)
siemens_coefficient = 0
- var/obj/item/clothing/head/helmet/space/hardsuit/helmet
actions_types = list(/datum/action/item_action/toggle_helmet)
- var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit
- var/obj/item/tank/jetpack/suit/jetpack = null
+ dyeable = FALSE
hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
sprite_sheets = list(
@@ -171,6 +169,10 @@
"Vulpkanin" = 'icons/obj/clothing/species/vulpkanin/suits.dmi'
)
+ var/obj/item/clothing/head/helmet/space/hardsuit/helmet
+ var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit
+ var/obj/item/tank/jetpack/suit/jetpack = null
+
/obj/item/clothing/suit/space/hardsuit/Initialize(mapload)
. = ..()
MakeHelmet()
diff --git a/code/modules/clothing/spacesuits/misc_spacesuits.dm b/code/modules/clothing/spacesuits/misc_spacesuits.dm
index 9ba7154912b2..e71640e6233b 100644
--- a/code/modules/clothing/spacesuits/misc_spacesuits.dm
+++ b/code/modules/clothing/spacesuits/misc_spacesuits.dm
@@ -64,6 +64,7 @@
flags_2 = RAD_PROTECT_CONTENTS_2
strip_delay = 130
dog_fashion = /datum/dog_fashion/back/deathsquad
+ dyeable = FALSE
/obj/item/clothing/suit/space/deathsquad/Initialize(mapload)
. = ..()
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index 93564f3c757c..d0e4f9d0d4bf 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -5,6 +5,8 @@
icon_state = "syndicate"
item_state = "syndicate"
armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 20, FIRE = 200, ACID = 285)
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_SYNDICATE_HELMET
sprite_sheets = list(
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
"Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
@@ -19,6 +21,8 @@
item_state = "space_suit_syndicate"
desc = "A suspicious-looking space suit. The fabric is reinforced with a blend of nomex and kevlar for added protection."
w_class = WEIGHT_CLASS_NORMAL
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_SYNDICATE_SUIT
allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword/saber,/obj/item/restraints/handcuffs,/obj/item/tank/internals)
armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 20, FIRE = 200, ACID = 285)
sprite_sheets = list(
diff --git a/code/modules/clothing/spacesuits/void.dm b/code/modules/clothing/spacesuits/void.dm
index af218f309009..01d5db555cfe 100644
--- a/code/modules/clothing/spacesuits/void.dm
+++ b/code/modules/clothing/spacesuits/void.dm
@@ -6,6 +6,8 @@
icon_state = "void-red"
item_state = "void"
flags_inv = HIDEMASK|HIDEEARS
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_VOID_HELMET
sprite_sheets = list(
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
"Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
@@ -18,6 +20,8 @@
icon_state = "void-red"
item_state = "void"
desc = "A high tech, NASA Centcom branch designed space suit. Used for AI satellite maintenance."
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_VOID_SUIT
allowed = list(/obj/item/flashlight,/obj/item/tank/internals,/obj/item/multitool)
sprite_sheets = list(
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
diff --git a/code/modules/clothing/suits/hood.dm b/code/modules/clothing/suits/hood.dm
index 7df145f0fa6b..9deab56b0826 100644
--- a/code/modules/clothing/suits/hood.dm
+++ b/code/modules/clothing/suits/hood.dm
@@ -21,6 +21,10 @@
W.suit = src
hood = W
+/obj/item/clothing/suit/hooded/clean_blood(radiation_clean)
+ . = ..()
+ hood.clean_blood()
+
/obj/item/clothing/suit/hooded/ui_action_click()
ToggleHood()
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index c5dacd6aa9ce..19abb245f1b9 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -103,6 +103,7 @@
strip_delay = 70
put_on_delay = 70
resistance_flags = NONE
+ dyeable = FALSE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
diff --git a/code/modules/clothing/under/dress.dm b/code/modules/clothing/under/dress.dm
index 42788ffd9f1b..3a0d25e88862 100644
--- a/code/modules/clothing/under/dress.dm
+++ b/code/modules/clothing/under/dress.dm
@@ -35,6 +35,8 @@
icon_state = "blackskirt"
item_color = "blackskirt"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_JUMPSKIRT
//wedding stuff
@@ -120,12 +122,16 @@
desc = "A preppy red skirt with a white blouse."
icon_state = "plaid_red"
item_color = "plaid_red"
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_JUMPSKIRT
/obj/item/clothing/under/dress/plaid_purple
name = "blue purple skirt"
desc = "A preppy purple skirt with a white blouse."
icon_state = "plaid_purple"
item_color = "plaid_purple"
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_JUMPSKIRT
/obj/item/clothing/under/dress/sailordress
name = "sailor dress"
diff --git a/code/modules/clothing/under/jobs/captain.dm b/code/modules/clothing/under/jobs/captain.dm
index 5cd0cb4f78f3..6845c1c738b4 100644
--- a/code/modules/clothing/under/jobs/captain.dm
+++ b/code/modules/clothing/under/jobs/captain.dm
@@ -19,6 +19,8 @@
desc = "Feminine fashion for the style conscious captain."
icon_state = "captain_dress"
item_color = "captain_dress"
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_JUMPSKIRT
/obj/item/clothing/under/rank/captain/parade
name = "captain's parade uniform"
diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm
index c77a1deba891..79fd2cafea2c 100644
--- a/code/modules/clothing/under/jobs/cargo.dm
+++ b/code/modules/clothing/under/jobs/cargo.dm
@@ -23,6 +23,8 @@
icon_state = "qm_skirt"
item_state = "qm_skirt"
item_color = "qm_skirt"
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_JUMPSKIRT
/obj/item/clothing/under/rank/cargo/qm/dress
name = "quartermaster's dress uniform"
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 2f58d9717cd6..fb08d4a7eef0 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -20,6 +20,8 @@
desc = "It's a jumpskirt worn by someone who works in the position of \"Head of Personnel\"."
icon_state = "hop_skirt"
item_color = "hop_skirt"
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_JUMPSKIRT
/obj/item/clothing/under/rank/civilian/hop/dress
name = "head of personnel's dress uniform"
@@ -120,6 +122,8 @@
icon_state = "mime_skirt"
item_state = "mime_skirt"
item_color = "mime_skirt"
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_JUMPSKIRT
/obj/item/clothing/under/rank/civilian/mime/sexy
name = "sexy mime outfit"
diff --git a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm
index fa48191c8f97..a857f5bcc3da 100644
--- a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm
+++ b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm
@@ -23,6 +23,8 @@
icon_state = "chieff"
item_color = "chieff"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_JUMPSKIRT
/obj/item/clothing/under/rank/engineering/atmospheric_technician
desc = "It's a jumpsuit worn by atmospheric technicians."
diff --git a/code/modules/clothing/under/jobs/medical_jumpsuits.dm b/code/modules/clothing/under/jobs/medical_jumpsuits.dm
index 7a8258f77c0c..6f6c15fc14b8 100644
--- a/code/modules/clothing/under/jobs/medical_jumpsuits.dm
+++ b/code/modules/clothing/under/jobs/medical_jumpsuits.dm
@@ -24,6 +24,8 @@
icon_state = "cmof"
item_color = "cmof"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_JUMPSKIRT
/obj/item/clothing/under/rank/medical/doctor
name = "medical doctor's jumpsuit"
diff --git a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm
index 9d25abd92ca4..1669a3afcbce 100644
--- a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm
+++ b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm
@@ -4,15 +4,18 @@
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = INFINITY, ACID = INFINITY)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
strip_delay = 80
- var/next_extinguish = 0
- var/extinguish_cooldown = 100
- var/extinguishes_left = 5
icon = 'icons/obj/clothing/species/plasmaman/uniform.dmi'
species_restricted = list("Plasmaman")
sprite_sheets = list("Plasmaman" = 'icons/mob/clothing/species/plasmaman/uniform.dmi')
icon_state = "plasmaman"
item_state = "plasmaman"
item_color = "plasmaman"
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_PLASMAMEN
+
+ var/next_extinguish = 0
+ var/extinguish_cooldown = 10 SECONDS
+ var/extinguishes_left = 5
/obj/item/clothing/under/plasmaman/examine(mob/user)
. = ..()
diff --git a/code/modules/clothing/under/jobs/rnd.dm b/code/modules/clothing/under/jobs/rnd.dm
index 9ee59b40cebd..884966949c14 100644
--- a/code/modules/clothing/under/jobs/rnd.dm
+++ b/code/modules/clothing/under/jobs/rnd.dm
@@ -21,6 +21,8 @@
desc = "Feminine fashion for the style conscious RD."
icon_state = "dress_rd"
item_color = "dress_rd"
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_JUMPSKIRT
/obj/item/clothing/under/rank/rnd/scientist
name = "scientist's jumpsuit"
diff --git a/code/modules/clothing/under/jobs/security_jumpsuits.dm b/code/modules/clothing/under/jobs/security_jumpsuits.dm
index d319cda2cbc5..925d5bc7aeea 100644
--- a/code/modules/clothing/under/jobs/security_jumpsuits.dm
+++ b/code/modules/clothing/under/jobs/security_jumpsuits.dm
@@ -139,6 +139,8 @@
icon_state = "hos_skirt"
item_state = "r_suit"
item_color = "hos_skirt"
+ dyeable = TRUE
+ dyeing_key = DYE_REGISTRY_JUMPSKIRT
/obj/item/clothing/under/rank/security/head_of_security/corporate
icon_state = "hos_corporate"
diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm
index b8835808ded6..4899a039ea2f 100644
--- a/code/modules/events/prison_break.dm
+++ b/code/modules/events/prison_break.dm
@@ -46,7 +46,7 @@
var/my_department = "[station_name()] firewall subroutines"
var/rc_message = "An unknown malicious program has been detected in the [english_list(areaName)] lighting and airlock control systems at [station_time_timestamp()]. Systems will be fully compromised within approximately one minute. Direct intervention is required immediately.
"
for(var/obj/machinery/message_server/MS in GLOB.machines)
- MS.send_rc_message("Engineering", my_department, rc_message, "", "", 2)
+ MS.send_rc_message("Engineering", my_department, rc_message, "", "", RQ_HIGHPRIORITY)
else
stack_trace("Could not initiate grey-tide. Unable to find suitable containment area.")
kill()
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index a04d70958469..7d6e37d8fbf2 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -103,7 +103,7 @@
return
/turf/simulated/floor/vines/ex_act(severity)
- if(severity < 3)
+ if(severity < EXPLODE_LIGHT)
ChangeTurf(baseturf)
/turf/simulated/floor/vines/narsie_act()
@@ -209,7 +209,7 @@
nofun = TRUE
/datum/spacevine_mutation/explosive/on_explosion(explosion_severity, obj/structure/spacevine/holder)
- if(explosion_severity < 3)
+ if(explosion_severity < EXPLODE_LIGHT)
qdel(holder)
else
addtimer(CALLBACK(holder, TYPE_PROC_REF(/obj/structure/spacevine, wither)), 5)
diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm
index 0ad16bc77f52..1e423c119df4 100644
--- a/code/modules/food_and_drinks/food/foods/meat.dm
+++ b/code/modules/food_and_drinks/food/foods/meat.dm
@@ -429,7 +429,7 @@
/obj/item/food/egg/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/toy/crayon))
var/obj/item/toy/crayon/C = W
- var/clr = C.colourName
+ var/clr = C.dye_color
if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow")))
to_chat(usr, "The egg refuses to take on this color!")
diff --git a/code/modules/martial_arts/krav_maga.dm b/code/modules/martial_arts/krav_maga.dm
index 7900666883f9..0d096b05c83b 100644
--- a/code/modules/martial_arts/krav_maga.dm
+++ b/code/modules/martial_arts/krav_maga.dm
@@ -141,9 +141,10 @@
// Krav Maga gloves
/obj/item/clothing/gloves/color/black/krav_maga
- var/datum/martial_art/krav_maga/style
can_be_cut = FALSE
resistance_flags = NONE
+ dyeable = TRUE
+ var/datum/martial_art/krav_maga/style
/obj/item/clothing/gloves/color/black/krav_maga/Initialize()
. = ..()
@@ -170,6 +171,7 @@
desc = "These gloves can teach you to perform Krav Maga using nanochips for as long as you're wearing them."
icon_state = "fightgloves"
item_state = "fightgloves"
+ dyeable = FALSE
/obj/item/clothing/gloves/color/black/krav_maga/sec/Initialize(mapload)
. = ..()
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index e7aded9447f6..aa5e1bf52f30 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -58,6 +58,7 @@
armor = list(MELEE = 120, BULLET = 35, LASER = 25, ENERGY = 25, BOMB = 150, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/melee/spellblade)
hide_tail_by_species = list("Vox", "Vulpkanin", "Unathi", "Tajaran")
+ dyeable = FALSE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
@@ -118,6 +119,7 @@
max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ dyeable = FALSE
strip_delay = 60
put_on_delay = 60
resistance_flags = FIRE_PROOF
diff --git a/code/modules/mining/equipment/mining_charges.dm b/code/modules/mining/equipment/mining_charges.dm
index 25c7e0252a35..f4282fc2cd3b 100644
--- a/code/modules/mining/equipment/mining_charges.dm
+++ b/code/modules/mining/equipment/mining_charges.dm
@@ -107,7 +107,7 @@
location = get_atom_on_turf(src)
if(location)
explosion(location, boom_sizes[1], boom_sizes[2], boom_sizes[3], cause = src)
- location.ex_act(2, target)
+ location.ex_act(EXPLODE_HEAVY, target)
qdel(src)
/obj/item/grenade/plastic/miningcharge/proc/override_safety()
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index 6d21ffd940c1..4c0231627ee3 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -471,7 +471,7 @@
if(!(C.department in supply_consoles))
continue
if(!supply_consoles[C.department] || length(supply_consoles[C.department] - mats_in_stock))
- C.createMessage("Ore Redemption Machine", "New Minerals Available!", msg, RQ_NORMALPRIORITY)
+ C.createMessage("Ore Redemption Machine", "New Minerals Available!", msg, RQ_LOWPRIORITY)
/obj/machinery/mineral/ore_redemption/proc/try_refill_storage(mob/living/silicon/robot/robot)
. = FALSE
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 4f3da462c632..d7c5720588eb 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -288,7 +288,7 @@
/obj/machinery/mineral/equipment_vendor/ex_act(severity, target)
do_sparks(5, TRUE, src)
- if(prob(50 / severity) && severity < 3)
+ if(prob(50 / severity) && severity < EXPLODE_LIGHT)
qdel(src)
/obj/machinery/mineral/equipment_vendor/Destroy()
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 3f3260f874c1..fd4b2a3885ea 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -353,7 +353,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/ex_act(severity)
- if(!severity || severity >= 2)
+ if(!severity || severity >= EXPLODE_HEAVY)
return
qdel(src)
diff --git a/code/modules/mob/living/brain/robotic_brain.dm b/code/modules/mob/living/brain/robotic_brain.dm
index c9e6bc4e6725..0fd4dc8cdbc4 100644
--- a/code/modules/mob/living/brain/robotic_brain.dm
+++ b/code/modules/mob/living/brain/robotic_brain.dm
@@ -160,12 +160,10 @@
if(!brainmob)
return
switch(severity)
- if(1)
+ if(EMP_HEAVY)
brainmob.emp_damage += rand(20, 30)
- if(2)
+ if(EMP_LIGHT)
brainmob.emp_damage += rand(10, 20)
- if(3)
- brainmob.emp_damage += rand(0, 10)
..()
/obj/item/mmi/robotic_brain/New()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 7dd6b5182af1..a7209d9f643c 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -297,22 +297,26 @@
to_chat(src, "You are unable to succumb to death! This life continues!")
return
- var/last_words = tgui_input_text(src, "Do you have any last words?", "Goodnight, Sweet Prince", encode = FALSE)
+ last_words = null // In case we kept some from last time
+ var/final_words = tgui_input_text(src, "Do you have any last words?", "Goodnight, Sweet Prince", encode = FALSE)
- if(isnull(last_words) && cancel_on_no_words)
+ if(isnull(final_words) && cancel_on_no_words)
to_chat(src, "You decide you aren't quite ready to die.")
return
if(stat == DEAD)
- // cancel em out if they died while they had the message box up
- last_words = null
+ return
- if(!isnull(last_words))
+ if(health >= HEALTH_THRESHOLD_CRIT)
+ to_chat(src, "You are unable to succumb to death! This life continues!")
+ return
+
+ if(!isnull(final_words))
create_log(MISC_LOG, "gave their final words, [last_words]")
- src.last_words = last_words // sorry
- whisper(last_words)
+ last_words = final_words
+ whisper(final_words)
- add_attack_logs(src, src, "[src] has [!isnull(last_words) ? "whispered [p_their()] final words" : "succumbed to death"] with [round(health, 0.1)] points of health!")
+ add_attack_logs(src, src, "[src] has [!isnull(final_words) ? "whispered [p_their()] final words" : "succumbed to death"] with [round(health, 0.1)] points of health!")
create_log(MISC_LOG, "has succumbed to death with [round(health, 0.1)] points of health")
adjustOxyLoss(max(health - HEALTH_THRESHOLD_DEAD, 0))
@@ -322,7 +326,8 @@
if(health < HEALTH_THRESHOLD_DEAD)
break
take_overall_damage(max(5, health - HEALTH_THRESHOLD_DEAD), 0)
- if(!isnull(last_words))
+
+ if(!isnull(final_words))
addtimer(CALLBACK(src, PROC_REF(death)), 1 SECONDS)
else
death()
@@ -332,7 +337,6 @@
/mob/living/proc/InCritical()
return (health < HEALTH_THRESHOLD_CRIT && health > HEALTH_THRESHOLD_DEAD && stat == UNCONSCIOUS)
-
/mob/living/ex_act(severity)
..()
flash_eyes()
diff --git a/code/modules/mob/living/simple_animal/friendly/bunny.dm b/code/modules/mob/living/simple_animal/friendly/bunny.dm
index 38a58be7f5f4..fdb751512fbe 100644
--- a/code/modules/mob/living/simple_animal/friendly/bunny.dm
+++ b/code/modules/mob/living/simple_animal/friendly/bunny.dm
@@ -33,3 +33,7 @@
if(M.a_intent == INTENT_HELP)
get_scooped(M, TRUE)
..()
+
+/mob/living/simple_animal/bunny/syndi // for the syndicake factory bunny so its not being shot
+ faction = list("syndicate")
+ gold_core_spawnable = NO_SPAWN
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 04ba1742b51b..ae48d73f78bb 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -43,6 +43,9 @@
AddComponent(/datum/component/squeak, list('sound/creatures/mousesqueak.ogg' = 1), 100, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) //as quiet as a mouse or whatever
/mob/living/simple_animal/mouse/handle_automated_action()
+#ifdef UNIT_TESTS // DO NOT EAT MY CABLES DURING UNIT TESTS
+ return
+#endif
if(prob(chew_probability) && isturf(loc))
var/turf/simulated/floor/F = get_turf(src)
if(istype(F) && !F.intact)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
index 6e33ab51bc9c..75b18ec3ea1c 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
@@ -600,8 +600,8 @@ Difficulty: Hard
if(mode == VORTEX)
var/turf/T = get_turf(src)
for(var/atom/A in T)
- A.ex_act(3) //Body is immune to explosions of this strength.
- T.ex_act(3)
+ A.ex_act(EXPLODE_LIGHT) //Body is immune to explosions of this strength.
+ T.ex_act(EXPLODE_LIGHT)
if(mode == CRYO)
var/turf/simulated/S = get_turf(src)
S.MakeSlippery(TURF_WET_ICE, enraged ? rand(25, 35 SECONDS) : rand(10, 20 SECONDS))
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 9f41c32f4d7e..77946d7c0bfd 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -356,7 +356,7 @@ Difficulty: Very Hard
/obj/item/projectile/colossus/on_hit(atom/target, blocked = 0)
. = ..()
if(isturf(target) || isobj(target))
- target.ex_act(2)
+ target.ex_act(EXPLODE_HEAVY)
for(var/obj/machinery/light/L in range(2, src))
L.break_light_tube(0, 1) //No leaving lights floating their as colossus breaks the station
if(isliving(target))
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
index 2807b0860eea..1b9db4ba39a7 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
@@ -89,6 +89,7 @@
melee_damage_lower = 15
melee_damage_upper = 15
deathmessage = null
+ gold_core_spawnable = NO_SPAWN
/mob/living/simple_animal/hostile/retaliate/skeleton/warden/Process_Spacemove(movement_dir)
return TRUE
@@ -109,6 +110,7 @@
melee_damage_lower = 30
melee_damage_upper = 30
loot = list(/obj/effect/decal/remains/human, /obj/item/clothing/head/warden, /obj/item/card/sec_shuttle_ruin)
+ gold_core_spawnable = NO_SPAWN
/mob/living/simple_animal/hostile/skeleton/angered_warden/Process_Spacemove(movement_dir)
return TRUE
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index 3c41d1ba3b93..af4e47587a8d 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -455,7 +455,7 @@
. = ..()
if(!active || !wearer)
return
- to_chat(wearer, "[severity > 1 ? "Light" : "Strong"] electromagnetic pulse detected!")
+ to_chat(wearer, "[severity > EMP_HEAVY ? "Light" : "Strong"] electromagnetic pulse detected!")
if(emp_proof)
return
selected_module?.on_deactivation(display_message = TRUE)
diff --git a/code/modules/ninja/suit/ninja_suit.dm b/code/modules/ninja/suit/ninja_suit.dm
index c15f5f0cff17..47d7fbe3c904 100644
--- a/code/modules/ninja/suit/ninja_suit.dm
+++ b/code/modules/ninja/suit/ninja_suit.dm
@@ -15,6 +15,7 @@ Contents:
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/melee/baton, /obj/item/tank/internals, /obj/item/stock_parts/cell)
slowdown = 0
armor = list(MELEE = 75, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 15, FIRE = INFINITY, ACID = INFINITY)
+ dyeable = FALSE
var/suitActive = 0
var/suitBusy = 0
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index eef2ba38905a..fa7aa75d6f23 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -73,10 +73,20 @@
P = papers[length(papers)]
papers.Remove(P)
else
- if(letterhead_type && alert("Choose a style", null,"Letterhead","Blank")=="Letterhead")
- P = new letterhead_type
- else
- P = new /obj/item/paper
+ var/choice = tgui_alert(user, "Choose a style", "Paperbin", list("Letterhead", "Blank", "Cancel"))
+ if(isnull(choice) || !Adjacent(user))
+ return
+ switch(choice)
+ if("Letterhead")
+ P = new letterhead_type
+ if("Blank")
+ P = new /obj/item/paper
+ if("Cancel")
+ return
+
+ if(isnull(P))
+ return
+
if(SSholiday.holidays && SSholiday.holidays[APRIL_FOOLS])
if(prob(30))
P.info = "HONK HONK HONK HONK HONK HONK HONK
HOOOOOOOOOOOOOOOOOOOOOONK
APRIL FOOLS"
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index bb1c9ef9e2a0..fa2503b390f1 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -12,6 +12,8 @@
item_color = "cargo"
pressure_resistance = 2
attack_verb = list("stamped")
+ /// What color will this crayon dye clothes, cables, etc? used for for updateIcon purposes on other objs
+ var/dye_color = DYE_GREEN
/obj/item/stamp/suicide_act(mob/user)
user.visible_message("[user] stamps 'VOID' on [user.p_their()] forehead, then promptly falls over, dead.")
@@ -22,74 +24,89 @@
name = "Quartermaster's rubber stamp"
icon_state = "stamp-qm"
item_color = "qm"
+ dye_color = DYE_QM
/obj/item/stamp/law
name = "Law office's rubber stamp"
icon_state = "stamp-law"
item_color = "cargo"
+ dye_color = DYE_LAW
/obj/item/stamp/captain
name = "captain's rubber stamp"
icon_state = "stamp-cap"
item_color = "captain"
+ dye_color = DYE_CAPTAIN
/obj/item/stamp/hop
name = "head of personnel's rubber stamp"
icon_state = "stamp-hop"
item_color = "hop"
+ dye_color = DYE_HOP
/obj/item/stamp/hos
name = "head of security's rubber stamp"
icon_state = "stamp-hos"
item_color = "hosred"
+ dye_color = DYE_HOS
/obj/item/stamp/ce
name = "chief engineer's rubber stamp"
icon_state = "stamp-ce"
item_color = "chief"
+ dye_color = DYE_CE
/obj/item/stamp/rd
name = "research director's rubber stamp"
icon_state = "stamp-rd"
item_color = "director"
+ dye_color = DYE_RD
/obj/item/stamp/cmo
name = "chief medical officer's rubber stamp"
icon_state = "stamp-cmo"
item_color = "medical"
+ dye_color = DYE_CMO
/obj/item/stamp/granted
name = "\improper GRANTED rubber stamp"
icon_state = "stamp-ok"
item_color = "qm"
+ dye_color = DYE_GREEN
/obj/item/stamp/denied
name = "\improper DENIED rubber stamp"
icon_state = "stamp-deny"
item_color = "redcoat"
+ dye_color = DYE_RED
/obj/item/stamp/clown
name = "clown's rubber stamp"
icon_state = "stamp-clown"
item_color = "clown"
+ dye_color = DYE_CLOWN
/obj/item/stamp/rep
name = "Nanotrasen Representative's rubber stamp"
icon_state = "stamp-rep"
item_color = "rep"
+ dye_color = DYE_NTREP
/obj/item/stamp/magistrate
name = "Magistrate's rubber stamp"
icon_state = "stamp-magistrate"
item_color = "rep"
+ dye_color = DYE_LAW
/obj/item/stamp/centcom
name = "Central Command rubber stamp"
icon_state = "stamp-cent"
item_color = "centcom"
+ dye_color = DYE_CENTCOM
/obj/item/stamp/syndicate
name = "suspicious rubber stamp"
icon_state = "stamp-syndicate"
item_color = "syndicate"
+ dye_color = DYE_SYNDICATE
diff --git a/code/modules/power/cables/cable.dm b/code/modules/power/cables/cable.dm
index 18d73085e04c..685e1f8a97e0 100644
--- a/code/modules/power/cables/cable.dm
+++ b/code/modules/power/cables/cable.dm
@@ -104,7 +104,7 @@ By design, d1 is the smallest direction and d2 is the highest
else if(istype(W, /obj/item/toy/crayon))
var/obj/item/toy/crayon/C = W
- cable_color(C.colourName)
+ cable_color(C.dye_color)
else
if(W.flags & CONDUCT)
diff --git a/code/modules/power/cables/cable_coil.dm b/code/modules/power/cables/cable_coil.dm
index 00d9767cea90..6303624dce41 100644
--- a/code/modules/power/cables/cable_coil.dm
+++ b/code/modules/power/cables/cable_coil.dm
@@ -151,7 +151,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain
if(istype(W, /obj/item/toy/crayon))
var/obj/item/toy/crayon/C = W
- cable_color(C.colourName)
+ cable_color(C.dye_color)
///////////////////////////////////////////////
// Cable laying procedures
diff --git a/code/modules/power/engines/singularity/narsie.dm b/code/modules/power/engines/singularity/narsie.dm
index 60025759c816..2b95264f1b3f 100644
--- a/code/modules/power/engines/singularity/narsie.dm
+++ b/code/modules/power/engines/singularity/narsie.dm
@@ -84,7 +84,7 @@
/obj/singularity/narsie/proc/godsmack(atom/A)
if(isobj(A))
var/obj/O = A
- O.ex_act(1)
+ O.ex_act(EXPLODE_DEVASTATE)
if(O) qdel(O)
else if(isturf(A))
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index c4100ee12ac9..f91169d26b17 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -25,7 +25,7 @@ GLOBAL_LIST_EMPTY(gravity_generators)
flags_2 = NO_MALF_EFFECT_2
/obj/machinery/gravity_generator/ex_act(severity)
- if(severity == 1) // Very sturdy.
+ if(severity == EXPLODE_DEVASTATE) // Very sturdy.
set_broken()
/obj/machinery/gravity_generator/blob_act(obj/structure/blob/B)
diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm
index 6c5836846ce9..1c19cb35602c 100644
--- a/code/modules/projectiles/guns/medbeam.dm
+++ b/code/modules/projectiles/guns/medbeam.dm
@@ -137,7 +137,7 @@
/obj/item/gun/medbeam/damaged
name = "damaged beamgun"
- desc = "Delivers volatile medical nanites in a focused beam. Don't cross the beams! It is damaged and will rapidly overheat."
+ desc = "Delivers volatile medical nanites in a focused beam. Don't cross the beams!"
///How hot the beamgun is, if it hits max heat it will break
var/current_heat = 0
///How much heat the beamgun needs to break
@@ -157,10 +157,10 @@
/obj/item/gun/medbeam/damaged/examine(mob/user) //The 8 Trials of Asclepius
. = ..()
- if(!broken)
- return
-
- . += "It is broken, and will not function without repairs."
+ . += "This ones cooling systems are damaged beyond repair, and will overheat rapidly. \
+ Despite the damaged cooling system, it's still mostly functional. However, if overheated, it will need to be repaired."
+ if(broken)
+ . += "It is broken, and will not function without repairs."
switch(broken)
if(SCREWDRIVER_OPEN)
. += "The panel can be screwed open to access the internals."
@@ -179,6 +179,19 @@
if(SCREWDRIVER_CLOSED)
. += "The panel needs to be screwed shut before it is usable."
+ if(!in_range(src, user))
+ return
+ var/heat_percent = (current_heat / max_heat) * 100
+ switch(heat_percent)
+ if(20 to 39)
+ . += "[src] feels warm."
+ if(40 to 59)
+ . += "[src] feels hot."
+ if(60 to 74) // i want it to be in the 'smoke' range at ~40 heat so as magic smoke is sudden but quick reaction time can stop it
+ . += "[src] is so hot it hurts to hold."
+ if(75 to INFINITY)
+ . += "[src] is emitting its magic smoke and is practically melting."
+
/obj/item/gun/medbeam/damaged/process()
. = ..()
if(current_target)
@@ -197,6 +210,8 @@
if(current_heat >= max_heat)
user.visible_message("[src] pops as it shuts off!", "[src] pops and hisses as it shuts off. It is broken.")
broken = SCREWDRIVER_OPEN
+ playsound(src, 'sound/effects/snap.ogg', 70, TRUE) // that didn't sound good...
+ user.adjustFireLoss(30) // you do NOT want to be holding this if it breaks. 5 more damage than hive lord cores heal, so not /thattt/ bad
user.adjust_fire_stacks(20)
user.IgniteMob()
LoseTarget()
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 28472534504e..9383e23d3bda 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -134,7 +134,7 @@
icon_state = "[initial(icon_state)][beaker ? "_working" : ""]"
/obj/machinery/chem_dispenser/ex_act(severity)
- if(severity < 3)
+ if(severity < EXPLODE_LIGHT)
if(beaker)
beaker.ex_act(severity)
..()
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 6f6feaa4bfb2..cb935663a69b 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -78,7 +78,7 @@
reagents.maximum_volume += B.reagents.maximum_volume
/obj/machinery/chem_master/ex_act(severity)
- if(severity < 3)
+ if(severity < EXPLODE_LIGHT)
if(beaker)
beaker.ex_act(severity)
if(loaded_pill_bottle)
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 8987a3064d07..c8627d290a1e 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -503,8 +503,8 @@
// timed process
// charge the gas reservoir and perform flush if ready
/obj/machinery/disposal/process()
- change_power_mode(NO_POWER_USE)
if(stat & BROKEN) // nothing can happen if broken
+ change_power_mode(NO_POWER_USE)
return
flush_count++
@@ -523,20 +523,17 @@
if(stat & NOPOWER) // won't charge if no power
return
- change_power_mode(IDLE_POWER_USE)
-
if(mode != DISPOSALS_RECHARGING) // if off or ready, no need to charge
return
- // otherwise charge
- change_power_mode(ACTIVE_POWER_USE)
+ change_power_mode(IDLE_POWER_USE) // only start using power when we're sucking in air
var/datum/milla_safe/disposal_suck_air/milla = new()
milla.invoke_async(src)
// perform a flush
/obj/machinery/disposal/proc/flush()
-
+ change_power_mode(ACTIVE_POWER_USE)
flushing = 1
flick("[icon_state]-flush", src)
@@ -571,6 +568,9 @@
flush = 0
if(mode == DISPOSALS_CHARGED) // if was ready,
mode = DISPOSALS_RECHARGING // switch to charging
+ change_power_mode(IDLE_POWER_USE)
+ else
+ change_power_mode(NO_POWER_USE)
update()
return
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index 0777506e95e0..da7d4845ae92 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -82,7 +82,7 @@ GLOBAL_LIST_EMPTY(message_servers)
/obj/machinery/message_server/proc/send_pda_message(recipient = "", sender = "", message = "")
pda_msgs += new/datum/data_pda_msg(recipient,sender,message)
-/obj/machinery/message_server/proc/send_rc_message(recipient = "", sender = "", message = list(), stamp = "Not stamped", id_auth = "Not verified", priority = 1)
+/obj/machinery/message_server/proc/send_rc_message(recipient = "", sender = "", message = list(), stamp = "Not stamped", id_auth = "Not verified", priority = RQ_NORMALPRIORITY)
if(!islist(message))
message = list(message)
rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth)
@@ -91,7 +91,7 @@ GLOBAL_LIST_EMPTY(message_servers)
if(ckey(RC.department) == ckey(recipient))
var/title
switch(priority)
- if(2)
+ if(RQ_HIGHPRIORITY)
title = "PRIORITY Alert from [sender]"
else
title = "Message from [sender]"
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 3afeee8ec9f1..a18849260505 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -688,7 +688,7 @@
SEND_SOUND(M, loud_crash_sound)
for(var/turf/T in L2)
for(var/atom/movable/A in T.contents)
- A.ex_act(1)
+ A.ex_act(EXPLODE_DEVASTATE)
if(istype(A, /obj/machinery/atmospherics/supermatter_crystal))
var/obj/machinery/atmospherics/supermatter_crystal/bakoom = A
addtimer(CALLBACK(bakoom, TYPE_PROC_REF(/obj/machinery/atmospherics/supermatter_crystal, explode), bakoom.combined_gas, bakoom.power, bakoom.gasmix_power_ratio), 1 SECONDS)
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index 3c9ce4f80ebe..b1ad0956c0b1 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -198,9 +198,9 @@
/obj/machinery/bsa/full/proc/fire(mob/user, turf/bullseye, target)
var/turf/point = get_front_turf()
for(var/turf/T in get_line(get_step(point,dir),get_target_turf()))
- T.ex_act(1)
+ T.ex_act(EXPLODE_DEVASTATE)
for(var/atom/A in T)
- A.ex_act(1)
+ A.ex_act(EXPLODE_DEVASTATE)
point.Beam(get_target_turf(), icon_state = "bsa_beam", time = 50, maxdistance = world.maxx, beam_type = /obj/effect/ebeam/deadly) //ZZZAP
playsound(src, 'sound/machines/bsa_fire.ogg', 100, 1)
diff --git a/code/modules/vote/vote_datum.dm b/code/modules/vote/vote_datum.dm
index f2e5ce30a598..40130afd0130 100644
--- a/code/modules/vote/vote_datum.dm
+++ b/code/modules/vote/vote_datum.dm
@@ -88,7 +88,7 @@
for(var/res in results)
if(res in winning_options)
// Make it stand out
- to_chat(world, "[res] - [results[res]] vote\s")
+ to_chat(world, "[res] - [results[res]] vote\s")
else
// Make it normal
to_chat(world, "[res] - [results[res]] vote\s")
diff --git a/config/example/config.toml b/config/example/config.toml
index 7956ba0c4353..51de589eaafd 100644
--- a/config/example/config.toml
+++ b/config/example/config.toml
@@ -180,7 +180,7 @@ ipc_screens = [
# Enable/disable the database on a whole
sql_enabled = false
# SQL version. If this is a mismatch, round start will be delayed
-sql_version = 592206
+sql_version = 592207
# SQL server address. Can be an IP or DNS name
sql_address = "127.0.0.1"
# SQL server port
diff --git a/icons/obj/assemblies/new_assemblies.dmi b/icons/obj/assemblies/new_assemblies.dmi
index 8d84ede8163f..de0967dbe3c6 100644
Binary files a/icons/obj/assemblies/new_assemblies.dmi and b/icons/obj/assemblies/new_assemblies.dmi differ
diff --git a/icons/obj/machines/washing_machine.dmi b/icons/obj/machines/washing_machine.dmi
index d88bddb5752e..581e11496fcd 100644
Binary files a/icons/obj/machines/washing_machine.dmi and b/icons/obj/machines/washing_machine.dmi differ
diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi
index 4c5424698396..c46385244658 100644
Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ
diff --git a/icons/obj/terminals.dmi b/icons/obj/terminals.dmi
index d11daf8608d9..3b4195ee8ff4 100644
Binary files a/icons/obj/terminals.dmi and b/icons/obj/terminals.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index 4b8c267a1493..00a5708f15ec 100755
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/modular_ss220/_defines220/_defines220.dme b/modular_ss220/_defines220/_defines220.dme
index 3c297f31f9fb..777827a0cb81 100644
--- a/modular_ss220/_defines220/_defines220.dme
+++ b/modular_ss220/_defines220/_defines220.dme
@@ -19,3 +19,4 @@
#include "code/emote.dm"
#include "code/lists_TG.dm"
#include "code/species.dm"
+#include "code/preferences_defines.dm"
diff --git a/modular_ss220/_defines220/code/preferences_defines.dm b/modular_ss220/_defines220/code/preferences_defines.dm
new file mode 100644
index 000000000000..fef827769a2b
--- /dev/null
+++ b/modular_ss220/_defines220/code/preferences_defines.dm
@@ -0,0 +1,5 @@
+#define PREFTOGGLE_220_WATCH_CREDITS (1<<0) // 1
+
+#define TOGGLES_220_TOTAL 1 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined.
+
+#define TOGGLES_220_DEFAULT (PREFTOGGLE_220_WATCH_CREDITS)
diff --git a/modular_ss220/cinematics/code/_cinematics.dm b/modular_ss220/cinematics/code/_cinematics.dm
index 1a1e11ad558b..c2c3fc4f74dc 100644
--- a/modular_ss220/cinematics/code/_cinematics.dm
+++ b/modular_ss220/cinematics/code/_cinematics.dm
@@ -121,6 +121,10 @@
if(!watching_client || (watching_client in watching))
return
+ // Do not show credits if it's disabled for the client and not forced.
+ if(istype(src, /datum/cinematic/credits) && !GLOB.credits_forced && !(watching_client.prefs.toggles220 & PREFTOGGLE_220_WATCH_CREDITS))
+ return
+
watching += watching_client
watching_mob.overlay_fullscreen("cinematic", backdrop_type)
watching_client.screen += screen
diff --git a/modular_ss220/credits/_credits.dm b/modular_ss220/credits/_credits.dm
index 429b361afbf2..ddace1d105dc 100644
--- a/modular_ss220/credits/_credits.dm
+++ b/modular_ss220/credits/_credits.dm
@@ -2,3 +2,8 @@
name = "Credits"
desc = "Добавление титров в конце раунда, основа кода была взята из данного репозитория https://github.com/Baystation12/Baystation12"
author = "Legendaxe"
+
+/datum/modpack/credits/initialize()
+ GLOB.admin_verbs_admin += list(
+ /client/proc/toggle_credits
+ )
diff --git a/modular_ss220/credits/_credits.dme b/modular_ss220/credits/_credits.dme
index 4a58d90cf3c9..7d1b97946084 100644
--- a/modular_ss220/credits/_credits.dme
+++ b/modular_ss220/credits/_credits.dme
@@ -1,5 +1,6 @@
#include "code\SScredits.dm"
#include "code\credits.dm"
+#include "code\admin_procs.dm"
#include "code\halloween_credits.dm"
#include "code\new_year_credits.dm"
#include "code\aprils_fool_credits.dm"
diff --git a/modular_ss220/credits/code/admin_procs.dm b/modular_ss220/credits/code/admin_procs.dm
new file mode 100644
index 000000000000..42c90fdc8f9e
--- /dev/null
+++ b/modular_ss220/credits/code/admin_procs.dm
@@ -0,0 +1,20 @@
+// Force everyone to watch credits?
+GLOBAL_VAR_INIT(credits_forced, FALSE)
+
+/client/proc/toggle_credits()
+ set category = "Server"
+ set desc = "Просмотр титров по окончании раунда"
+ set name = "Toggle Credits"
+
+ if(!check_rights(R_ADMIN))
+ return
+
+ GLOB.credits_forced = !GLOB.credits_forced
+ if(GLOB.credits_forced)
+ to_chat(world, "Все будут смотреть титры по окончании раунда.")
+ message_admins("[key_name_admin(usr)] устанавливает принудительные титры.", 1)
+ else
+ to_chat(world, "Игроки будут смотреть титры в зависимости от своих настроек.")
+ message_admins("[key_name_admin(usr)] устанавливает титры по умолчанию.", 1)
+ log_admin("[key_name(usr)] toggled credits.")
+ SSblackbox.record_feedback("tally", "admin_verb", 1, "Toggle Credits")
diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme
index 53c82fc422f6..3a61d9ef6079 100644
--- a/modular_ss220/modular_ss220.dme
+++ b/modular_ss220/modular_ss220.dme
@@ -39,6 +39,7 @@
// --- MISC --- //
#include "administration/_administration.dme"
+#include "preferences/_preferences.dme"
#include "aesthetics_sounds/_aesthetics_sounds.dme"
#include "agent_id_tgui/_agent_id_tgui.dme"
#include "balance/_balance.dme"
diff --git a/modular_ss220/preferences/_preferences.dm b/modular_ss220/preferences/_preferences.dm
new file mode 100644
index 000000000000..13404d8e8a5a
--- /dev/null
+++ b/modular_ss220/preferences/_preferences.dm
@@ -0,0 +1,4 @@
+/datum/modpack/preferences
+ name = "Кастомные настройки"
+ desc = "Игровые настройки, разработанные для проекта"
+ author = "Maxiemar"
diff --git a/modular_ss220/preferences/_preferences.dme b/modular_ss220/preferences/_preferences.dme
new file mode 100644
index 000000000000..4a65419c8dd1
--- /dev/null
+++ b/modular_ss220/preferences/_preferences.dme
@@ -0,0 +1,4 @@
+#include "_preferences.dm"
+
+#include "code/preferences.dm"
+#include "code/preferences_toggles.dm"
diff --git a/modular_ss220/preferences/code/preferences.dm b/modular_ss220/preferences/code/preferences.dm
new file mode 100644
index 000000000000..cc4df2865aa0
--- /dev/null
+++ b/modular_ss220/preferences/code/preferences.dm
@@ -0,0 +1,59 @@
+/datum/preferences
+ var/toggles220 = TOGGLES_220_DEFAULT
+
+/datum/preferences/load_preferences(datum/db_query/query)
+ . = ..()
+ if(!.)
+ return
+
+ return load_custom_preferences()
+
+/datum/preferences/save_preferences(client/C)
+ . = ..()
+ if(!.)
+ return
+
+ return save_custom_preferences(C)
+
+/datum/preference_toggle/set_toggles(client/user)
+ var/datum/preferences/our_prefs = user.prefs
+ switch(preftoggle_toggle)
+ if(PREFTOGGLE_TOGGLE220)
+ our_prefs.toggles220 ^= preftoggle_bitflag
+ to_chat(user, "[(our_prefs.toggles220 & preftoggle_bitflag) ? enable_message : disable_message]")
+ . = ..()
+
+/datum/preferences/proc/load_custom_preferences()
+ var/datum/db_query/preferences_query = SSdbcore.NewQuery({"SELECT
+ toggles
+ FROM player_220
+ WHERE ckey=:ckey"}, list(
+ "ckey" = parent.ckey
+ ))
+
+ if(!preferences_query.warn_execute())
+ qdel(preferences_query)
+ return FALSE
+
+ while(preferences_query.NextRow())
+ toggles220 = preferences_query.item[1]
+
+ toggles220 = sanitize_integer(toggles220, 0, TOGGLES_220_TOTAL, initial(toggles220))
+
+ qdel(preferences_query)
+ return TRUE
+
+/datum/preferences/proc/save_custom_preferences(client/C)
+ var/datum/db_query/query = SSdbcore.NewQuery({"UPDATE player_220 SET
+ toggles=:toggles
+ WHERE ckey=:ckey"}, list(
+ "toggles" = num2text(toggles220, CEILING(log(10, (TOGGLES_220_TOTAL)), 1)),
+ "ckey" = C.ckey,
+ ))
+
+ if(!query.warn_execute())
+ qdel(query)
+ return FALSE
+
+ qdel(query)
+ return TRUE
diff --git a/modular_ss220/preferences/code/preferences_toggles.dm b/modular_ss220/preferences/code/preferences_toggles.dm
new file mode 100644
index 000000000000..473738f2bdc0
--- /dev/null
+++ b/modular_ss220/preferences/code/preferences_toggles.dm
@@ -0,0 +1,9 @@
+/datum/preference_toggle/toggle_credits
+ name = "Показывать титры"
+ description = "Показывать титры по окончании раунда"
+ preftoggle_bitflag = PREFTOGGLE_220_WATCH_CREDITS
+ preftoggle_toggle = PREFTOGGLE_TOGGLE220
+ preftoggle_category = PREFTOGGLE_CATEGORY_LIVING
+ enable_message = "Вы будете видеть титры в конце раундов."
+ disable_message = "Вы не будете видеть титры в конце раундов."
+ blackbox_message = "Toggle Credits"
diff --git a/paradise.dme b/paradise.dme
index 0417593d32ab..1bc9cc1362c5 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -56,6 +56,7 @@
#include "code\__DEFINES\departments_defines.dm"
#include "code\__DEFINES\directions.dm"
#include "code\__DEFINES\dna.dm"
+#include "code\__DEFINES\dye_keys.dm"
#include "code\__DEFINES\economy_defines.dm"
#include "code\__DEFINES\economy_event_defines.dm"
#include "code\__DEFINES\emotes_defines.dm"
@@ -201,6 +202,7 @@
#include "code\_globalvars\mapping_vars.dm"
#include "code\_globalvars\misc_globals.dm"
#include "code\_globalvars\traits.dm"
+#include "code\_globalvars\lists\dye_registry.dm"
#include "code\_globalvars\lists\flavor_misc.dm"
#include "code\_globalvars\lists\fortunes.dm"
#include "code\_globalvars\lists\keybindings_lists.dm"
@@ -1032,6 +1034,7 @@
#include "code\game\objects\items\decorations.dm"
#include "code\game\objects\items\dehy_carp.dm"
#include "code\game\objects\items\documents.dm"
+#include "code\game\objects\items\dyeing.dm"
#include "code\game\objects\items\flag.dm"
#include "code\game\objects\items\hand_item.dm"
#include "code\game\objects\items\his_grace.dm"
diff --git a/strings/sillytips.txt b/strings/sillytips.txt
index 2e7e8aed46d5..a68119ba1490 100644
--- a/strings/sillytips.txt
+++ b/strings/sillytips.txt
@@ -31,3 +31,4 @@ Cleanbot.
ХОНК.
Соляры, вероятно, дают радиационное отравление или что-то в этом роде, учитывая, что другие источники энергии смертельно опасны по-своему.
НТ любезно напоминает вам что популярное "Дедсквад" шоу является полностью выдуманым. Дедсквада не существует в реальной жизни. Любые попытки доказать обратное являются основанием к немедленной ликвидации.
+Ходят слухи, что мех можно перекрасить в стиральных машинах, добавив до стирки цветной мелок.
\ No newline at end of file
diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js
index cdfca3033a22..632b0705cb4e 100644
--- a/tgui/packages/tgui-panel/chat/constants.js
+++ b/tgui/packages/tgui-panel/chat/constants.js
@@ -84,7 +84,7 @@ export const MESSAGE_TYPES = [
type: MESSAGE_TYPE_OOC,
name: 'OOC',
description: 'The bluewall of global OOC messages',
- selector: '.ooc, .adminooc',
+ selector: '.ooc, .adminooc, .interface',
},
{
type: MESSAGE_TYPE_ADMINPM,
diff --git a/tgui/packages/tgui/interfaces/RequestConsole.js b/tgui/packages/tgui/interfaces/RequestConsole.js
index 83cf3698f38f..a116a43dc56f 100644
--- a/tgui/packages/tgui/interfaces/RequestConsole.js
+++ b/tgui/packages/tgui/interfaces/RequestConsole.js
@@ -2,6 +2,11 @@ import { useBackend } from '../backend';
import { Button, LabeledList, Box, Section, Stack, Blink } from '../components';
import { Window } from '../layouts';
+const RQ_NONEW_MESSAGES = 0;
+const RQ_LOWPRIORITY = 1;
+const RQ_NORMALPRIORITY = 2;
+const RQ_HIGHPRIORITY = 3;
+
export const RequestConsole = (props, context) => {
const { act, data } = useBackend(context);
const { screen, announcementConsole } = data;
@@ -52,13 +57,13 @@ const MainMenu = (props, context) => {
const { act, data } = useBackend(context);
const { newmessagepriority, announcementConsole, silent } = data;
let messageInfo;
- if (newmessagepriority === 1) {
+ if (newmessagepriority >= RQ_NONEW_MESSAGES) {
messageInfo = (
There are new messages
);
- } else if (newmessagepriority === 2) {
+ } else if (newmessagepriority === RQ_HIGHPRIORITY) {
messageInfo = (