diff --git a/.github/labeler.yml b/.github/labeler.yml
index 55b0ba3015af..5b585de45322 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,49 +1,67 @@
Admin:
- - "code/modules/admin/**"
+ - any-glob-to-any-file:
+ - "code/modules/admin/**"
# Any file within the config subfolder
Config:
- - "config/**"
+- changed-files:
+ - any-glob-to-any-file:
+ - "config/**"
Dependencies:
- - "**/package.json"
- - "**/package-lock.json"
- - "**/yarn.lock"
+- changed-files:
+ - any-glob-to-any-file:
+ - "**/package.json"
+ - "**/package-lock.json"
+ - "**/yarn.lock"
# When the .DME is changed
DME Edit:
- - "./*.dme"
- - "**/*.dme"
+- changed-files:
+ - any-glob-to-any-file:
+ - "./*.dme"
+ - "**/*.dme"
# Any .dmi changes
Sprites:
- - "**/*.dmi"
+- changed-files:
+ - any-glob-to-any-file:
+ - "**/*.dmi"
# Changes to a .dm or anything in the code subfolder
Code Change:
- - "**/*.dm"
- - "code/**"
+- changed-files:
+ - any-glob-to-any-file:
+ - "**/*.dm"
+ - "code/**"
# Changes to a .dmm or anything in the _map subfolder
Map Change:
- - "**/*.dmm"
- - "_maps/**"
+- changed-files:
+ - any-glob-to-any-file:
+ - "**/*.dmm"
+ - "_maps/**"
# Any changes to .ogg files are marked as sound
Sound:
- - "**/*.ogg"
+- changed-files:
+ - any-glob-to-any-file:
+ - "**/*.ogg"
# Changes to the SQL subfolder
SQL:
- - "SQL/**"
+- changed-files:
+ - any-glob-to-any-file:
+ - "SQL/**"
# Changes to the tgui subfolder
tgui:
- - "tgui/**"
+- changed-files:
+ - any-glob-to-any-file:
+ - "tgui/**"
# Changes to the .Github subfolder
Github:
- - ".github/**"
-
-Deprecated Modularization:
- - "whitesands/**"
+- changed-files:
+ - any-glob-to-any-file:
+ - ".github/**"
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index aea88c49e9fa..dc3a206fe385 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -18,7 +18,7 @@ jobs:
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
- name: Apply labels based on changed files
if: github.event_name != 'push'
- uses: actions/labeler@main
+ uses: actions/labeler@v5
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
sync-labels: true
diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
index c0fc2fcfc956..8758474983c4 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -5624,8 +5624,8 @@
/area/overmap_encounter/planetoid/jungle/explored)
"LM" = (
/obj/structure/closet,
-/obj/item/clothing/suit/aclf,
-/obj/item/clothing/under/syndicate/aclf,
+/obj/item/clothing/suit/gorlex,
+/obj/item/clothing/under/syndicate/officer,
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
@@ -7308,8 +7308,8 @@
"XC" = (
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/vomit/old,
-/obj/item/clothing/under/syndicate/aclf,
-/obj/item/clothing/suit/aclf,
+/obj/item/clothing/under/syndicate/officer,
+/obj/item/clothing/suit/gorlex,
/obj/item/clothing/shoes/combat,
/turf/open/floor/mineral/plastitanium,
/area/ruin/jungle/starport/tower)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
deleted file mode 100644
index 3f6744665feb..000000000000
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
+++ /dev/null
@@ -1,2942 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aB" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"aK" = (
-/obj/machinery/autolathe,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/trimline/opaque/white/line{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"aT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/trimline/opaque/purple/line{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"aY" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/effect/turf_decal/trimline/opaque/blue/line,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"bs" = (
-/obj/machinery/mineral/ore_redemption{
- input_dir = 2;
- output_dir = 1
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"bv" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/ore_box,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"bx" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/box/corners{
- dir = 1
- },
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"bI" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/mineral/titanium/blue,
-/area/ruin/powered/golem_ship)
-"bR" = (
-/obj/structure/rack,
-/obj/item/shovel,
-/obj/item/shovel{
- pixel_x = 5
- },
-/obj/item/shovel{
- pixel_x = 10
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/yellow/line,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"cp" = (
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"cD" = (
-/obj/structure/fans/tiny,
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
- },
-/obj/machinery/door/airlock/external,
-/obj/effect/decal/cleanable/blood/tracks,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"dc" = (
-/obj/structure/shuttle/engine/propulsion{
- dir = 8
- },
-/turf/open/floor/plating{
- initial_gas_mix = "LAVALAND_ATMOS"
- },
-/area/ruin/powered/golem_ship)
-"di" = (
-/obj/structure/closet/crate,
-/obj/item/storage/bag/ore,
-/obj/item/flashlight/lantern,
-/obj/item/pickaxe,
-/obj/item/shovel,
-/obj/item/mining_scanner,
-/obj/item/card/id/mining,
-/obj/item/clothing/head/hardhat/mining,
-/obj/effect/turf_decal/trimline/opaque/yellow/line,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"dq" = (
-/obj/machinery/shower{
- dir = 8
- },
-/turf/open/floor/plasteel/freezer,
-/area/ruin/powered/golem_ship)
-"dr" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/opaque/white/line{
- dir = 6
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"dt" = (
-/obj/machinery/light/small/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/turf/open/floor/mineral/titanium/blue,
-/area/ruin/powered/golem_ship)
-"dv" = (
-/obj/item/soap,
-/obj/machinery/shower{
- dir = 8
- },
-/turf/open/floor/plasteel/freezer,
-/area/ruin/powered/golem_ship)
-"dy" = (
-/obj/structure/closet/crate,
-/obj/item/storage/bag/ore,
-/obj/item/flashlight/lantern,
-/obj/item/pickaxe,
-/obj/item/shovel,
-/obj/item/mining_scanner,
-/obj/item/card/id/mining,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/head/hardhat/mining,
-/obj/machinery/light/small/directional/south,
-/obj/effect/turf_decal/trimline/opaque/yellow/line,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"dF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/obj/structure/closet/crate,
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"ea" = (
-/obj/machinery/light/small/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"ee" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/opaque/white/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"ep" = (
-/obj/machinery/light/small/directional/south,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/white/line,
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"eA" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/arrow_cw,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"eG" = (
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/opaque/purple/line{
- dir = 10
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"fi" = (
-/obj/machinery/door/airlock/titanium,
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
- },
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"fy" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"fK" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
- },
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/door/airlock/mining,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"fL" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/opaque/white/line,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"fQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/yellow/corner{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/opaque/yellow/corner{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"fS" = (
-/obj/effect/turf_decal/industrial/warning/corner{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/button/door{
- id = "golemloading";
- name = "Cargo Blast Door Control";
- pixel_x = -5;
- pixel_y = -25
- },
-/obj/effect/turf_decal/trimline/opaque/yellow/arrow_cw{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"gg" = (
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"gn" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/trimline/opaque/purple/line{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"gs" = (
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plating,
-/area/ruin/powered/golem_ship)
-"gz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants{
- icon_state = "plant-22"
- },
-/obj/effect/turf_decal/box/corners,
-/obj/effect/turf_decal/trimline/opaque/blue/corner{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"gT" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"hu" = (
-/obj/structure/rack,
-/obj/item/pickaxe{
- pixel_x = -10
- },
-/obj/item/pickaxe{
- pixel_x = -5
- },
-/obj/item/pickaxe,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/yellow/line,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"hN" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"hS" = (
-/obj/structure/mirror{
- pixel_y = 28
- },
-/obj/structure/sink{
- pixel_y = 22
- },
-/turf/open/floor/plasteel/freezer,
-/area/ruin/powered/golem_ship)
-"ia" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/innards,
-/obj/effect/decal/cleanable/blood/gibs/limb,
-/turf/open/floor/mineral/titanium/blue,
-/area/ruin/powered/golem_ship)
-"in" = (
-/obj/structure/rack,
-/obj/item/card/id/mining,
-/obj/item/card/id/mining,
-/obj/item/card/id/mining,
-/obj/item/card/id/mining,
-/obj/item/card/id/mining,
-/obj/effect/turf_decal/trimline/opaque/yellow/line{
- dir = 1
- },
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"iw" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/machinery/light/small/directional/north,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/opaque/white/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"iE" = (
-/turf/open/floor/mineral/titanium/purple,
-/area/ruin/powered/golem_ship)
-"iQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/mineral/titanium/white,
-/area/ruin/powered/golem_ship)
-"iZ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/mineral/titanium/blue,
-/area/ruin/powered/golem_ship)
-"jl" = (
-/obj/item/storage/firstaid/fire{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/fire{
- pixel_x = -4;
- pixel_y = -4
- },
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/trimline/opaque/white/line{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"jC" = (
-/obj/structure/window/reinforced{
- dir = 2;
- name = "shrine of the liberator"
- },
-/obj/structure/table/wood,
-/obj/item/book/manual/wiki/research_and_development{
- name = "Sacred Text of the Liberator";
- pixel_x = -4;
- pixel_y = 3
- },
-/obj/effect/turf_decal/trimline/opaque/purple/line{
- dir = 9
- },
-/obj/effect/turf_decal/trimline/opaque/purple/corner,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"jH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/rack,
-/obj/item/clothing/head/hardhat/mining{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/item/clothing/head/hardhat/mining{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/clothing/head/hardhat/mining{
- pixel_x = -2;
- pixel_y = -2
- },
-/obj/item/clothing/head/hardhat/mining{
- pixel_x = -6;
- pixel_y = -6
- },
-/obj/effect/turf_decal/trimline/opaque/yellow/line{
- dir = 1
- },
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"jR" = (
-/obj/structure/window/reinforced{
- dir = 2;
- name = "shrine of the liberator"
- },
-/obj/structure/statue/gold/rd,
-/obj/structure/window/reinforced{
- dir = 4;
- name = "shrine of the liberator"
- },
-/obj/effect/turf_decal/trimline/opaque/purple/line{
- dir = 6
- },
-/obj/effect/turf_decal/trimline/opaque/purple/corner{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"jX" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/structure/closet/secure_closet/personal,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"kg" = (
-/obj/machinery/light/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/opaque/white/line,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"ki" = (
-/obj/machinery/door/poddoor{
- id = "golemloading"
- },
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/ruin/powered/golem_ship)
-"kt" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/opaque/white/line{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"kw" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/bedsheetbin,
-/obj/structure/table,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plating,
-/area/ruin/powered/golem_ship)
-"kC" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/opaque/white/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"kP" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"kS" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"kX" = (
-/obj/item/kirbyplants{
- icon_state = "applebush"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/blue/line,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"kY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/south,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/plating,
-/area/ruin/powered/golem_ship)
-"lt" = (
-/obj/machinery/light/small/directional/north,
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/wood,
-/area/ruin/powered/golem_ship)
-"lN" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"lU" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/opaque/white/line,
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"mt" = (
-/obj/effect/turf_decal/box/corners{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/yellow/corner,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"mE" = (
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"mL" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"mX" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/white/corner,
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"nc" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/east,
-/obj/machinery/suit_storage_unit,
-/obj/effect/turf_decal/box/corners{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"nl" = (
-/turf/open/floor/plasteel/freezer,
-/area/ruin/powered/golem_ship)
-"np" = (
-/obj/structure/fans/tiny,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
- },
-/obj/machinery/door/airlock/external{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"nt" = (
-/obj/structure/shuttle/engine/heater{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/turf/open/floor/plating{
- initial_gas_mix = "LAVALAND_ATMOS"
- },
-/area/ruin/powered/golem_ship)
-"ny" = (
-/obj/structure/fans/tiny,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/door/airlock/external,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"nA" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 6
- },
-/obj/effect/turf_decal/trimline/opaque/white/corner{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/opaque/white/corner{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"nD" = (
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"nE" = (
-/obj/item/clothing/suit/hazardvest{
- desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
- name = "emergency lifejacket"
- },
-/obj/item/clothing/suit/hazardvest{
- desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
- name = "emergency lifejacket"
- },
-/obj/item/tank/internals/emergency_oxygen{
- pixel_x = 3
- },
-/obj/item/tank/internals/emergency_oxygen{
- pixel_x = 3
- },
-/obj/item/clothing/mask/breath{
- pixel_x = -3;
- pixel_y = -3
- },
-/obj/item/clothing/mask/breath{
- pixel_x = -3;
- pixel_y = -3
- },
-/obj/structure/closet/crate/internals,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/head/hardhat/mining,
-/obj/item/clothing/head/hardhat/mining,
-/obj/effect/turf_decal/trimline/opaque/yellow/line{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"nH" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/east,
-/obj/machinery/suit_storage_unit,
-/obj/effect/turf_decal/box/corners{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"nL" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"nT" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
- },
-/obj/machinery/door/airlock/titanium,
-/obj/effect/decal/cleanable/blood/tracks,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"om" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/yellow/corner{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/opaque/yellow/corner{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/industrial/loading{
- dir = 1
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"oF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"oO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"pi" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"pT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"qt" = (
-/obj/structure/ore_box,
-/obj/effect/turf_decal/trimline/opaque/yellow/line{
- dir = 4
- },
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"rl" = (
-/obj/structure/frame/machine,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"rv" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/white/corner,
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"rH" = (
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 6
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"rR" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/turf/open/floor/mineral/titanium/blue,
-/area/ruin/powered/golem_ship)
-"se" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/yellow/line{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"tw" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/ruin/powered/golem_ship)
-"tI" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"uk" = (
-/obj/machinery/shower{
- dir = 4
- },
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/plasteel/freezer,
-/area/ruin/powered/golem_ship)
-"uw" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/shower{
- dir = 8
- },
-/turf/open/floor/plasteel/freezer,
-/area/ruin/powered/golem_ship)
-"uA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/blue/corner,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"uL" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/obj/structure/closet/crate,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"uQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 10
- },
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"uZ" = (
-/obj/effect/decal/cleanable/blood/tracks,
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
- },
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/door/airlock/mining,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"vl" = (
-/obj/structure/table/reinforced,
-/obj/machinery/recharger,
-/obj/item/crowbar,
-/obj/item/crowbar{
- pixel_y = 12
- },
-/obj/item/crowbar{
- pixel_y = 6
- },
-/obj/effect/turf_decal/trimline/opaque/blue/line{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"vn" = (
-/obj/structure/table/reinforced,
-/obj/item/folder/blue,
-/obj/item/pen,
-/obj/effect/turf_decal/trimline/opaque/blue/line{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"vv" = (
-/obj/machinery/vending/mining_equipment/golem,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/trimline/opaque/yellow/line,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"vA" = (
-/obj/structure/table/reinforced,
-/obj/machinery/light/small/directional/south,
-/obj/machinery/button/door{
- id = "golemloading";
- name = "Cargo Blast Door Control";
- pixel_x = -5;
- pixel_y = -25
- },
-/obj/item/storage/firstaid/regular,
-/obj/machinery/button/door{
- id = "golemwindows";
- name = "Window Blast Door Control";
- pixel_x = 5;
- pixel_y = -25
- },
-/obj/effect/turf_decal/trimline/opaque/blue/line,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"vS" = (
-/turf/open/floor/plating,
-/area/ruin/powered/golem_ship)
-"vV" = (
-/obj/machinery/light/small/directional/east,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"wg" = (
-/obj/structure/sign/warning/xeno_mining,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ruin/powered/golem_ship)
-"wC" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/white/line,
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"wJ" = (
-/obj/machinery/light/small/directional/north,
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/wood,
-/area/ruin/powered/golem_ship)
-"wL" = (
-/obj/structure/frame/computer{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/opaque/purple/line{
- dir = 5
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"wR" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/structure/table,
-/obj/item/storage/box/lights/mixed{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/storage/box/lights/bulbs,
-/obj/effect/turf_decal/box/corners{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"wW" = (
-/obj/machinery/computer{
- desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
- dir = 4;
- name = "Broken Computer"
- },
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"yg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/plasteel/freezer,
-/area/ruin/powered/golem_ship)
-"yu" = (
-/obj/machinery/light/small/directional/north,
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"yN" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/purple/line{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"yO" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
- },
-/obj/machinery/door/airlock/command{
- name = "Bridge";
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"zg" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/machinery/light/small/directional/south,
-/obj/effect/turf_decal/trimline/opaque/white/line{
- dir = 6
- },
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"zs" = (
-/obj/machinery/light/directional/south,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plasteel/freezer,
-/area/ruin/powered/golem_ship)
-"zt" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/arrow_cw{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"zM" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"zW" = (
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/purple/line{
- dir = 9
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"zX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
- },
-/obj/machinery/door/airlock/external,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"zY" = (
-/obj/machinery/shower{
- dir = 4
- },
-/turf/open/floor/plasteel/freezer,
-/area/ruin/powered/golem_ship)
-"Ad" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"Ae" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 8
- },
-/obj/effect/mob_spawn/human/golem/adamantine,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/blue/line,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"Af" = (
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
- },
-/obj/machinery/door/airlock/command{
- name = "Bridge";
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"Ak" = (
-/obj/machinery/door/airlock/titanium,
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"Ba" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks,
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"Bw" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/opaque/white/line,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"BD" = (
-/obj/item/kirbyplants{
- icon_state = "plant-21"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/box/corners{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/opaque/blue/corner{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"BE" = (
-/obj/structure/fans/tiny,
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
- },
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/door/airlock/external{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"Cg" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor{
- id = "golemwindows";
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ruin/powered/golem_ship)
-"CO" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/opaque/white/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"Dp" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stack/cable_coil/red{
- pixel_x = 2;
- pixel_y = 6
- },
-/obj/item/stock_parts/cell/high/plus,
-/obj/effect/turf_decal/box/corners,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"DM" = (
-/obj/structure/fans/tiny,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/obj/machinery/door/airlock/external{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"DY" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"Er" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/box/corners{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/opaque/yellow/arrow_cw,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"EF" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 4
- },
-/obj/effect/mob_spawn/human/golem/adamantine,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/blue/line{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"Fi" = (
-/obj/structure/table/reinforced,
-/obj/item/clipboard,
-/obj/item/pen,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"FE" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks,
-/obj/effect/turf_decal/trimline/opaque/white/corner{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"FP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/washing_machine,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plating,
-/area/ruin/powered/golem_ship)
-"FS" = (
-/obj/structure/table/reinforced,
-/obj/item/clipboard,
-/obj/item/toy/figure/rd{
- name = "the Liberator action figure";
- toysay = "Yeah, go do whatever."
- },
-/obj/effect/turf_decal/trimline/opaque/blue/line,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"FT" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"Gg" = (
-/obj/machinery/reagentgrinder,
-/obj/structure/table,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/opaque/white/line{
- dir = 5
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"Gn" = (
-/obj/structure/window/reinforced{
- dir = 1;
- name = "shrine of the liberator"
- },
-/obj/structure/table/wood,
-/obj/item/circuitboard/aicore,
-/obj/item/toy/figure/rd{
- name = "the Liberator action figure";
- toysay = "Yeah, go do whatever."
- },
-/obj/effect/turf_decal/trimline/opaque/purple/line{
- dir = 10
- },
-/obj/effect/turf_decal/trimline/opaque/purple/corner{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"Gr" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/box/corners{
- dir = 8
- },
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"GB" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/line{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"GD" = (
-/obj/structure/bed,
-/obj/item/bedsheet/rd/royal_cape,
-/obj/structure/window/reinforced{
- dir = 1;
- name = "shrine of the liberator"
- },
-/obj/structure/window/reinforced{
- dir = 4;
- name = "shrine of the liberator"
- },
-/obj/effect/turf_decal/trimline/opaque/purple/line{
- dir = 5
- },
-/obj/effect/turf_decal/trimline/opaque/purple/corner{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"Hg" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 6
- },
-/obj/effect/turf_decal/trimline/opaque/white/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"Hs" = (
-/turf/open/floor/mineral/titanium/white,
-/area/ruin/powered/golem_ship)
-"HK" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/trimline/opaque/white/line{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"HW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks,
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"HZ" = (
-/turf/template_noop,
-/area/template_noop)
-"Iv" = (
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/trimline/opaque/purple/line{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"IB" = (
-/obj/machinery/light/small/directional/north,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/wood,
-/area/ruin/powered/golem_ship)
-"IK" = (
-/obj/structure/sign/departments/science,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ruin/powered/golem_ship)
-"IW" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"Jk" = (
-/obj/structure/closet/crate/science,
-/obj/item/storage/box/stockparts/basic,
-/obj/item/storage/box/stockparts/basic,
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"JA" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/door/airlock/external,
-/obj/effect/decal/cleanable/blood/tracks,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"JL" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/mineral/titanium/purple,
-/area/ruin/powered/golem_ship)
-"JX" = (
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"Kb" = (
-/obj/machinery/door/airlock/titanium,
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"Kc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/opaque/white/corner,
-/obj/effect/turf_decal/trimline/opaque/white/corner{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"Kg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/frame/machine,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"KC" = (
-/obj/structure/rack,
-/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/storage/bag/trash{
- pixel_x = 6
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plating,
-/area/ruin/powered/golem_ship)
-"KG" = (
-/obj/structure/fans/tiny,
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
- },
-/obj/machinery/door/airlock/external,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"KH" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/turf/open/floor/wood,
-/area/ruin/powered/golem_ship)
-"KO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/gibs/up,
-/turf/open/floor/mineral/titanium/blue,
-/area/ruin/powered/golem_ship)
-"La" = (
-/obj/machinery/door/airlock/titanium,
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"Ld" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plating,
-/area/ruin/powered/golem_ship)
-"LL" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
- },
-/obj/machinery/door/airlock/external{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"Ma" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor{
- id = "golemwindows"
- },
-/turf/open/floor/plating,
-/area/ruin/powered/golem_ship)
-"Ml" = (
-/obj/machinery/door/poddoor{
- id = "golemloading"
- },
-/obj/structure/fans/tiny,
-/obj/effect/decal/cleanable/blood/tracks,
-/turf/open/floor/plating,
-/area/ruin/powered/golem_ship)
-"Mv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/blue/corner{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"Mw" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/obj/machinery/light/directional/north,
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"Mx" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"MN" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"MO" = (
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/mineral/titanium/purple,
-/area/ruin/powered/golem_ship)
-"MT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 5
- },
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"Ng" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"Nj" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/rack,
-/obj/item/storage/toolbox/emergency{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/storage/toolbox/mechanical,
-/obj/item/storage/toolbox/electrical{
- pixel_x = -3;
- pixel_y = 3
- },
-/turf/open/floor/plating,
-/area/ruin/powered/golem_ship)
-"Nu" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 10
- },
-/obj/effect/turf_decal/trimline/opaque/white/corner{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/opaque/white/corner{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"NT" = (
-/obj/item/areaeditor/blueprints{
- desc = "Use to build new structures in the wastes.";
- name = "land claim"
- },
-/obj/item/disk/design_disk/golem_shell,
-/obj/structure/table,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/opaque/white/corner{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"NZ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/yellow/arrow_cw,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"Oj" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/mineral/titanium/white,
-/area/ruin/powered/golem_ship)
-"Om" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/ore_box,
-/obj/machinery/light/small/directional/north,
-/obj/effect/turf_decal/trimline/opaque/yellow/line{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"Ox" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/purple/line,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"OD" = (
-/obj/structure/frame/machine,
-/obj/effect/turf_decal/trimline/opaque/purple/line{
- dir = 6
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"OF" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/door/airlock/external,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"PD" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"PE" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/structure/closet/secure_closet/personal,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"PV" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/decal/cleanable/blood/tracks,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 9
- },
-/obj/effect/turf_decal/trimline/opaque/white/corner{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/opaque/white/line{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"PX" = (
-/obj/structure/sign/departments/cargo,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ruin/powered/golem_ship)
-"Ql" = (
-/obj/machinery/door/airlock/titanium,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"Qz" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"QD" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 6
- },
-/obj/effect/turf_decal/trimline/opaque/white/line,
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"QY" = (
-/obj/item/storage/firstaid/brute{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/storage/firstaid/brute,
-/obj/item/storage/firstaid/brute{
- pixel_x = -4;
- pixel_y = -4
- },
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/trimline/opaque/white/line{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"RB" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/structure/rack,
-/obj/item/flashlight/lantern{
- pixel_x = 5
- },
-/obj/item/flashlight/lantern,
-/obj/item/flashlight/lantern{
- pixel_x = -5
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"RK" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/closet/crate,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/kinetic_crusher,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"Sa" = (
-/obj/item/kirbyplants{
- icon_state = "plant-22"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/blue/line{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"Sc" = (
-/obj/machinery/computer/arcade/battle,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"Sg" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/item/stack/cable_coil/red{
- pixel_x = 2;
- pixel_y = 6
- },
-/obj/item/stock_parts/cell/high/plus,
-/obj/item/wirecutters,
-/obj/structure/table,
-/turf/open/floor/plating,
-/area/ruin/powered/golem_ship)
-"SG" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"SR" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/opaque/purple/line,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"Td" = (
-/obj/structure/rack,
-/obj/item/storage/bag/ore,
-/obj/item/mining_scanner,
-/obj/item/storage/bag/ore,
-/obj/item/mining_scanner,
-/obj/item/storage/bag/ore,
-/obj/item/mining_scanner,
-/obj/item/storage/bag/ore,
-/obj/item/mining_scanner,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/yellow/line,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"Tj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 9
- },
-/turf/open/floor/mineral/titanium/yellow,
-/area/ruin/powered/golem_ship)
-"TN" = (
-/obj/structure/rack,
-/obj/item/resonator{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/item/resonator{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/resonator{
- pixel_x = -2;
- pixel_y = -2
- },
-/obj/item/resonator{
- pixel_x = -6;
- pixel_y = -6
- },
-/obj/effect/turf_decal/trimline/opaque/yellow/line{
- dir = 1
- },
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"TO" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/white/corner{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"Ud" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/opaque/white/line,
-/turf/open/floor/plasteel,
-/area/ruin/powered/golem_ship)
-"Uq" = (
-/obj/effect/decal/cleanable/blood/tracks,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/opaque/purple/line,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"UD" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/blue/line{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"UH" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 4
- },
-/obj/effect/mob_spawn/human/golem/adamantine,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/blue/line,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"UW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"VY" = (
-/obj/structure/table/reinforced,
-/obj/machinery/light/small/directional/north,
-/obj/machinery/recharger,
-/obj/item/resonator/upgraded,
-/obj/effect/turf_decal/trimline/opaque/blue/line{
- dir = 9
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"Wr" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/mineral/titanium/purple,
-/area/ruin/powered/golem_ship)
-"WO" = (
-/obj/machinery/computer/arcade/orion_trail,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"Xr" = (
-/obj/structure/closet/crate,
-/obj/item/storage/bag/ore,
-/obj/item/flashlight/lantern,
-/obj/item/pickaxe,
-/obj/item/shovel,
-/obj/item/mining_scanner,
-/obj/item/card/id/mining,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/head/hardhat/mining,
-/obj/effect/turf_decal/trimline/opaque/yellow/line,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"Xv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/opaque/white/corner,
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"XR" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ruin/powered/golem_ship)
-"XY" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/closet/crate,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"Ye" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ruin/powered/golem_ship)
-"YN" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/obj/machinery/door/airlock/external{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"YQ" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 8
- },
-/obj/effect/mob_spawn/human/golem/adamantine,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/opaque/blue/line{
- dir = 1
- },
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 8
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-"YV" = (
-/obj/machinery/light/small/directional/north,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/mineral/titanium/blue,
-/area/ruin/powered/golem_ship)
-"YZ" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/rack,
-/obj/item/storage/toolbox/emergency{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/storage/toolbox/mechanical,
-/obj/item/storage/toolbox/electrical{
- pixel_x = -3;
- pixel_y = 3
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"Ze" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/airlock/external{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/powered/golem_ship)
-"ZX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/splatter,
-/turf/open/floor/mineral/titanium/blue,
-/area/ruin/powered/golem_ship)
-"ZY" = (
-/obj/machinery/computer/helm{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered/golem_ship)
-
-(1,1,1) = {"
-HZ
-HZ
-HZ
-HZ
-HZ
-HZ
-Ye
-Cg
-Cg
-Cg
-Cg
-Ye
-HZ
-HZ
-HZ
-HZ
-HZ
-HZ
-"}
-(2,1,1) = {"
-HZ
-HZ
-HZ
-HZ
-HZ
-HZ
-Ma
-IW
-wW
-ZY
-Fi
-Ma
-HZ
-HZ
-HZ
-HZ
-HZ
-HZ
-"}
-(3,1,1) = {"
-HZ
-HZ
-HZ
-HZ
-Ye
-BE
-Ye
-VY
-UD
-UD
-vA
-Ye
-np
-np
-Ye
-HZ
-HZ
-HZ
-"}
-(4,1,1) = {"
-HZ
-HZ
-HZ
-HZ
-Ye
-yu
-XR
-gz
-iZ
-iZ
-BD
-Ye
-gT
-cp
-Ye
-HZ
-HZ
-HZ
-"}
-(5,1,1) = {"
-HZ
-HZ
-HZ
-Ye
-Ye
-Ze
-Ye
-KO
-uA
-Mv
-ZX
-Ye
-gT
-ea
-Ye
-HZ
-HZ
-HZ
-"}
-(6,1,1) = {"
-Ye
-Ye
-Ye
-Ye
-CO
-lU
-Ye
-iZ
-UH
-EF
-ia
-Ye
-YN
-YN
-Ye
-Ye
-Ye
-Ye
-"}
-(7,1,1) = {"
-Ye
-IB
-nT
-PV
-FE
-QD
-Ye
-iZ
-FS
-vn
-bI
-Ye
-GB
-nD
-nD
-gg
-zM
-ki
-"}
-(8,1,1) = {"
-Ma
-KH
-Ye
-ee
-mX
-zg
-Ye
-YV
-aY
-vl
-dt
-Ye
-GB
-aB
-Ng
-nD
-Ad
-ki
-"}
-(9,1,1) = {"
-Ye
-jX
-Ye
-iw
-wC
-Sc
-Ye
-iZ
-Ae
-YQ
-rR
-Ye
-GB
-Tj
-uQ
-dF
-uL
-ki
-"}
-(10,1,1) = {"
-Ye
-Ye
-Ye
-kC
-wC
-WO
-Ye
-iZ
-kX
-Sa
-rR
-Ye
-nE
-mE
-MT
-Ba
-kP
-Ml
-"}
-(11,1,1) = {"
-Ye
-PE
-Ye
-kC
-wC
-Ye
-Ye
-yO
-Ye
-Ye
-Af
-Ye
-Ye
-Mw
-aB
-aB
-Jk
-ki
-"}
-(12,1,1) = {"
-Ma
-lt
-nT
-nA
-ep
-Ye
-zW
-aT
-Gn
-jC
-Iv
-eG
-PX
-oF
-mt
-zt
-fS
-Ye
-"}
-(13,1,1) = {"
-Ye
-Ye
-Ye
-CO
-TO
-fi
-yN
-JL
-GD
-jR
-MO
-Uq
-uZ
-rH
-eA
-XY
-bv
-Ma
-"}
-(14,1,1) = {"
-Ma
-wJ
-nT
-Nu
-rv
-fi
-yN
-JL
-wL
-OD
-JL
-Ox
-fK
-nD
-NZ
-SG
-SG
-Ma
-"}
-(15,1,1) = {"
-Ye
-MN
-Ye
-kC
-ep
-IK
-yN
-JL
-JL
-JL
-iE
-SR
-PX
-nD
-Er
-mL
-RK
-Ye
-"}
-(16,1,1) = {"
-Ye
-Ye
-Ye
-ee
-wC
-gs
-gn
-JL
-Kg
-rl
-iE
-Ox
-Ye
-La
-Ye
-Ye
-Ye
-Ye
-"}
-(17,1,1) = {"
-cD
-HW
-JA
-Hg
-Ud
-gs
-yN
-Wr
-JL
-JL
-iE
-SR
-Ye
-se
-aB
-zX
-UW
-ny
-"}
-(18,1,1) = {"
-KG
-vV
-OF
-CO
-Ud
-Ye
-HK
-Oj
-Hs
-Oj
-Hs
-fL
-gs
-se
-aB
-zX
-lN
-ny
-"}
-(19,1,1) = {"
-Ye
-Ye
-Ye
-Ak
-Ye
-Ye
-kt
-Oj
-Hs
-Oj
-Oj
-Kc
-bs
-om
-aB
-wg
-Ye
-Ye
-"}
-(20,1,1) = {"
-Ye
-uk
-zY
-nl
-zY
-Ye
-aK
-Oj
-Hs
-Oj
-Hs
-kg
-Ye
-Om
-aB
-nD
-vv
-Ye
-"}
-(21,1,1) = {"
-Ye
-hS
-yg
-nl
-zs
-Ye
-jl
-Oj
-Oj
-iQ
-Oj
-Kc
-fK
-fQ
-aB
-nD
-di
-Ma
-"}
-(22,1,1) = {"
-Ye
-uw
-dv
-nl
-dq
-Ye
-QY
-Oj
-Oj
-Oj
-Oj
-Bw
-Ye
-in
-aB
-aB
-Xr
-Ma
-"}
-(23,1,1) = {"
-Ye
-Ye
-Ye
-Kb
-Ye
-Ye
-Gg
-NT
-Oj
-Oj
-Xv
-dr
-Ye
-TN
-aB
-kS
-dy
-Ye
-"}
-(24,1,1) = {"
-Ye
-Nj
-tw
-vS
-Sg
-Ye
-Ye
-Ye
-Ql
-Ql
-Ye
-Ye
-Ye
-jH
-aB
-pT
-Td
-Ma
-"}
-(25,1,1) = {"
-Ye
-KC
-tw
-kY
-Ye
-Ye
-YZ
-Dp
-pi
-hN
-wR
-RB
-Ye
-Ye
-oO
-aB
-bR
-Ma
-"}
-(26,1,1) = {"
-Ma
-Ld
-vS
-tw
-fi
-JX
-FT
-FT
-DY
-hN
-FT
-FT
-Mx
-fi
-nD
-nD
-hu
-Ye
-"}
-(27,1,1) = {"
-Ma
-Ma
-FP
-kw
-Ye
-bx
-PD
-nc
-pi
-nL
-nH
-Qz
-Gr
-Ye
-qt
-qt
-Ye
-Ye
-"}
-(28,1,1) = {"
-HZ
-Ye
-Ye
-Ye
-Ye
-Ye
-Ye
-Ye
-LL
-LL
-Ye
-Ye
-Ye
-Ye
-Ye
-Ye
-Ye
-HZ
-"}
-(29,1,1) = {"
-HZ
-tI
-nt
-nt
-tI
-nt
-nt
-Ye
-fy
-ea
-Ye
-nt
-nt
-tI
-nt
-nt
-tI
-HZ
-"}
-(30,1,1) = {"
-HZ
-tI
-dc
-dc
-tI
-dc
-dc
-Ye
-DM
-DM
-Ye
-dc
-dc
-tI
-dc
-dc
-tI
-HZ
-"}
diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
index 93b0dc996b77..fd062bcd87a4 100644
--- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
@@ -132,7 +132,6 @@
/obj/structure/closet/crate/freezer,
/obj/item/organ/appendix,
/obj/item/reagent_containers/food/snacks/meat/slab,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem,
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
@@ -431,7 +430,6 @@
/obj/item/reagent_containers/food/snacks/hugemushroomslice,
/obj/item/organ/appendix,
/obj/item/reagent_containers/food/snacks/meat/slab,
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine,
/obj/effect/turf_decal/industrial/warning{
dir = 2
},
diff --git a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
index 0104b112aeda..f425c41bccf3 100644
--- a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
+++ b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
@@ -25,7 +25,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
dir = 4
},
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer1{
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer4{
@@ -37,7 +37,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
dir = 1
},
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer1{
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{
dir = 1
},
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer4{
@@ -52,7 +52,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
dir = 8
},
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer1{
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{
dir = 8
},
/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer4{
@@ -119,7 +119,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 6
},
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1{
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 6
},
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{
@@ -131,7 +131,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 4
},
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1{
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 4
},
/obj/structure/holobox,
@@ -144,7 +144,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
dir = 4
},
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer1{
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer4{
@@ -165,7 +165,7 @@
/area/ruin/space/has_grav/hellfactory)
"aC" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4,
/turf/open/floor/plastic,
/area/ruin/space/has_grav/hellfactory)
@@ -203,7 +203,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 5
},
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1{
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 5
},
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{
@@ -215,7 +215,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 4
},
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1{
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{
@@ -227,7 +227,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 9
},
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1{
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 9
},
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4{
@@ -1029,7 +1029,7 @@
/area/ruin/space/has_grav/hellfactory)
"Nv" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2,
/obj/machinery/light/directional/east,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer4,
/turf/open/floor/plastic,
diff --git a/_maps/configs/nanotrasen_heron.json b/_maps/configs/nanotrasen_heron.json
index 3cdc9821a859..fbe11a792000 100644
--- a/_maps/configs/nanotrasen_heron.json
+++ b/_maps/configs/nanotrasen_heron.json
@@ -4,7 +4,7 @@
"namelists": ["WEAPONS"],
"map_name": "Heron-Class Dreadnaught",
"map_short_name": "Heron-class",
- "map_path": "_maps/shuttles/shiptest/nanotrasen_heron.dmm",
+ "map_path": "_maps/shuttles/nanotrasen/nanotrasen_heron.dmm",
"map_id": "nanotrasen_heron",
"description": "The Heron-Class is the biggest ship available to NanoTrasen's frontier forces. These vessels served as the flagship of many fleets during the war, serving as a carrier for an operative team, or a command vessel for corporate units. Captains of this vessel were known to retrofit bluespace artillery onto the hangar, and directly fire it during combat. Since the end of the war, it has been repurposed for peacekeeping missions on backline sectors. Though the age of the design is starting to show, it stands as one of the remnants of NanoTrasen's once powerful hold over the cosmos.",
"limit": 1,
diff --git a/_maps/configs/independent_litieguai.json b/_maps/configs/syndicate_litieguai.json
similarity index 73%
rename from _maps/configs/independent_litieguai.json
rename to _maps/configs/syndicate_litieguai.json
index d189af20b550..887828e28176 100644
--- a/_maps/configs/independent_litieguai.json
+++ b/_maps/configs/syndicate_litieguai.json
@@ -1,12 +1,13 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Li Tieguai-class Rescue Ship",
+ "prefix": "SSV",
"map_short_name": "Li Tieguai-class",
"description": "A small, nimble, and exceptionally well-built medical response vessel, the Li Tieguai is a recent addition to Cybersun’s fleet, forming a critical component of their Frontier stabilization program. Li Tieguais come equipped with high-end medical equipment, including a selection of Cybersun augments and prosthetics, as well as weaponry and armor sufficient to protect its personnel in the often-dangerous Frontier sectors, so that they can offer premium healthcare (at premium prices) in even the most dangerous of scenarios.",
"tags": [
"Medical"
],
- "map_path": "_maps/shuttles/independent/independent_litieguai.dmm",
+ "map_path": "_maps/shuttles/syndicate/syndicate_litieguai.dmm",
"namelists": [
"SPACE",
"BEASTS",
@@ -14,20 +15,20 @@
],
"job_slots": {
"Captain": {
- "outfit": "/datum/outfit/job/captain",
+ "outfit": "/datum/outfit/job/syndicate/captain/cybersun",
"slots": 1
},
- "Chief Medical Officer": {
- "outfit": "/datum/outfit/job/cmo/medicaldirector",
+ "Medical Director": {
+ "outfit": "/datum/outfit/job/syndicate/cmo",
"officer": true,
"slots": 1
},
"Trauma Team Technician": {
- "outfit": "/datum/outfit/job/paramedic/traumateam",
+ "outfit": "/datum/outfit/job/syndicate/doctor/cybersun",
"slots": 3
},
- "Medical Intern": {
- "outfit": "/datum/outfit/job/doctor/juniordoctor",
+ "Cybersun Medical Intern": {
+ "outfit": "/datum/outfit/job/syndicate/assistant/cybersun",
"slots": 3
}
},
diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt
index 846133389d1e..164a375239e7 100644
--- a/_maps/map_catalogue.txt
+++ b/_maps/map_catalogue.txt
@@ -170,10 +170,6 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
Size = (x = 30)(y = 20)(z = 1)
Tags = "Medium Combat Challenge", "Medium Loot", "Shelter", "Antag Gear"
- File Name = "_maps\RandomRuins\LavaRuins\lavaland_surface_golem_ship.dmm"
- Size = (x = 30)(y = 18)(z = 1)
- Tags = "No Combat", "Medium Loot", "Ghost Role", "Shelter"
-
File Name = "_maps\RandomRuins\LavaRuins\lavaland_surface_hermit.dmm"
Size = (x = 16)(y = 16)(z = 1)
Tags = "No Combat", "Minor Loot", "Ghost Role", "Shelter"
diff --git a/_maps/shuttles/independent/independent_pillbottle.dmm b/_maps/shuttles/independent/independent_pillbottle.dmm
index 7408067decf5..92529ea329c6 100644
--- a/_maps/shuttles/independent/independent_pillbottle.dmm
+++ b/_maps/shuttles/independent/independent_pillbottle.dmm
@@ -1721,9 +1721,6 @@
},
/turf/open/floor/plating,
/area/ship/hallway/fore)
-"CP" = (
-/turf/template_noop,
-/area/space)
"CQ" = (
/turf/closed/wall,
/area/ship/bridge)
@@ -3919,5 +3916,5 @@ hT
hT
WS
tG
-CP
+Oz
"}
diff --git a/_maps/shuttles/independent/independent_rube_goldberg.dmm b/_maps/shuttles/independent/independent_rube_goldberg.dmm
index 50febf2f2550..b8960b78342d 100644
--- a/_maps/shuttles/independent/independent_rube_goldberg.dmm
+++ b/_maps/shuttles/independent/independent_rube_goldberg.dmm
@@ -83,6 +83,7 @@
"bb" = (
/obj/structure/cable/green,
/obj/effect/turf_decal/industrial/radiation/full,
+/obj/machinery/power/grounding_rod,
/turf/open/floor/plating,
/area/ship/storage)
"be" = (
@@ -4162,6 +4163,19 @@
/obj/machinery/suit_storage_unit/atmos,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
+"Or" = (
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/industrial/radiation{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/radiation{
+ dir = 4
+ },
+/obj/machinery/power/grounding_rod,
+/turf/open/floor/mineral/titanium,
+/area/ship/storage)
"Ot" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 10
@@ -4450,7 +4464,14 @@
/turf/open/floor/plating/airless,
/area/ship/hallway)
"Sw" = (
-/obj/machinery/atmospherics/components/unary/thermomachine,
+/obj/structure/frame/machine,
+/obj/item/circuitboard/machine/thermomachine/freezer,
+/obj/item/stock_parts/micro_laser,
+/obj/item/stock_parts/micro_laser,
+/obj/item/stock_parts/matter_bin,
+/obj/item/stock_parts/matter_bin,
+/obj/item/stack/cable_coil/cut,
+/obj/item/stack/sheet/glass,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Sx" = (
@@ -7063,9 +7084,9 @@ Zy
mV
bB
SY
-SY
-SY
-SY
+Or
+Or
+Or
bb
zy
wg
diff --git a/_maps/shuttles/independent/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
similarity index 99%
rename from _maps/shuttles/independent/nanotrasen_heron.dmm
rename to _maps/shuttles/nanotrasen/nanotrasen_heron.dmm
index 824ffae7ed3d..576f6ac4b2ad 100644
--- a/_maps/shuttles/independent/nanotrasen_heron.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -773,7 +773,7 @@
dir = 5
},
/obj/machinery/computer/atmos_control/tank/air_tank{
- sensors = list("hairon"="Heron Air Mix Tank")
+ sensors = list("hairon"="Heron Air Mix Tank")
},
/obj/machinery/light_switch{
pixel_y = 23
@@ -6002,6 +6002,9 @@
name = "Helm"
},
/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"vC" = (
@@ -9709,7 +9712,7 @@
dir = 9
},
/obj/machinery/computer/atmos_control/tank/toxin_tank{
- sensors = list("heron_plasm"="Heron Plasma Tank")
+ sensors = list("heron_plasm"="Heron Plasma Tank")
},
/obj/structure/cable{
icon_state = "0-4"
@@ -10757,6 +10760,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"NE" = (
@@ -13674,9 +13680,6 @@
/area/ship/science/robotics)
"YP" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 1
},
diff --git a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt
index 1d48dbc85f03..fb9dc1591234 100644
--- a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt
+++ b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt
@@ -29,7 +29,7 @@ Purpose = "Supposedly an manned torpedo. What is this. Subtest?"
File Path = "_maps\shuttles\subshuttles\independant_pill.dmm"
Name = "Superpill"
-Size = "1x3"
+Size = "3x4"
Purpose = "A horrid merger of engineering platform and pill"
File Path = "_maps\shuttles\subshuttles\independant_pill.dmm"
diff --git a/_maps/shuttles/subshuttles/independent_superpill.dmm b/_maps/shuttles/subshuttles/independent_superpill.dmm
index fc0dacddc501..de9046d091a4 100644
--- a/_maps/shuttles/subshuttles/independent_superpill.dmm
+++ b/_maps/shuttles/subshuttles/independent_superpill.dmm
@@ -1,208 +1,219 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2,
-/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/general/visible/layer4{
- dir = 5
+/obj/structure/catwalk,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1
},
/obj/machinery/portable_atmospherics/canister/toxins,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer1{
- dir = 4
- },
-/obj/structure/catwalk,
/turf/open/floor/plating/rust,
/area/ship/storage)
"b" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2,
-/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 4
+/obj/structure/catwalk,
+/obj/machinery/conveyor_switch/oneway{
+ id = "superpill_start";
+ name = "jumpstart device";
+ desc = "A conveyor control switch. It appears to only go in one direction; once you've pulled this, there's no going back."
},
-/obj/machinery/atmospherics/components/binary/pump/on/layer1{
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
dir = 4
},
-/obj/structure/catwalk,
/turf/open/floor/plating/rust,
/area/ship/storage)
"f" = (
-/obj/machinery/power/emitter/welded{
- dir = 4
+/obj/structure/window/plasma/reinforced,
+/obj/structure/window/plasma/reinforced/spawner/west,
+/obj/structure/window/plasma/reinforced/spawner/north,
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{
+ dir = 1
},
-/obj/structure/cable{
- icon_state = "0-2"
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{
+/obj/machinery/conveyor{
dir = 4;
- layer = 3
+ id = "superpill_start"
},
-/obj/machinery/atmospherics/pipe/simple/general/visible/layer1{
- dir = 10
+/obj/item/reagent_containers/pill/floorpill{
+ pixel_y = -5;
+ pixel_x = -1
+ },
+/obj/item/reagent_containers/pill/floorpill{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/pill/floorpill{
+ pixel_x = 4;
+ pixel_y = 7
+ },
+/turf/open/floor/plating{
+ initial_gas_mix = "n2o=28, n2=72;TEMP=7"
},
-/obj/structure/catwalk,
-/turf/open/floor/plating/rust,
/area/ship/storage)
"h" = (
+/obj/structure/catwalk,
/obj/machinery/power/shuttle/engine/electric{
dir = 4
},
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2,
-/obj/machinery/atmospherics/pipe/simple/general/visible/layer4,
-/obj/machinery/atmospherics/pipe/simple/general/visible,
-/obj/structure/catwalk,
/obj/docking_port/mobile{
can_move_docking_ports = 1;
dir = 4;
port_direction = 2;
preferred_direction = 4
},
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold/visible,
/turf/open/floor/plating/rust,
/area/ship/storage)
"i" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- filter_types = list("co2","bz","o2","plasma","water_vapor","nob","no2","tritium","freon","pluox","stim")
- },
+/obj/structure/window/plasma/reinforced/spawner/north,
+/obj/structure/window/plasma/reinforced/spawner/east,
+/obj/structure/window/plasma/reinforced,
/obj/machinery/power/supermatter_crystal/shard,
-/obj/structure/window/plasma/reinforced/spawner{
- pixel_y = -7
- },
-/obj/structure/window/plasma/reinforced/spawner/east{
- pixel_x = 7
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
+ dir = 10
},
-/obj/structure/window/plasma/reinforced/spawner/north{
- pixel_y = 7
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 10
},
-/obj/structure/window/plasma/reinforced/spawner/west{
- pixel_x = -7
+/obj/effect/decal/remains/human{
+ name = "environmental storytelling"
},
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer4,
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w{
- layer = 3
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ filter_types = list("co2","bz","o2","plasma","water_vapor","nob","no2","tritium","freon","pluox","stim")
},
/turf/open/floor/plating{
initial_gas_mix = "n2o=28, n2=72;TEMP=7"
},
/area/ship/storage)
"l" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 6
- },
+/obj/structure/catwalk,
/obj/machinery/atmospherics/pipe/simple/general/visible/layer2{
dir = 6
},
-/obj/machinery/atmospherics/pipe/simple/general/visible/layer4{
+/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 6
},
-/obj/structure/catwalk,
+/obj/structure/sign/warning/incident,
/turf/open/floor/plating/rust,
/area/ship/storage)
"m" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w{
- layer = 3
- },
-/obj/machinery/atmospherics/components/unary/passive_vent/layer4{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer4,
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2,
-/obj/structure/catwalk,
/obj/machinery/computer/helm/retro{
dir = 8
},
+/obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 9
+ },
/turf/open/floor/plating/rust,
/area/ship/storage)
"s" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer4,
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2,
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
- dir = 4;
- layer = 3
+/obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
+ dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/general/visible/layer1{
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/general/visible/layer4{
dir = 9
},
-/obj/structure/catwalk,
/turf/open/floor/plating/rust,
/area/ship/storage)
"x" = (
-/obj/machinery/atmospherics/pipe/layer_manifold/visible{
- dir = 8
- },
/obj/structure/catwalk,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/emitter/welded/upgraded{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{
+ dir = 4;
+ layer = 3
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+ dir = 4;
+ layer = 3
+ },
/turf/open/floor/plating/rust,
/area/ship/storage)
"C" = (
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
},
/obj/machinery/power/apc/auto_name/directional/west{
pixel_x = -25
},
-/obj/structure/window/reinforced/tinted,
+/obj/item/tank/internals/plasma/full,
+/obj/item/clothing/head/helmet/space/orange,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/pickaxe/improvised,
+/obj/item/clothing/suit/space/orange,
+/obj/item/storage/toolbox/mechanical/old,
+/obj/item/clothing/mask/gas,
+/obj/structure/bed,
+/obj/machinery/light/floor,
+/obj/machinery/holopad,
+/obj/machinery/door/window,
/obj/structure/window/reinforced/tinted{
dir = 8
},
/obj/structure/window/reinforced/tinted{
- dir = 1
+ dir = 4
+ },
+/obj/structure/fans/tiny,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
},
/obj/structure/cable{
icon_state = "0-4"
},
+/obj/machinery/door/window{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/east,
/turf/open/floor/plasteel/tech/grid,
/area/ship/storage)
"R" = (
-/obj/machinery/power/rad_collector/anchored,
+/obj/structure/catwalk,
/obj/structure/cable{
icon_state = "0-8"
},
-/obj/machinery/atmospherics/pipe/manifold/general/visible/layer4{
+/obj/machinery/power/rad_collector/anchored,
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{
dir = 4
},
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer4,
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w,
-/obj/structure/catwalk,
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2,
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/general/visible/layer4{
+ dir = 9
+ },
/turf/open/floor/plating/rust,
/area/ship/storage)
"W" = (
-/obj/item/clothing/mask/gas,
-/obj/structure/bed,
-/obj/machinery/light/floor,
-/obj/structure/fans/tiny,
-/obj/machinery/door/window{
- dir = 1
- },
-/obj/structure/window/reinforced/tinted{
- dir = 4
- },
-/obj/structure/cable,
+/obj/structure/catwalk,
/obj/structure/cable{
- icon_state = "0-4"
+ icon_state = "4-8"
},
-/obj/machinery/airalarm/directional/west,
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{
+ dir = 8
},
-/obj/machinery/door/window,
-/obj/machinery/atmospherics/pipe/simple/general/visible/layer1,
-/obj/machinery/holopad,
-/obj/item/storage/toolbox/mechanical/old,
-/obj/item/clothing/suit/space/orange,
-/obj/item/pickaxe/improvised,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/clothing/head/helmet/space/orange,
-/obj/item/tank/internals/plasma/full,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 4
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
+ dir = 8
},
-/turf/open/floor/plasteel/tech/grid,
+/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/machinery/atmospherics/pipe/manifold/general/visible/layer4{
+ dir = 1
+ },
+/turf/open/floor/plating/rust,
/area/ship/storage)
(1,1,1) = {"
diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm
index 94ce81e53d3d..dd29db498f95 100644
--- a/_maps/shuttles/syndicate/syndicate_aegis.dmm
+++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm
@@ -33,7 +33,7 @@
/obj/item/clothing/head/HoS/beret/syndicate,
/obj/item/clothing/head/HoS/syndicate,
/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
-/obj/item/clothing/under/syndicate/aclf,
+/obj/item/clothing/under/syndicate/officer,
/obj/item/clothing/under/syndicate/combat,
/obj/item/clothing/glasses/hud/security/sunglasses,
/obj/item/clothing/neck/stripedredscarf,
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index 1fa8545e59df..2e797a41fb9d 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -3145,20 +3145,23 @@
req_access_txt = "20"
},
/obj/item/clothing/under/syndicate/combat,
-/obj/item/clothing/under/syndicate/aclf,
+/obj/item/clothing/under/syndicate/officer,
+/obj/item/clothing/suit/armor/vest/security/hos{
+ name = "Syndicate jacket"
+ },
/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
/obj/item/clothing/gloves/krav_maga/combatglovesplus,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/glasses/thermal/eyepatch,
/obj/item/clothing/head/HoS/beret/syndicate,
/obj/item/clothing/head/HoS/syndicate,
-/obj/item/clothing/head/aclfcap{
+/obj/item/clothing/head/gorlexcap{
pixel_x = 5;
pixel_y = -4
},
/obj/item/gun/ballistic/derringer/traitor,
/obj/item/clothing/under/syndicate/sniper,
-/obj/item/clothing/suit/aclf,
+/obj/item/clothing/suit/gorlex,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/obj/item/radio/headset/syndicate/alt/leader,
diff --git a/_maps/shuttles/independent/independent_litieguai.dmm b/_maps/shuttles/syndicate/syndicate_litieguai.dmm
similarity index 63%
rename from _maps/shuttles/independent/independent_litieguai.dmm
rename to _maps/shuttles/syndicate/syndicate_litieguai.dmm
index 9e64a8e4407a..055e98bd59c6 100644
--- a/_maps/shuttles/independent/independent_litieguai.dmm
+++ b/_maps/shuttles/syndicate/syndicate_litieguai.dmm
@@ -1,1420 +1,1783 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aL" = (
-/obj/machinery/power/smes/engineering{
- charge = 1e+006
+"am" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 4
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
},
/obj/structure/cable{
- icon_state = "0-2"
+ icon_state = "1-8"
+ },
+/obj/structure/chair/office/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/science)
+"an" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/hallway/central)
+"as" = (
+/obj/machinery/computer/operating{
+ dir = 8
+ },
+/obj/machinery/button/door{
+ id = "traumasurgery";
+ name = "Surgery Shutter Control";
+ pixel_x = -7;
+ pixel_y = 23
},
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"aT" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/industrial/outline/red,
-/obj/item/circuitboard/machine/ore_redemption,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/circuitboard/machine/rdserver,
-/obj/item/circuitboard/computer/rdconsole,
-/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"bl" = (
-/obj/docking_port/stationary{
- dir = 2;
- dwidth = 15;
- height = 15;
- width = 30
+/area/ship/medical/surgery)
+"ba" = (
+/obj/structure/mirror{
+ pixel_x = 25
},
-/turf/template_noop,
-/area/template_noop)
+/obj/structure/sink{
+ dir = 8;
+ pixel_y = 0;
+ pixel_x = 12
+ },
+/obj/structure/sign/poster/official/cleanliness{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/freezer,
+/area/ship/crew/toilet)
"bu" = (
-/obj/machinery/door/airlock/medical{
- dir = 4;
- name = "Storage Room"
+/obj/machinery/door/airlock/maintenance_hatch{
+ name = "Starboard Engines"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/maintenance/starboard)
+"bv" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
+ dir = 8
},
-/obj/effect/turf_decal/trimline/opaque/red/arrow_ccw,
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
+"bD" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/door/firedoor/border_only{
dir = 8
},
/obj/machinery/door/firedoor/border_only{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/ship/storage)
-"bC" = (
-/obj/item/radio/intercom/directional/south,
-/obj/effect/turf_decal/industrial/outline/red,
-/obj/machinery/autolathe,
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"bX" = (
-/obj/machinery/door/poddoor/preopen{
- id = "traumabridge";
- name = "Window Blast Door"
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plating,
+/obj/machinery/door/airlock/command{
+ dir = 8;
+ name = "Bridge"
+ },
+/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
-"ck" = (
-/obj/machinery/airalarm/directional/east,
-/obj/structure/sign/poster/retro/smile{
- pixel_y = -32
+"bQ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/structure/frame/computer{
+/obj/effect/turf_decal/trimline/opaque/red/filled/line{
dir = 1
},
-/obj/effect/turf_decal/industrial/hatch/red,
+/obj/machinery/firealarm/directional/north,
/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"cn" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"cs" = (
-/obj/machinery/defibrillator_mount/loaded{
- pixel_y = -32
+/area/ship/hallway/central)
+"bT" = (
+/obj/machinery/smartfridge/bloodbank/preloaded{
+ density = 0;
+ pixel_y = 0;
+ pixel_x = 32
},
-/obj/effect/turf_decal/industrial/loading{
- dir = 4
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/machinery/stasis{
+ dir = 8
},
/turf/open/floor/plasteel/tech,
/area/ship/medical)
-"cI" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/line{
- dir = 4
+"cd" = (
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/fore)
-"cX" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/obj/machinery/door/poddoor/preopen{
- id = "traumawindows";
- name = "Window Blast Door"
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"dH" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"dI" = (
-/obj/machinery/computer/cargo/express,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"dR" = (
-/obj/machinery/power/smes/shuttle/precharged{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 8
+/obj/effect/turf_decal/industrial/warning{
+ dir = 1
},
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"cK" = (
/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/door/poddoor{
- id = "traumaenginel"
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/light/small/directional/east,
+/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/plating,
/area/ship/maintenance/port)
-"ed" = (
-/obj/machinery/light/small/directional/north,
-/obj/effect/turf_decal/industrial/outline/red,
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/medical,
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"el" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 9
+"cL" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 8
},
-/obj/machinery/light/small/directional/east,
-/obj/machinery/cryopod{
+/obj/item/paper_bin,
+/obj/machinery/door/firedoor/border_only{
dir = 8
},
-/obj/machinery/computer/cryopod/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"eJ" = (
-/obj/machinery/holopad/emergency/command,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
+/obj/effect/turf_decal/industrial/hatch/red,
+/obj/item/folder/white,
+/obj/item/pen,
+/turf/open/floor/plating,
+/area/ship/cargo)
+"dl" = (
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/airlock/medical{
+ name = "Research"
},
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "1-2"
},
-/turf/open/floor/carpet/nanoweave/red,
-/area/ship/bridge)
-"eM" = (
-/obj/machinery/door/window/brigdoor/southright{
- req_access_txt = "5"
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/science)
+"eo" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/shoes/combat,
-/obj/item/clothing/under/rank/security/brig_phys,
-/obj/item/clothing/under/rank/security/brig_phys,
-/obj/item/clothing/under/rank/security/brig_phys,
-/obj/item/clothing/suit/toggle/labcoat/paramedic,
-/obj/item/clothing/suit/toggle/labcoat/paramedic,
-/obj/item/clothing/suit/toggle/labcoat/paramedic,
-/obj/item/clothing/head/soft/paramedic,
-/obj/item/clothing/head/soft/paramedic,
-/obj/item/clothing/head/soft/paramedic,
-/obj/item/storage/backpack/ert/medical,
-/obj/item/storage/backpack/ert/medical,
-/obj/item/storage/backpack/ert/medical,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
},
-/obj/structure/closet/secure_closet/wall{
- dir = 8;
- icon_state = "sec_wall";
- name = "clothing locker";
- pixel_x = 28;
- req_access_txt = "5"
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/medical{
+ name = "Bathroom"
},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/toilet)
"eS" = (
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/white,
/area/ship/cargo)
-"fa" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/machinery/newscaster/directional/south,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew)
-"fe" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
+"eT" = (
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/machinery/computer/rdconsole/core{
+ dir = 4
},
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "0-4"
},
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_x = 11;
+ pixel_y = -16
},
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"fp" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/maintenance/port)
-"fT" = (
-/obj/machinery/stasis,
-/obj/effect/turf_decal/industrial/outline/red,
/obj/machinery/light/directional/west,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/medical)
-"go" = (
-/obj/effect/turf_decal/corner/opaque/red/full,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+/turf/open/floor/plasteel/tech,
+/area/ship/science)
+"fe" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "2-8"
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"gL" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo)
-"gO" = (
/obj/structure/cable{
- icon_state = "0-4"
+ icon_state = "1-2"
},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
- dir = 4;
- id = "traumashield"
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/science)
+"fo" = (
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
},
/obj/machinery/door/firedoor/border_only,
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/airlock/medical{
+ name = "Surgery"
},
-/obj/machinery/door/poddoor/shutters{
- id = "traumalobby";
- name = "Lobby"
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/open/floor/engine,
-/area/ship/cargo)
-"hq" = (
-/turf/open/floor/plasteel/stairs/right{
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/medical/surgery)
+"fp" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/maintenance/port)
+"fW" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 4
+ },
+/obj/machinery/holopad/emergency/medical,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 8
},
-/area/ship/storage)
-"hv" = (
-/obj/effect/turf_decal/arrows/red{
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/medical)
+"fX" = (
+/obj/machinery/vending/snack/random,
+/obj/effect/turf_decal/trimline/opaque/red/filled/line{
dir = 8
},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 4
+/obj/structure/sign/poster/official/cleanliness{
+ pixel_y = 32
},
-/turf/open/floor/plasteel/patterned/grid,
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
+"gf" = (
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/structure/closet/crate/freezer/surplus_limbs,
+/obj/machinery/airalarm/directional/south,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/plasteel/tech,
/area/ship/storage)
+"gL" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/cargo)
+"gW" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/line,
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
"hF" = (
/obj/structure/table/reinforced,
/obj/machinery/fax,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
-"hH" = (
-/obj/machinery/computer/helm,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
"hQ" = (
/obj/structure/table/optable,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/medical)
-"hT" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/effect/turf_decal/siding/white/end,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
+/turf/open/floor/plasteel/tech,
+/area/ship/medical/surgery)
+"hS" = (
+/obj/effect/turf_decal/industrial/hatch/red,
+/obj/machinery/firealarm/directional/west,
+/obj/item/reagent_containers/glass/bottle/formaldehyde,
+/obj/item/storage/box/syringes,
+/obj/item/storage/box/bodybags,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+ icon_state = "0-4"
},
/obj/machinery/light_switch{
- dir = 1;
- pixel_x = -13;
- pixel_y = -16
+ pixel_x = 11;
+ pixel_y = 22
},
-/turf/open/floor/vault,
-/area/ship/storage)
-"ie" = (
-/obj/machinery/door/airlock/medical/glass{
- id_tag = "lobbydoors";
- name = "Sickbay"
+/obj/structure/closet/secure_closet{
+ name = "mortuary locker"
},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
+/turf/open/floor/plasteel/tech,
+/area/ship/medical/surgery)
+"hW" = (
+/obj/structure/dresser{
+ dir = 8
},
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/turf/open/floor/plasteel/white,
-/area/ship/cargo)
-"iA" = (
-/turf/closed/wall/mineral/titanium,
+/turf/open/floor/carpet/cyan,
/area/ship/crew)
-"iJ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+"ih" = (
+/obj/machinery/power/smes/shuttle/precharged{
dir = 4
},
-/obj/machinery/airalarm/directional/south,
-/obj/structure/sign/poster/official/cleanliness{
- pixel_x = -32
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew/toilet)
-"iP" = (
-/obj/machinery/power/smes/engineering{
- charge = 1e+006
+/obj/machinery/door/poddoor{
+ dir = 8;
+ id = "traumaenginel"
},
-/obj/structure/cable{
- icon_state = "0-2"
+/obj/structure/window/reinforced{
+ dir = 8
},
/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"iW" = (
-/turf/open/floor/carpet/cyan,
-/area/ship/crew)
-"jx" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/machinery/door/firedoor/border_only{
+/area/ship/maintenance/port)
+"in" = (
+/obj/structure/bed{
dir = 8
},
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/obj/machinery/door/window/westleft{
- name = "Pharmacy"
+/obj/structure/curtain/bounty,
+/obj/item/bedsheet/blue{
+ dir = 8
},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"kC" = (
-/obj/machinery/door/window/brigdoor/southleft{
- req_access_txt = "5"
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/carpet/cyan,
+/area/ship/crew)
+"iz" = (
+/obj/effect/landmark/start/paramedic,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
},
-/obj/item/storage/belt/medical/surgery,
-/obj/item/storage/belt/medical/paramedic,
-/obj/item/clothing/gloves/color/latex/nitrile,
-/obj/item/clothing/gloves/color/latex/nitrile,
-/obj/item/clothing/gloves/color/latex/nitrile,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
- icon_state = "sec_wall";
- name = "equipment locker";
- pixel_x = -28;
- req_access_txt = "5"
+ dir = 4
},
-/obj/item/healthanalyzer/advanced,
-/obj/item/healthanalyzer/advanced,
-/obj/item/healthanalyzer/advanced,
-/obj/item/clothing/glasses/hud/health/sunglasses,
-/obj/item/clothing/glasses/hud/health/sunglasses,
-/obj/item/clothing/glasses/hud/health/sunglasses,
-/obj/item/storage/belt/medical/paramedic,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/patterned/brushed,
/area/ship/crew)
-"kH" = (
-/obj/item/radio/intercom/directional/east,
-/obj/machinery/power/terminal,
-/obj/structure/cable/yellow,
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"kO" = (
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
- id = "traumashield2"
+"iA" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/crew)
+"iC" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/wood/ebony,
+/area/ship/crew)
+"iQ" = (
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-8"
},
/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
- dir = 8
+ dir = 1
},
/obj/structure/cable{
- icon_state = "0-4"
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"iW" = (
+/turf/open/floor/carpet/cyan,
+/area/ship/crew)
+"jh" = (
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/wood/ebony,
+/area/ship/crew)
+"jK" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning,
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
+ dir = 1
},
/obj/machinery/door/poddoor{
- dir = 4;
+ dir = 1;
id = "traumaramp"
},
/obj/machinery/door/firedoor/border_only{
- dir = 8
+ dir = 1
},
/turf/open/floor/engine,
-/area/ship/storage)
-"kP" = (
-/obj/structure/table/glass,
-/obj/structure/window/reinforced{
- dir = 4
+/area/ship/storage/eva)
+"jU" = (
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/structure/window/reinforced{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/siding/white{
+ dir = 8
},
-/obj/item/clothing/mask/surgical{
- pixel_y = 6
+/obj/effect/turf_decal/siding/white{
+ dir = 4
},
-/obj/item/storage/backpack/duffelbag/med/surgery{
- pixel_y = 10
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/storage/eva)
+"ke" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/structure/curtain/cloth,
+/turf/open/floor/plating,
+/area/ship/science)
+"kh" = (
+/obj/machinery/power/terminal{
+ dir = 8
},
-/obj/item/clothing/suit/apron/surgical{
- pixel_y = 6
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
},
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = 5;
- pixel_y = -1
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"kw" = (
+/obj/structure/chair{
+ dir = 8
},
-/obj/item/reagent_containers/medigel/sterilizine,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/medical)
-"kR" = (
-/obj/machinery/computer/crew,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"lb" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/effect/landmark/start/assistant,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4;
+ color = "#332521"
},
-/obj/effect/turf_decal/trimline/opaque/red/filled/line{
+/turf/open/floor/wood/ebony,
+/area/ship/crew)
+"la" = (
+/obj/structure/railing{
+ dir = 10
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/storage/eva)
+"li" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
dir = 1
},
-/obj/machinery/light_switch{
- pixel_x = 19;
- pixel_y = 13;
- dir = 8
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
},
/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"lj" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = -12
+/area/ship/hallway/central)
+"lJ" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
+ dir = 4
},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 1
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_x = 11;
+ pixel_y = -16
},
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
-"lF" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
+"lS" = (
+/obj/structure/chair,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
+"lX" = (
+/obj/structure/chair{
dir = 1
},
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
+"mo" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/obj/machinery/door/window/westright{
- name = "Storage"
+/obj/machinery/photocopier,
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/carpet/cyan,
+/area/ship/hallway/central)
+"mu" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"lH" = (
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/structure/cable{
- icon_state = "1-4"
+/turf/open/floor/plasteel/mono/white,
+/area/ship/hallway/central)
+"mx" = (
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/machinery/autolathe,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plasteel/tech,
+/area/ship/science)
+"mP" = (
+/obj/structure/sign/departments/medbay/alt,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/maintenance/port)
+"na" = (
+/obj/machinery/vending/cola/random,
+/obj/effect/turf_decal/trimline/opaque/red/filled/line{
+ dir = 8
},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/white,
/area/ship/cargo)
-"lY" = (
-/obj/machinery/door/airlock/medical{
- dir = 4;
- name = "Crew Quarters"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+"nb" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
},
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "2-8"
},
-/obj/machinery/door/firedoor/border_only{
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/medical/surgery)
+"nu" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
+"nF" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/turf/open/floor/plasteel/grimy,
+/turf/open/floor/carpet/cyan,
/area/ship/crew)
-"mw" = (
-/obj/machinery/door/airlock/maintenance_hatch{
- dir = 4;
- name = "Port Engines"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+"nI" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/medical{
+ name = "Treatment Center"
},
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/medical)
+"nW" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/opaque/red/filled/line,
/obj/machinery/door/firedoor/border_only{
dir = 8
},
/obj/machinery/door/firedoor/border_only{
dir = 4
},
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"mG" = (
-/obj/machinery/firealarm/directional/north,
-/obj/structure/sign/warning/gasmask{
- pixel_x = -32
- },
-/obj/item/stack/marker_beacon/thirty,
-/obj/item/stack/marker_beacon/thirty,
-/obj/item/stack/marker_beacon/thirty,
-/obj/item/stack/marker_beacon/thirty,
-/obj/structure/rack,
-/obj/item/pickaxe/emergency{
- desc = "For extracting yourself from rough landings, and getting to the even rougher ones";
- name = "Medical Retrieval Tool"
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_x = 11;
+ pixel_y = -16
},
-/obj/item/pickaxe/emergency{
- desc = "For extracting yourself from rough landings, and getting to the even rougher ones";
- name = "Medical Retrieval Tool"
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"oc" = (
+/obj/effect/turf_decal/corner/opaque/red/full,
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/item/pickaxe/emergency{
- desc = "For extracting yourself from rough landings, and getting to the even rougher ones";
- name = "Medical Retrieval Tool"
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
+"ot" = (
+/obj/machinery/door/poddoor/preopen{
+ dir = 8;
+ id = "traumabridge";
+ name = "Window Blast Door"
},
-/obj/effect/turf_decal/industrial/outline/red,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/storage)
-"mO" = (
-/obj/machinery/computer/med_data,
-/turf/open/floor/plasteel/dark,
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
/area/ship/bridge)
-"mP" = (
-/obj/structure/sign/departments/medbay/alt,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/maintenance/port)
-"mQ" = (
-/obj/structure/window/reinforced{
- dir = 8
+"oA" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/effect/turf_decal/industrial/outline/red,
-/obj/structure/window/reinforced{
- dir = 1
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/obj/structure/closet/secure_closet{
- icon_state = "med";
- name = "medicine locker"
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/obj/item/storage/firstaid/brute,
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/o2,
-/obj/item/storage/firstaid/toxin,
-/obj/item/storage/box/medipens,
-/obj/item/storage/box/syringes,
-/obj/item/storage/firstaid/regular,
-/obj/item/storage/firstaid/regular,
/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"nl" = (
-/obj/machinery/light/small/directional/west,
+/area/ship/cargo)
+"pf" = (
+/obj/docking_port/stationary{
+ dwidth = 8;
+ height = 15;
+ width = 30
+ },
+/turf/template_noop,
+/area/template_noop)
+"pK" = (
+/turf/open/floor/carpet/cyan,
+/area/ship/hallway/central)
+"pQ" = (
+/obj/effect/turf_decal/corner/opaque/red/full,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/turf_decal/number/five{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"nm" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "1-8"
},
-/obj/effect/turf_decal/corner/opaque/white/mono,
/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"np" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/carpet/cyan,
-/area/ship/crew)
-"nu" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/bridge)
-"nw" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
+/area/ship/cargo)
+"qr" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ dir = 4;
+ id = "traumashield2"
},
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-2"
},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"oH" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning,
/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
- icon_state = "2-4"
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
},
-/obj/structure/cable{
- icon_state = "1-4"
+/obj/machinery/door/poddoor{
+ id = "traumaramp"
},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"oQ" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/southleft,
+/turf/open/floor/engine,
+/area/ship/storage/eva)
+"qv" = (
+/obj/structure/table,
/obj/machinery/button/door{
dir = 1;
- id = "lobbydoors";
- name = "Lobby Door Control";
- normaldoorcontrol = 1;
- pixel_x = 11;
- pixel_y = -4
+ id = "traumastore";
+ name = "Storage Shutter Control";
+ pixel_x = -7;
+ pixel_y = -22
},
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/turf_decal/industrial/hatch/red,
-/obj/machinery/button/shieldwallgen{
- dir = 1;
- id = "traumashield";
- name = "Lobby Holoshield";
- pixel_x = -6;
- pixel_y = 8
- },
-/obj/machinery/button/door{
- dir = 1;
- id = "lobbydoors";
- name = "Lobby Door Bolts Control";
- normaldoorcontrol = 1;
- pixel_x = 11;
- pixel_y = 7;
- specialfunctions = 4
+/obj/item/storage/box/bodybags,
+/obj/item/storage/box/bodybags,
+/obj/item/storage/box/masks,
+/obj/item/storage/box/masks,
+/obj/item/storage/box/pillbottles,
+/obj/structure/closet/wall/white/chem{
+ dir = 4;
+ name = "Medical Supplies Locker";
+ pixel_x = -28
},
-/obj/machinery/button/door{
- dir = 1;
- id = "traumalobby";
- name = "Lobby Shutter Control";
- pixel_x = -6;
- pixel_y = -4
+/turf/open/floor/plasteel/tech,
+/area/ship/storage)
+"qA" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/science)
+"qV" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "traumawindows";
+ name = "Window Blast Door"
},
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
/turf/open/floor/plating,
-/area/ship/cargo)
-"oS" = (
+/area/ship/medical)
+"qW" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
+ dir = 8
+ },
+/mob/living/simple_animal/hostile/retaliate/poison/snake{
+ desc = "The CMO's pet snake. The question of what species it actually belongs to is a mystery for the ages.";
+ dir = 8;
+ name = "\proper Deuce"
+ },
+/obj/structure/bed/dogbed{
+ anchored = 1;
+ desc = "A comfy-looking... snake bed? There's bits of shed scales stuck in the bedding...";
+ name = "snake bed"
+ },
+/obj/item/clothing/glasses/hud/health,
+/turf/open/floor/carpet/cyan,
+/area/ship/bridge)
+"rk" = (
+/obj/machinery/rnd/production/techfab/department/medical,
+/obj/effect/turf_decal/industrial/hatch/red,
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ship/science)
+"rn" = (
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/obj/effect/turf_decal/corner/opaque/white/mono,
/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"oX" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/area/ship/cargo)
+"rA" = (
+/obj/structure/cable,
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ dir = 1;
+ id = "traumashield"
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/warning{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/door/poddoor/shutters{
+ dir = 8;
+ id = "traumalobby";
+ name = "Lobby"
+ },
+/turf/open/floor/engine,
+/area/ship/cargo)
+"rJ" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
-/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/power/terminal{
+ dir = 8
+ },
/obj/structure/cable{
icon_state = "0-4"
},
-/obj/machinery/light_switch{
- dir = 1;
- pixel_x = -12;
- pixel_y = -13
- },
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew/toilet)
-"pK" = (
-/obj/structure/table/reinforced,
-/obj/item/folder/blue,
-/obj/item/pen/fourcolor,
-/obj/item/stamp/captain{
- pixel_x = -7;
- pixel_y = -1
- },
-/obj/machinery/button/door{
- id = "traumawindows";
- name = "Window Shutters";
- pixel_x = 5;
- pixel_y = 7
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
},
/obj/machinery/button/door{
- id = "traumabridge";
- name = "Bridge Window Shutters";
+ dir = 2;
+ id = "traumaenginel";
+ name = "Engine Shutter Control";
pixel_x = -5;
- pixel_y = 7
+ pixel_y = 22
},
-/turf/open/floor/carpet/nanoweave/red,
-/area/ship/bridge)
-"qc" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plasteel,
-/area/ship/crew)
-"qd" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = 12
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"rS" = (
+/obj/structure/toilet{
+ dir = 8
},
-/obj/structure/mirror{
- pixel_x = 25
+/obj/structure/window/reinforced/tinted/frosted,
+/obj/machinery/door/window/survival_pod{
+ dir = 8
},
-/obj/machinery/firealarm/directional/north,
+/obj/structure/curtain,
/turf/open/floor/plasteel/freezer,
/area/ship/crew/toilet)
-"qQ" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
+"rT" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/medical/surgery)
+"sd" = (
+/obj/machinery/stasis{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/machinery/light/directional/north,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"sx" = (
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plasteel/stairs/right{
+ dir = 1
+ },
+/area/ship/storage/eva)
+"sC" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "1-4"
},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"rh" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "2-4"
},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"ru" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
+/obj/machinery/door/firedoor/border_only{
dir = 8
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+/obj/effect/turf_decal/industrial/warning{
dir = 8
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/effect/turf_decal/industrial/warning{
+ dir = 4
+ },
+/obj/docking_port/mobile{
+ dir = 4;
+ launch_status = 0;
+ preferred_direction = 4;
+ port_direction = 2
+ },
+/obj/machinery/door/poddoor/shutters{
+ dir = 8;
+ id = "traumalobby";
+ name = "Lobby"
+ },
+/turf/open/floor/engine,
+/area/ship/cargo)
+"sI" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/light/small/directional/east,
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"sO" = (
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/structure/bodycontainer/morgue{
+ dir = 1
+ },
+/obj/machinery/light/directional/south,
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ship/medical/surgery)
+"tb" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/mop,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/storage/bag/trash,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"tn" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/storage/eva)
+"tF" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 8
},
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/white,
+/turf/open/floor/plasteel/patterned/brushed,
/area/ship/medical)
-"rM" = (
-/obj/machinery/light/small/directional/south{
- pixel_x = 17
+"tI" = (
+/obj/machinery/atmospherics/pipe/layer_manifold{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/preopen{
+ dir = 8;
+ id = "traumawindows";
+ name = "Window Blast Door"
+ },
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"tJ" = (
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/light_switch{
+ dir = 8;
+ pixel_x = 19;
+ pixel_y = -12
},
-/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable{
icon_state = "0-8"
},
-/obj/machinery/light_switch{
- dir = 1;
- pixel_x = -13;
- pixel_y = -16
+/obj/structure/closet/crate/freezer{
+ name = "organ freezer"
+ },
+/obj/item/organ/heart/cybernetic,
+/obj/item/organ/heart/cybernetic,
+/obj/item/organ/ears/cybernetic,
+/obj/item/organ/ears/cybernetic,
+/obj/item/organ/liver/cybernetic,
+/obj/item/organ/liver/cybernetic,
+/obj/item/organ/lungs/cybernetic,
+/obj/item/organ/lungs/cybernetic,
+/obj/item/organ/stomach/cybernetic,
+/obj/item/organ/stomach/cybernetic,
+/obj/item/organ/eyes/robotic,
+/obj/item/organ/eyes/robotic,
+/turf/open/floor/plasteel/tech,
+/area/ship/storage)
+"tO" = (
+/turf/open/floor/plasteel/mono/white,
+/area/ship/hallway/central)
+"tT" = (
+/obj/structure/closet/secure_closet/personal/patient,
+/obj/item/clothing/under/rank/medical/gown,
+/obj/item/clothing/under/rank/medical/gown,
+/obj/item/clothing/under/rank/medical/gown/blue,
+/obj/item/clothing/under/rank/medical/gown/green,
+/obj/item/clothing/under/rank/medical/gown/pink,
+/obj/item/clothing/shoes/sandal/slippers,
+/obj/item/clothing/shoes/sandal/slippers,
+/obj/item/clothing/shoes/sandal/slippers,
+/obj/item/clothing/shoes/sandal/slippers,
+/obj/effect/turf_decal/industrial/outline/red,
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"uc" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/bridge)
-"se" = (
-/obj/item/clothing/suit/armor/vest/alt,
-/obj/item/clothing/suit/armor/vest/alt,
-/obj/item/clothing/suit/armor/vest/alt,
-/obj/item/flashlight/seclite,
-/obj/item/flashlight/seclite,
-/obj/item/flashlight/seclite,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/machinery/airalarm/directional/north,
-/obj/item/clothing/head/helmet/sec,
-/obj/item/clothing/head/helmet/sec,
-/obj/item/clothing/head/helmet/sec,
-/obj/structure/closet/secure_closet/wall{
- dir = 8;
- icon_state = "sec_wall";
- name = "armor locker";
- pixel_x = 28;
- req_access_txt = "5"
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
},
-/turf/open/floor/plasteel/dark,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 5;
+ color = "#332521"
+ },
+/turf/open/floor/wood/ebony,
/area/ship/crew)
-"sq" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+"up" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
},
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/turf/open/floor/plasteel/white,
+/turf/open/floor/plasteel/patterned/brushed,
/area/ship/medical)
-"su" = (
-/obj/effect/landmark/start/paramedic,
-/turf/open/floor/plasteel,
-/area/ship/crew)
-"sz" = (
+"us" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/line,
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_y = -19;
+ pixel_x = -8
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"uE" = (
/obj/effect/turf_decal/trimline/opaque/red/filled/line{
dir = 4
},
-/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
+"uT" = (
+/obj/effect/turf_decal/industrial/loading,
+/obj/machinery/defibrillator_mount/loaded{
+ pixel_y = 0;
+ pixel_x = -32
+ },
+/obj/structure/sink{
+ dir = 4;
+ pixel_y = 0;
+ pixel_x = -13
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/medical/surgery)
+"uU" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/obj/machinery/door/firedoor/border_only{
dir = 1
},
-/obj/item/radio/intercom/wideband/directional/east,
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/fore)
-"sH" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/medical{
+ name = "Storage Room"
},
-/obj/structure/cable{
- icon_state = "4-8"
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/storage/eva)
+"vj" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 8
},
+/obj/structure/closet/secure_closet/wall{
+ icon_state = "sec_wall";
+ name = "firearms locker";
+ req_access_txt = "5";
+ pixel_y = 28
+ },
+/obj/item/ammo_box/magazine/m10mm/rubber,
+/obj/item/ammo_box/magazine/m10mm/rubber,
+/obj/item/ammo_box/magazine/m10mm/rubber,
+/obj/item/ammo_box/magazine/m10mm/ap,
+/obj/item/ammo_box/magazine/m10mm/ap,
+/obj/item/ammo_box/magazine/m10mm/ap,
+/obj/item/gun/ballistic/automatic/pistol,
+/obj/item/gun/ballistic/automatic/pistol,
+/obj/item/gun/ballistic/automatic/pistol,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/crew)
+"vn" = (
+/obj/machinery/smartfridge/organ{
+ density = 0;
+ pixel_x = 32
+ },
+/obj/structure/table/glass,
+/obj/machinery/cell_charger,
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"vx" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+ dir = 8
+ },
+/obj/structure/catwalk/over,
/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"sM" = (
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
-/obj/structure/cable{
- icon_state = "2-4"
+/area/ship/external)
+"vE" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4;
+ name = "Helm"
},
-/obj/structure/cable{
- icon_state = "2-8"
+/obj/effect/landmark/start/captain,
+/turf/open/floor/carpet/cyan,
+/area/ship/bridge)
+"wb" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/science)
+"wc" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+ name = "Starboard Engines"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"wp" = (
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/machinery/rnd/server,
+/turf/open/floor/plasteel/tech,
+/area/ship/science)
+"wr" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/plasteel/freezer,
+/area/ship/crew/toilet)
+"wt" = (
+/obj/structure/closet/emcloset/wall{
+ pixel_y = 28
+ },
+/obj/effect/turf_decal/number/two,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"xa" = (
+/obj/machinery/power/terminal{
dir = 8
},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/fore)
-"tq" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/industrial/warning{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"xp" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/sign/poster/official/help_others{
+ pixel_y = 32
},
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew)
-"tE" = (
/obj/effect/turf_decal/trimline/opaque/red/filled/line{
dir = 1
},
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"xB" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/line{
+ dir = 4
+ },
/obj/item/kirbyplants/random,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/plasteel,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/white,
/area/ship/cargo)
-"tO" = (
-/obj/structure/closet/secure_closet{
- icon_state = "med_secure";
- name = "medical intern's locker"
+"xF" = (
+/obj/machinery/computer/helm{
+ dir = 8
},
-/obj/machinery/airalarm/directional/south,
-/obj/item/clothing/glasses/hud/health,
-/obj/item/clothing/glasses/hud/health,
-/obj/item/clothing/glasses/hud/health,
-/obj/item/healthanalyzer,
-/obj/item/healthanalyzer,
-/obj/item/healthanalyzer,
-/obj/item/storage/backpack/satchel/med,
-/obj/item/storage/backpack/satchel/med,
-/obj/item/storage/backpack/satchel/med,
-/obj/item/clothing/shoes/sneakers/blue,
-/obj/item/clothing/shoes/sneakers/blue,
-/obj/item/clothing/shoes/sneakers/blue,
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/item/clothing/under/rank/medical/paramedic/emt,
-/obj/item/clothing/under/rank/medical/paramedic/emt,
-/obj/item/clothing/under/rank/medical/paramedic/emt,
-/turf/open/floor/plasteel/grimy,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"xN" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/obj/effect/landmark/start/assistant,
+/obj/effect/turf_decal/siding/wood{
+ dir = 6;
+ color = "#332521"
+ },
+/turf/open/floor/wood/ebony,
/area/ship/crew)
-"tT" = (
-/obj/machinery/light/directional/east,
-/obj/structure/chair{
+"xW" = (
+/obj/machinery/power/port_gen/pacman,
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/item/stack/sheet/mineral/plasma/twenty,
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"yf" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"tW" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/obj/structure/chair/office/light{
- dir = 1
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/crew)
+"yn" = (
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/obj/effect/landmark/start/chemist,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"uk" = (
-/obj/machinery/modular_computer/console/preset/command{
- dir = 4
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ id = "traumashield"
},
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/bridge)
-"uo" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 4
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 1
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
},
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
-"uq" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced{
+/obj/effect/turf_decal/industrial/warning{
dir = 4
},
-/obj/structure/window/reinforced,
-/obj/item/paper_bin,
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/turf_decal/industrial/hatch/red,
-/obj/item/folder/white,
-/obj/item/pen,
-/turf/open/floor/plating,
+/obj/machinery/door/poddoor/shutters{
+ dir = 8;
+ id = "traumalobby";
+ name = "Lobby"
+ },
+/turf/open/floor/engine,
/area/ship/cargo)
-"ur" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/line{
- dir = 1
+"yQ" = (
+/obj/machinery/computer/med_data{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"yT" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"uE" = (
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 8
+/obj/effect/turf_decal/industrial/warning/corner{
+ dir = 4
},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/industrial/warning/corner{
dir = 8
},
-/obj/machinery/rnd/production/techfab/department/medical,
-/obj/effect/turf_decal/industrial/hatch/red,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"uN" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"yX" = (
+/obj/effect/turf_decal/corner/opaque/red/full,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
+"zh" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/glass/bottle/formaldehyde{
+ pixel_x = 5
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/item/reagent_containers/glass/bottle/formaldehyde{
+ pixel_x = -5
},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"uW" = (
-/obj/structure/chair{
+/obj/item/reagent_containers/glass/bottle/epinephrine{
+ pixel_x = -5;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/glass/bottle/charcoal{
+ pixel_x = 5;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/syringe,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"zl" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/line,
+/obj/machinery/door/firedoor/border_only{
dir = 8
},
-/obj/structure/sign/poster/official/soft_cap_pop_art{
- pixel_x = 32
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"ve" = (
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"zn" = (
/obj/structure/table/reinforced,
-/obj/structure/window/reinforced{
- dir = 8
+/obj/item/folder/white{
+ pixel_x = -5
},
-/obj/structure/window/reinforced,
-/obj/machinery/computer/med_data/laptop{
- dir = 1
+/obj/item/stamp/cmo{
+ pixel_x = -1;
+ pixel_y = 12
},
-/obj/item/radio/intercom/directional/west,
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/turf_decal/industrial/hatch/red,
-/turf/open/floor/plating,
-/area/ship/cargo)
-"vj" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
- dir = 1
+/obj/item/pen{
+ pixel_x = -5
},
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/item/paper_bin{
+ pixel_x = 9
},
-/obj/machinery/light_switch{
+/obj/item/clothing/neck/stethoscope,
+/obj/machinery/recharger,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/carpet/cyan,
+/area/ship/bridge)
+"zo" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew/toilet)
+"zq" = (
+/obj/machinery/door/airlock/medical/glass{
dir = 8;
- pixel_x = 19;
- pixel_y = 13
+ id_tag = "lobbydoors";
+ name = "Sickbay"
},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"vn" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/line{
+/obj/machinery/door/firedoor/border_only{
dir = 8
},
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
+"zy" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"zD" = (
+/obj/effect/turf_decal/arrows/red{
dir = 1
},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/fore)
-"vr" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/storage/eva)
+"zK" = (
+/obj/machinery/power/smes/shuttle/precharged{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/machinery/door/poddoor{
+ dir = 8;
+ id = "traumaenginer"
},
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-8"
},
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"vG" = (
-/obj/machinery/door/firedoor/border_only{
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
dir = 8
},
-/obj/effect/turf_decal/industrial/outline/red,
-/obj/machinery/smartfridge/chemistry,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"vT" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/item/storage/toolbox/electrical,
-/obj/machinery/light_switch{
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"zL" = (
+/obj/structure/table/reinforced,
+/obj/item/folder/blue,
+/obj/item/pen/fourcolor,
+/obj/machinery/button/door{
dir = 8;
- pixel_x = 19;
- pixel_y = 13
+ id = "traumawindows";
+ name = "Window Shutters";
+ pixel_x = 5;
+ pixel_y = 7
},
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"wD" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 1;
- name = "Helm"
+/obj/machinery/button/door{
+ dir = 8;
+ id = "traumabridge";
+ name = "Bridge Window Shutters";
+ pixel_x = -5;
+ pixel_y = 7
},
-/obj/effect/landmark/start/captain,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/bridge)
-"wG" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 1;
- name = "Medical"
+/obj/item/stamp/syndicate{
+ pixel_x = -7;
+ pixel_y = -1
},
-/obj/effect/landmark/start/chief_medical_officer,
-/turf/open/floor/carpet/nanoweave,
+/turf/open/floor/carpet/cyan,
/area/ship/bridge)
-"wQ" = (
-/obj/structure/sign/poster/official/cleanliness{
- pixel_y = 32
- },
-/obj/effect/turf_decal/industrial/outline/red,
-/obj/machinery/chem_master,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"xa" = (
-/obj/effect/turf_decal/corner/opaque/red/full,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"yi" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
- icon_state = "0-2"
+"zM" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
},
-/obj/effect/turf_decal/number/zero{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/light_switch{
- dir = 4;
- pixel_x = -20;
- pixel_y = 13
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"zg" = (
-/obj/machinery/light/directional/north,
-/obj/structure/sign/warning/nosmoking{
- pixel_x = 32
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/trimline/opaque/red/filled/line{
+ dir = 1
},
-/obj/effect/turf_decal/corner/opaque/white/mono,
/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"zo" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew/toilet)
-"zt" = (
-/obj/effect/turf_decal/industrial/outline/red,
-/obj/structure/window/reinforced{
+/area/ship/hallway/central)
+"zS" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
},
-/obj/structure/bodycontainer/morgue{
+/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 8
},
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
-"zE" = (
/obj/structure/cable{
- icon_state = "4-9"
+ icon_state = "2-8"
},
-/obj/structure/cable{
- icon_state = "4-10"
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/medical)
+"zT" = (
+/obj/effect/turf_decal/number/zero,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"Ah" = (
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/carpet/cyan,
+/area/ship/bridge)
+"Ai" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 4
},
-/turf/open/floor/plasteel/stairs/medium{
+/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 8
},
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/patterned/brushed,
/area/ship/storage)
-"zR" = (
-/obj/structure/table/reinforced,
-/obj/item/folder/white{
- pixel_x = -5
+"Aj" = (
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 8
},
-/obj/item/stamp/cmo{
- pixel_x = -1;
- pixel_y = 12
+/obj/structure/closet/secure_closet/wall{
+ dir = 1;
+ icon_state = "sec_wall";
+ name = "armor locker";
+ req_access_txt = "5";
+ pixel_y = -28
},
-/obj/item/pen{
- pixel_x = -5
+/obj/item/clothing/suit/armor/vest/marine/trauma,
+/obj/item/clothing/suit/armor/vest/marine/trauma,
+/obj/item/clothing/suit/armor/vest/marine/trauma,
+/obj/item/clothing/head/helmet/medical,
+/obj/item/clothing/head/helmet/medical,
+/obj/item/clothing/head/helmet/medical,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/tech,
+/area/ship/crew)
+"Ap" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
+ dir = 8
},
-/obj/machinery/firealarm/directional/east,
-/obj/item/paper_bin{
- pixel_x = 9
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/item/clothing/neck/stethoscope,
-/obj/machinery/recharger,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/bridge)
-"zT" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
- piping_layer = 2
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
+"AD" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+ name = "Port Engines"
},
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"AG" = (
-/obj/structure/railing{
- dir = 6
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/machinery/door/firedoor/border_only{
dir = 1
},
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/storage)
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
"AJ" = (
/turf/closed/wall/mineral/titanium,
/area/ship/cargo)
-"Bl" = (
-/obj/effect/turf_decal/corner/opaque/red/full,
+"AQ" = (
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/airlock/medical{
+ name = "Storage Room"
+ },
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"BH" = (
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
- dir = 1;
- id = "traumashield2"
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/storage)
+"AX" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
},
/obj/structure/cable{
- icon_state = "0-4"
+ icon_state = "4-8"
},
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
- dir = 4
+/obj/effect/turf_decal/industrial/warning/corner,
+/obj/effect/turf_decal/industrial/warning/corner{
+ dir = 1
},
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
- dir = 8
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"Bp" = (
+/obj/effect/turf_decal/industrial/warning{
+ dir = 5
},
-/obj/machinery/door/firedoor/border_only{
- dir = 8
+/obj/machinery/cryopod{
+ dir = 1
},
-/obj/machinery/door/poddoor{
+/obj/machinery/computer/cryopod/directional/south,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ship/crew)
+"BD" = (
+/obj/item/storage/belt/medical,
+/obj/item/healthanalyzer/advanced,
+/obj/item/hypospray/mkii/CMO,
+/obj/structure/closet/secure_closet/wall{
dir = 4;
- id = "traumaramp"
+ icon_state = "solgov_wall";
+ name = "chief medical officer's closet";
+ req_access_txt = "40";
+ pixel_x = -28
},
-/turf/open/floor/engine,
-/area/ship/storage)
-"BK" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/line{
+/obj/item/storage/backpack/satchel/med,
+/obj/item/defibrillator/compact/loaded,
+/obj/item/gun/syringe,
+/obj/item/reagent_containers/glass/bottle/sodium_thiopental,
+/obj/item/clothing/glasses/hud/health/night,
+/obj/item/gun/ballistic/automatic/pistol,
+/obj/item/clothing/gloves/color/latex/nitrile/evil,
+/obj/item/clothing/suit/toggle/labcoat/raincoat,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/head/beret/cmo/cybersun,
+/obj/item/clothing/under/rank/medical/chief_medical_officer/cybersun,
+/turf/open/floor/carpet/cyan,
+/area/ship/bridge)
+"BU" = (
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed,
+/obj/item/clothing/mask/gas/sechailer,
+/obj/item/tank/internals/oxygen/red,
+/turf/open/floor/plasteel/tech,
+/area/ship/storage/eva)
+"Ca" = (
+/obj/machinery/computer/crew{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 8
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Cp" = (
+/obj/machinery/door/airlock/medical{
+ name = "Crew Quarters"
},
-/obj/machinery/airalarm/directional/west,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/fore)
-"BN" = (
-/obj/docking_port/mobile{
- launch_status = 0;
- port_direction = 2
- },
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
},
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew)
+"Cy" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "1-2"
},
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/turf_decal/industrial/warning,
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
-/obj/machinery/door/poddoor/shutters{
- id = "traumalobby";
- name = "Lobby"
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"CF" = (
+/obj/machinery/door/window/brigdoor/southright{
+ dir = 8;
+ req_access_txt = "5"
+ },
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/shoes/combat,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/obj/structure/closet/secure_closet/wall{
+ dir = 1;
+ icon_state = "sec_wall";
+ name = "clothing locker";
+ req_access_txt = "5";
+ pixel_y = -28
+ },
+/obj/item/clothing/under/syndicate/medic,
+/obj/item/clothing/under/syndicate/medic,
+/obj/item/clothing/under/syndicate/medic,
+/obj/item/clothing/head/soft/cybersun/medical,
+/obj/item/clothing/head/soft/cybersun/medical,
+/obj/item/clothing/head/soft/cybersun/medical,
+/obj/item/clothing/suit/toggle/labcoat/raincoat,
+/obj/item/clothing/suit/toggle/labcoat/raincoat,
+/obj/item/clothing/suit/toggle/labcoat/raincoat,
+/obj/item/storage/backpack/ert/medical,
+/obj/item/storage/backpack/ert/medical,
+/obj/item/storage/backpack/ert/medical,
+/obj/item/clothing/under/syndicate/medic/skirt,
+/obj/item/clothing/under/syndicate/medic/skirt,
+/obj/item/clothing/under/syndicate/medic/skirt,
+/turf/open/floor/plasteel/tech,
+/area/ship/crew)
+"CL" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
},
-/turf/open/floor/engine,
-/area/ship/cargo)
-"Cr" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
-/obj/effect/turf_decal/trimline/opaque/red/filled/line{
- dir = 8
+/turf/open/floor/plasteel/mono/white,
+/area/ship/hallway/central)
+"CZ" = (
+/obj/machinery/door/poddoor/preopen{
+ dir = 8;
+ id = "traumawindows";
+ name = "Window Blast Door"
},
-/obj/machinery/light_switch{
- dir = 4;
- pixel_x = -21;
- pixel_y = 10
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
+/area/ship/crew)
+"Dp" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/poddoor/preopen{
+ dir = 8;
+ id = "traumasurgery";
+ name = "Window Blast Door"
},
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/fore)
-"CX" = (
+/turf/open/floor/plating,
+/area/ship/medical)
+"Dr" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/obj/structure/cable{
- icon_state = "1-8"
+ icon_state = "1-4"
},
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "1-8"
},
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
+/obj/effect/turf_decal/industrial/warning,
/turf/open/floor/plating,
/area/ship/maintenance/port)
-"Dj" = (
-/obj/machinery/power/shuttle/engine/electric{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"Dy" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/mob/living/simple_animal/hostile/retaliate/poison/snake{
- desc = "The CMO's pet snake. The question of what species it actually belongs to is a mystery for the ages.";
- name = "\proper Deuce"
+"DS" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
},
-/obj/structure/bed/dogbed{
- anchored = 1;
- desc = "A comfy-looking... snake bed? There's bits of shed scales stuck in the bedding...";
- name = "snake bed"
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_y = -17;
+ pixel_x = 11
},
-/obj/item/clothing/glasses/hud/health,
-/turf/open/floor/carpet/nanoweave/red,
-/area/ship/bridge)
-"DH" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 4
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/obj/effect/turf_decal/industrial/outline/red,
-/obj/structure/window/reinforced{
- dir = 1
+/obj/effect/turf_decal/industrial/warning/corner{
+ dir = 8
},
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"DX" = (
/obj/structure/closet/crate/medical,
/obj/item/roller,
/obj/item/roller,
/obj/item/roller,
/obj/item/roller,
/obj/item/roller,
-/obj/item/tank/internals/anesthetic,
/obj/item/clothing/mask/breath/medical,
/obj/machinery/iv_drip,
/obj/machinery/iv_drip,
/obj/machinery/iv_drip,
/obj/machinery/iv_drip,
/obj/machinery/iv_drip,
-/obj/item/storage/box/bodybags,
-/obj/item/storage/box/gloves,
-/obj/item/storage/box/masks,
-/obj/item/storage/box/bodybags,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"DU" = (
-/obj/structure/sign/poster/official/cleanliness{
- pixel_x = -32
+/obj/effect/turf_decal/industrial/outline/red,
+/turf/open/floor/plasteel/tech,
+/area/ship/storage)
+"Eb" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
},
-/obj/machinery/computer/operating,
-/obj/structure/window/reinforced{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"Ev" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew)
+"EL" = (
+/obj/structure/bed{
+ dir = 8
+ },
+/obj/structure/curtain/bounty,
+/obj/item/bedsheet/cmo{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"ES" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/obj/item/radio/intercom/wideband/directional/west,
+/turf/open/floor/carpet/cyan,
+/area/ship/bridge)
+"EW" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/medical/surgery)
+"Fe" = (
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed,
+/obj/item/clothing/mask/gas/sechailer,
+/obj/item/tank/internals/oxygen/red,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/tech,
+/area/ship/storage/eva)
+"Fr" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/machinery/door/poddoor/preopen{
+ dir = 8;
+ id = "traumastore";
+ name = "Window Blast Door"
},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/medical)
-"Ev" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/open/floor/plating,
+/area/ship/storage)
+"FE" = (
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel/patterned/brushed,
/area/ship/crew)
-"EA" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/machinery/photocopier,
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/medical)
-"FA" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/line{
+"FH" = (
+/obj/structure/chair{
dir = 4
},
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"FO" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/fore)
-"FE" = (
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/industrial/outline/red,
-/obj/machinery/reagentgrinder{
- pixel_y = 10
- },
-/obj/structure/table,
-/obj/item/lighter{
- pixel_x = -8
- },
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"Go" = (
+/turf/open/floor/carpet/cyan,
+/area/ship/bridge)
+"Gj" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/door/window{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/door/firedoor/border_only{
- dir = 4
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 1
+/turf/open/floor/plasteel/mono/white,
+/area/ship/hallway/central)
+"Gr" = (
+/obj/effect/turf_decal/corner/opaque/red/full,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
},
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
"Gs" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/storage/bag/trash,
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"GP" = (
-/obj/machinery/door/airlock/maintenance_hatch{
- dir = 4;
- name = "Starboard Engines"
+/obj/structure/table,
+/obj/machinery/microwave{
+ pixel_y = 5
},
+/obj/machinery/newscaster/directional/west,
+/obj/effect/turf_decal/siding/wood{
+ dir = 2;
+ color = "#332521"
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/crew)
+"Gw" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
@@ -1424,383 +1787,434 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/door/airlock/medical/glass{
+ dir = 8;
+ id_tag = "lobbydoors";
+ name = "Sickbay"
+ },
/obj/machinery/door/firedoor/border_only{
dir = 8
},
/obj/machinery/door/firedoor/border_only{
dir = 4
},
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"Hk" = (
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/combatmedic,
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/effect/turf_decal/industrial/hatch/red,
-/obj/structure/sign/warning/nosmoking{
- pixel_y = 32
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"Hl" = (
-/obj/structure/sign/poster/contraband/random,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew)
-"Hq" = (
-/obj/structure/window/reinforced{
- dir = 4
+/obj/effect/turf_decal/corner/opaque/white/mono,
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
+"GH" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4;
+ name = "Medical"
},
-/obj/machinery/door/window/northleft,
-/obj/machinery/power/terminal,
-/obj/structure/cable,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"Hr" = (
-/obj/structure/bed,
-/obj/structure/curtain/bounty,
-/obj/item/bedsheet/captain,
-/turf/open/floor/plasteel/dark,
+/obj/effect/landmark/start/chief_medical_officer,
+/turf/open/floor/carpet/cyan,
/area/ship/bridge)
-"HF" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+"GI" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
+"GK" = (
+/obj/structure/chair,
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
+"GZ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 1
+ dir = 8
},
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
-"HP" = (
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/medical)
-"HU" = (
-/obj/structure/sign/departments/medbay/alt,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/maintenance/starboard)
-"IE" = (
-/obj/machinery/light/small/directional/east,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/medical/surgery)
+"Hb" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"IG" = (
-/obj/effect/turf_decal/corner/opaque/red/full,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/machinery/door/firedoor/border_only{
dir = 1
},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"Ja" = (
-/obj/structure/chair{
- dir = 4
- },
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"Je" = (
-/obj/machinery/power/terminal,
-/obj/structure/cable/yellow,
-/obj/item/wrench/crescent,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"Jn" = (
-/obj/machinery/power/shuttle/engine/electric{
- dir = 1
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/maintenance_hatch{
+ name = "Port Engines"
},
-/obj/structure/cable,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech/grid,
/area/ship/maintenance/port)
-"JA" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor/preopen{
- dir = 4;
- id = "traumawindows";
- name = "Window Blast Door"
- },
-/turf/open/floor/plating,
-/area/ship/medical)
-"Kc" = (
-/obj/structure/sign/departments/medbay/alt,
+"Hk" = (
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/structure/crate_shelf,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ship/storage/eva)
+"Hl" = (
+/obj/structure/sign/poster/contraband/random,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/crew)
-"Kh" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/obj/machinery/airalarm/directional/west,
-/obj/machinery/power/terminal,
-/obj/structure/cable,
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"Ki" = (
-/obj/effect/landmark/start/paramedic,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/firealarm/directional/west,
-/obj/machinery/light_switch{
- dir = 4;
- pixel_x = -21;
- pixel_y = -10
- },
-/turf/open/floor/plasteel,
-/area/ship/crew)
-"Ko" = (
-/obj/machinery/light/directional/east,
+"HE" = (
+/obj/structure/rack,
/obj/effect/turf_decal/industrial/outline/red,
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/medical,
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/radio/intercom/directional/west,
+/obj/item/multitool,
/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"Kv" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/line{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/area/ship/storage/eva)
+"HI" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/southleft{
dir = 8
},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/fore)
-"KD" = (
-/obj/structure/window/reinforced{
+/obj/machinery/button/door{
+ dir = 4;
+ id = "lobbydoors";
+ name = "Lobby Door Control";
+ normaldoorcontrol = 1;
+ pixel_x = 6;
+ pixel_y = -4
+ },
+/obj/machinery/door/firedoor/border_only{
dir = 8
},
-/obj/machinery/door/window/northright,
-/obj/machinery/power/terminal,
-/obj/structure/cable,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"KR" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = 12
+/obj/effect/turf_decal/industrial/hatch/red,
+/obj/machinery/button/shieldwallgen{
+ dir = 4;
+ id = "traumashield";
+ name = "Lobby Holoshield";
+ pixel_x = -6;
+ pixel_y = 8
},
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/obj/item/storage/box/pillbottles,
-/obj/item/storage/box/pillbottles,
-/obj/item/storage/box/medigels,
-/obj/item/storage/box/medigels,
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/dropper,
-/obj/item/clothing/suit/toggle/labcoat/chemist/side,
-/obj/item/clothing/glasses/science,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/structure/closet/wall/white/chem{
- dir = 1;
- name = "Chemistry Locker";
- pixel_y = -28
+/obj/machinery/button/door{
+ dir = 4;
+ id = "lobbydoors";
+ name = "Lobby Door Bolts Control";
+ normaldoorcontrol = 1;
+ pixel_x = 6;
+ pixel_y = 8;
+ specialfunctions = 4
},
-/obj/item/storage/backpack/satchel/chem,
-/obj/item/clothing/head/beret/chem,
-/obj/machinery/light/directional/east,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"KW" = (
-/obj/structure/sign/departments/medbay/alt,
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/obj/machinery/button/door{
+ dir = 4;
+ id = "traumalobby";
+ name = "Lobby Shutter Control";
+ pixel_x = -6;
+ pixel_y = -4
+ },
+/turf/open/floor/plating,
/area/ship/cargo)
-"Lh" = (
-/obj/machinery/atmospherics/components/binary/pump/on/layer2,
-/obj/structure/closet/firecloset/wall{
- dir = 8;
- pixel_x = 28
+"HR" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
+/obj/machinery/firealarm/directional/north,
/turf/open/floor/plating,
/area/ship/maintenance/port)
-"Ll" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/line{
+"HU" = (
+/obj/structure/sign/departments/medbay/alt,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/maintenance/starboard)
+"IL" = (
+/obj/structure/chair{
dir = 8
},
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 5
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 4;
+ color = "#332521"
+ },
+/turf/open/floor/wood/ebony,
+/area/ship/crew)
+"Jh" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "traumawindows";
+ name = "Window Blast Door"
+ },
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
+/area/ship/medical/surgery)
+"Jw" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/fore)
-"Ln" = (
/obj/structure/cable{
- icon_state = "6-8"
+ icon_state = "0-8"
},
-/obj/effect/turf_decal/arrows/red{
- dir = 8
+/obj/machinery/door/poddoor{
+ dir = 8;
+ id = "traumaenginel"
},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/structure/window/reinforced{
dir = 1
},
-/obj/effect/turf_decal/spline/fancy/opaque/black/corner,
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/storage)
-"Lt" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+/obj/structure/window/reinforced{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"JA" = (
+/obj/machinery/power/smes/engineering{
+ charge = 1e+006
},
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-8"
},
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
-"Lu" = (
+"JC" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ dir = 8;
+ id = "traumashield2"
+ },
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning,
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
+ dir = 1
+ },
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-2"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/machinery/door/poddoor{
+ id = "traumaramp"
},
-/obj/effect/turf_decal/siding/white,
-/obj/effect/turf_decal/siding/white{
+/obj/machinery/door/firedoor/border_only{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+/turf/open/floor/engine,
+/area/ship/storage/eva)
+"JQ" = (
+/obj/structure/sign/warning/gasmask{
+ pixel_y = 32
+ },
+/obj/item/stack/marker_beacon/thirty,
+/obj/item/stack/marker_beacon/thirty,
+/obj/item/stack/marker_beacon/thirty,
+/obj/item/stack/marker_beacon/thirty,
+/obj/structure/rack,
+/obj/item/pickaxe/emergency{
+ desc = "For extracting yourself from rough landings, and getting to the even rougher ones";
+ name = "Medical Retrieval Tool"
},
-/turf/open/floor/vault,
+/obj/item/pickaxe/emergency{
+ desc = "For extracting yourself from rough landings, and getting to the even rougher ones";
+ name = "Medical Retrieval Tool"
+ },
+/obj/item/pickaxe/emergency{
+ desc = "For extracting yourself from rough landings, and getting to the even rougher ones";
+ name = "Medical Retrieval Tool"
+ },
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/storage/eva)
+"Kc" = (
+/obj/structure/sign/departments/medbay/alt,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew)
+"Ki" = (
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/machinery/vending/medical,
+/turf/open/floor/plasteel/tech,
/area/ship/storage)
-"Ml" = (
-/obj/docking_port/stationary{
- dir = 8;
- dwidth = 8;
- height = 15;
- width = 30
+"Kk" = (
+/obj/machinery/power/terminal{
+ dir = 8
},
-/turf/template_noop,
-/area/template_noop)
-"Mx" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/machinery/firealarm/directional/west{
- pixel_y = 6
+/obj/machinery/light/small/directional/south,
+/obj/effect/turf_decal/industrial/warning{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"Kp" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4
+ },
+/obj/machinery/power/terminal{
+ dir = 8
},
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "0-4"
+ },
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
},
-/obj/effect/turf_decal/industrial/warning,
/obj/machinery/button/door{
- dir = 4;
id = "traumaenginer";
name = "Engine Shutter Control";
- pixel_x = -22;
- pixel_y = -8
+ pixel_x = -5;
+ pixel_y = -18;
+ dir = 1
},
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
-"MK" = (
-/obj/effect/turf_decal/industrial/outline/red,
-/obj/structure/railing/corner,
-/obj/machinery/vending/medical,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/storage)
-"MN" = (
-/obj/machinery/power/port_gen/pacman,
-/obj/structure/cable/yellow{
- icon_state = "0-2"
+"Kv" = (
+/obj/structure/closet/secure_closet{
+ icon_state = "med_secure";
+ name = "medical intern's locker"
},
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/light/small/directional/north,
-/obj/item/stack/sheet/mineral/plasma/twenty,
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"MP" = (
+/obj/item/clothing/glasses/hud/health,
+/obj/item/clothing/glasses/hud/health,
+/obj/item/clothing/glasses/hud/health,
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/item/storage/backpack/satchel/med,
+/obj/item/storage/backpack/satchel/med,
+/obj/item/storage/backpack/satchel/med,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/shoes/combat,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1;
+ color = "#332521"
+ },
+/obj/item/clothing/under/syndicate/cybersun,
+/obj/item/clothing/under/syndicate/cybersun,
+/obj/item/clothing/under/syndicate/cybersun,
+/turf/open/floor/wood/ebony,
+/area/ship/crew)
+"KB" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/line,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"KS" = (
/obj/machinery/power/port_gen/pacman,
/obj/structure/cable/yellow{
- icon_state = "0-2"
+ icon_state = "0-8"
},
/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/light/small/directional/north,
/obj/item/stack/sheet/mineral/plasma/twenty,
/turf/open/floor/plating,
/area/ship/maintenance/port)
-"MW" = (
-/obj/structure/table,
-/obj/item/radio/intercom/directional/south,
-/obj/machinery/cell_charger,
-/turf/open/floor/plasteel/grimy,
+"KU" = (
+/obj/structure/bed{
+ dir = 8
+ },
+/obj/structure/curtain/bounty,
+/obj/item/bedsheet/blue{
+ dir = 8
+ },
+/turf/open/floor/carpet/cyan,
/area/ship/crew)
-"MY" = (
+"KW" = (
+/obj/structure/sign/departments/medbay/alt,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/cargo)
+"KZ" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/effect/turf_decal/industrial/hatch/red,
+/obj/structure/sign/warning/nosmoking{
+ pixel_x = 32
+ },
+/obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed,
+/obj/item/clothing/mask/gas/sechailer,
+/obj/item/tank/internals/oxygen/red,
+/turf/open/floor/plasteel/tech,
+/area/ship/storage/eva)
+"Le" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/line{
+ dir = 1
+ },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 9
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
},
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/open/floor/carpet/nanoweave/red,
-/area/ship/bridge)
-"Nn" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/bridge)
-"Nq" = (
-/obj/item/clothing/gloves/color/latex/nitrile,
-/obj/item/clothing/suit/toggle/labcoat/cmo,
-/obj/item/clothing/shoes/sneakers/white,
-/obj/item/storage/belt/medical,
-/obj/item/clothing/neck/tie/light_blue,
-/obj/item/healthanalyzer/advanced,
-/obj/item/hypospray/mkii/CMO,
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
- icon_state = "solgov_wall";
- name = "chief medical officer's closet";
- pixel_y = -28;
- req_access_txt = "40"
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"Lh" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
+ dir = 1
},
-/obj/item/storage/backpack/satchel/med,
-/obj/item/gun/energy/e_gun/mini,
-/obj/item/defibrillator/compact/loaded,
-/obj/item/gun/syringe,
-/obj/item/reagent_containers/glass/bottle/sodium_thiopental,
-/obj/item/clothing/glasses/hud/health/night,
-/obj/item/clothing/head/beret/cmo,
-/turf/open/floor/carpet/nanoweave,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"Ln" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/storage/eva)
+"Lr" = (
+/obj/machinery/modular_computer/console/preset/command,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/carpet/cyan,
/area/ship/bridge)
-"Ny" = (
-/obj/machinery/power/smes/shuttle/precharged{
+"Ls" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
dir = 1
},
-/obj/structure/window/reinforced,
-/obj/machinery/door/window/northleft,
-/obj/structure/cable{
- icon_state = "0-2"
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/computer/med_data/laptop{
+ dir = 4
},
-/obj/machinery/door/poddoor{
- id = "traumaenginel"
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
},
+/obj/effect/turf_decal/industrial/hatch/red,
/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"Ob" = (
-/obj/machinery/power/smes/shuttle/precharged{
+/area/ship/cargo)
+"LH" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/line{
dir = 1
},
-/obj/structure/window/reinforced,
-/obj/machinery/door/window/northright,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/door/poddoor{
- id = "traumaenginer"
- },
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"OA" = (
-/obj/machinery/firealarm/directional/west,
-/obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/industrial/hatch/red,
-/obj/structure/closet/crate/freezer/surplus_limbs/organs,
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
-"OB" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
@@ -1810,618 +2224,540 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"OK" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/storage)
-"Po" = (
-/obj/machinery/holopad/emergency/medical,
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 1
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
-"Pp" = (
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"Pr" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
+/obj/machinery/door/firedoor/border_only{
dir = 8
},
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/machinery/door/firedoor/border_only{
dir = 4
},
-/obj/structure/cable{
- icon_state = "2-8"
+/obj/structure/sign/poster/official/cleanliness{
+ pixel_y = 32
},
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"LJ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable{
- icon_state = "1-8"
+ icon_state = "0-2"
},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/fore)
-"Ps" = (
-/obj/structure/closet/emcloset/wall{
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/light_switch{
dir = 4;
- pixel_x = -28
+ pixel_x = -20;
+ pixel_y = -11
},
-/obj/effect/turf_decal/number/two{
- dir = 4
+/turf/open/floor/plasteel/freezer,
+/area/ship/crew/toilet)
+"Mb" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 9
},
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"PG" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-4"
},
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/turf_decal/siding/white,
-/obj/effect/turf_decal/siding/white{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/vault,
-/area/ship/storage)
-"PH" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor/preopen{
- id = "traumawindows";
- name = "Window Blast Door"
- },
+/obj/structure/closet/secure_closet/medical2,
+/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/machinery/firealarm/directional/south,
/turf/open/floor/plating,
-/area/ship/crew)
-"PL" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on,
-/obj/structure/catwalk/over,
+/area/ship/maintenance/starboard)
+"MW" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/structure/curtain/cloth,
/turf/open/floor/plating,
-/area/ship/external)
-"Qe" = (
-/obj/structure/toilet,
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 4
+/area/ship/medical)
+"Nn" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/bridge)
+"Nz" = (
+/obj/machinery/shower{
+ dir = 8;
+ pixel_y = 15
},
-/obj/machinery/door/window/survival_pod,
/obj/structure/curtain,
+/obj/structure/window/reinforced/tinted/frosted,
+/obj/machinery/door/window/survival_pod{
+ dir = 8
+ },
+/obj/item/soap,
/turf/open/floor/plasteel/freezer,
/area/ship/crew/toilet)
-"Qp" = (
-/obj/machinery/vending/snack/random,
-/obj/effect/turf_decal/trimline/opaque/red/filled/line,
-/obj/structure/sign/poster/official/cleanliness{
- pixel_x = -32
+"Of" = (
+/obj/structure/cable{
+ icon_state = "2-5"
},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"Qq" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/medical)
-"QE" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+/obj/structure/cable{
+ icon_state = "2-9"
},
+/turf/open/floor/plasteel/stairs/medium{
+ dir = 1
+ },
+/area/ship/storage/eva)
+"OF" = (
+/obj/effect/landmark/start/paramedic,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-8"
},
-/obj/effect/turf_decal/siding/white/end{
- dir = 4
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/light_switch{
+ pixel_x = 11;
+ pixel_y = 22
},
-/turf/open/floor/vault,
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/crew)
+"OK" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/storage)
-"QP" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
- dir = 4
- },
+"OM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"QQ" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
- dir = 4
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
- dir = 8
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/obj/machinery/door/poddoor{
- dir = 8;
- id = "traumaramp"
+/obj/effect/turf_decal/trimline/opaque/red/filled/line{
+ dir = 1
},
/obj/machinery/door/firedoor/border_only{
dir = 8
},
-/turf/open/floor/engine,
-/area/ship/storage)
-"QU" = (
-/obj/effect/landmark/start/paramedic,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
- icon_state = "0-2"
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
},
-/turf/open/floor/plasteel,
-/area/ship/crew)
-"QY" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"OZ" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/storage/eva)
+"Pg" = (
+/obj/structure/table/glass,
+/obj/item/clothing/mask/surgical{
+ pixel_y = 6
},
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/power/terminal,
-/obj/structure/cable,
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"Rh" = (
-/obj/machinery/door/airlock/maintenance_hatch{
- dir = 4;
- name = "Port Engines"
+/obj/item/storage/backpack/duffelbag/med/surgery{
+ pixel_y = 10
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+/obj/item/clothing/suit/apron/surgical{
+ pixel_y = 6
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = 5;
+ pixel_y = -1
},
+/obj/item/reagent_containers/medigel/sterilizine,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/tech,
+/area/ship/medical/surgery)
+"Pm" = (
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"Rs" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/trimline/opaque/red/filled/line{
+ dir = 1
},
/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"RB" = (
-/obj/structure/window/reinforced{
+/area/ship/hallway/central)
+"Pp" = (
+/obj/machinery/door/window/brigdoor/southleft{
+ dir = 8;
+ req_access_txt = "5"
+ },
+/obj/item/storage/belt/medical/surgery,
+/obj/item/storage/belt/medical/paramedic,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/structure/closet/crate/freezer/blood,
-/obj/item/reagent_containers/blood/lizard,
-/obj/item/reagent_containers/blood/lizard,
-/obj/item/reagent_containers/blood/squid,
-/obj/item/reagent_containers/blood/universal,
-/obj/machinery/smartfridge/bloodbank/preloaded{
- density = 0;
- pixel_y = 32
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/medical)
-"RW" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
- icon_state = "1-4"
+/obj/structure/closet/secure_closet/wall{
+ icon_state = "sec_wall";
+ name = "equipment locker";
+ req_access_txt = "5";
+ pixel_y = 28
},
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"Sc" = (
-/obj/structure/chair,
-/obj/effect/landmark/start/assistant,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/item/healthanalyzer/advanced,
+/obj/item/healthanalyzer/advanced,
+/obj/item/healthanalyzer/advanced,
+/obj/item/clothing/glasses/hud/health/sunglasses,
+/obj/item/clothing/glasses/hud/health/sunglasses,
+/obj/item/clothing/glasses/hud/health/sunglasses,
+/obj/item/storage/belt/medical/paramedic,
+/obj/item/clothing/gloves/color/latex/nitrile/evil,
+/obj/item/clothing/gloves/color/latex/nitrile/evil,
+/obj/item/clothing/gloves/color/latex/nitrile/evil,
+/turf/open/floor/plasteel/tech,
+/area/ship/crew)
+"Pz" = (
+/obj/machinery/atmospherics/components/unary/tank/air{
+ piping_layer = 2;
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"PF" = (
+/obj/machinery/power/shuttle/engine/electric{
dir = 4
},
-/turf/open/floor/plasteel/grimy,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"PH" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "traumawindows";
+ name = "Window Blast Door"
+ },
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
/area/ship/crew)
-"Sx" = (
+"Qq" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/medical)
+"Qw" = (
/obj/structure/cable{
- icon_state = "5-8"
+ icon_state = "1-6"
},
/obj/machinery/button/door{
- dir = 1;
+ dir = 4;
id = "traumaramp";
name = "Emergency Ramp";
- pixel_x = -4;
- pixel_y = -26
+ pixel_x = -26;
+ pixel_y = -4
},
/obj/machinery/button/shieldwallgen{
- dir = 1;
+ dir = 4;
id = "traumashield2";
name = "Emergency Ramp Shield";
- pixel_x = 6;
- pixel_y = -23
+ pixel_x = -23;
+ pixel_y = 6
},
/obj/effect/turf_decal/arrows/red{
- dir = 8
- },
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 4
+ dir = 1
},
+/obj/effect/turf_decal/spline/fancy/opaque/black,
/turf/open/floor/plasteel/patterned/grid,
-/area/ship/storage)
-"Sy" = (
-/obj/machinery/stasis,
-/obj/effect/turf_decal/industrial/outline/red,
-/obj/machinery/smartfridge/organ{
- density = 0;
- pixel_y = 32
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/medical)
-"SH" = (
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/industrial/outline/red,
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/open/floor/plasteel/tech,
-/area/ship/storage)
-"SI" = (
-/obj/structure/bed,
-/obj/structure/curtain/bounty,
-/obj/item/bedsheet/cmo,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"SP" = (
-/obj/machinery/shower{
- pixel_y = 15
- },
-/obj/structure/curtain,
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 4
- },
-/obj/machinery/door/window/survival_pod,
-/obj/item/soap,
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew/toilet)
-"SR" = (
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/turf_decal/siding/white{
+/area/ship/storage/eva)
+"QF" = (
+/obj/structure/chair/office/light{
dir = 8
},
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/turf/open/floor/vault,
-/area/ship/storage)
-"Ti" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/maintenance/starboard)
-"Tj" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/carpet/nanoweave/red,
-/area/ship/bridge)
-"Tq" = (
-/obj/structure/chair/office/light,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
+ dir = 6
},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/medical)
-"Tt" = (
-/obj/machinery/light/directional/north,
-/obj/structure/filingcabinet/medical,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/medical)
-"Tx" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 10
+/turf/open/floor/carpet/cyan,
+/area/ship/hallway/central)
+"QG" = (
+/obj/machinery/power/smes/shuttle/precharged{
+ dir = 4
},
/obj/structure/cable{
- icon_state = "1-8"
+ icon_state = "0-8"
},
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/door/poddoor{
+ dir = 8;
+ id = "traumaenginer"
+ },
+/obj/structure/window/reinforced{
+ dir = 8
},
-/obj/structure/closet/secure_closet/medical2,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/glass/bottle/morphine,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
-"TI" = (
-/obj/machinery/vending/wardrobe/medi_wardrobe,
-/turf/open/floor/carpet/cyan,
-/area/ship/crew)
-"TO" = (
-/obj/structure/cable{
- icon_state = "0-8"
+"Ra" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "traumawindows";
+ name = "Window Blast Door"
},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
- dir = 8;
- id = "traumashield"
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"Rb" = (
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/warning{
+/obj/effect/turf_decal/siding/white{
dir = 1
},
-/obj/machinery/door/poddoor/shutters{
- id = "traumalobby";
- name = "Lobby"
+/obj/effect/turf_decal/siding/white/corner{
+ dir = 8
},
-/turf/open/floor/engine,
-/area/ship/cargo)
-"TR" = (
-/obj/structure/chair,
-/obj/effect/landmark/start/assistant,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+/obj/effect/turf_decal/siding/white/corner,
+/obj/structure/cable{
+ icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew)
-"Uc" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/storage)
-"Ug" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
- dir = 4
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+ dir = 6
},
-/obj/structure/cable{
- icon_state = "4-8"
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/storage/eva)
+"Rl" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/fore)
-"UC" = (
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/trimline/opaque/red/filled/line{
+/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/fore)
-"UG" = (
-/turf/template_noop,
-/area/template_noop)
-"UJ" = (
-/obj/item/clothing/suit/armor/hos/trenchcoat,
-/obj/item/areaeditor/shuttle,
-/obj/item/reagent_containers/food/drinks/flask/gold,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-/obj/item/megaphone/command,
-/obj/item/clothing/glasses/sunglasses,
-/obj/item/clothing/shoes/sneakers/white,
-/obj/structure/closet/secure_closet/wall{
- dir = 1;
- icon_state = "solgov_wall";
- name = "captain's closet";
- pixel_y = -28;
- req_access_txt = "20"
- },
-/obj/item/storage/backpack/messenger/com,
-/obj/item/gun/ballistic/revolver/detective{
- name = "\improper Colt Navy Special"
- },
-/obj/item/clothing/head/beret/durathread{
- name = "captain beret"
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
},
-/turf/open/floor/carpet/nanoweave,
-/area/ship/bridge)
-"UO" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/maintenance/starboard)
-"UR" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew)
-"UX" = (
-/obj/item/ammo_box/magazine/co9mm{
- ammo_type = /obj/item/ammo_casing/c9mm/rubber;
- name = "Commander magazine (Rubbershot 9mm)"
- },
-/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
-/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
-/obj/item/ammo_box/magazine/co9mm{
- ammo_type = /obj/item/ammo_casing/c9mm/rubber;
- name = "Commander magazine (Rubbershot 9mm)"
- },
-/obj/item/ammo_box/magazine/co9mm{
- ammo_type = /obj/item/ammo_casing/c9mm/rubber;
- name = "Commander magazine (Rubbershot 9mm)"
- },
-/obj/item/ammo_box/magazine/co9mm{
- ammo_type = /obj/item/ammo_casing/c9mm/ap;
- name = "Commander magazine (AP 9mm)"
+ icon_state = "1-4"
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/structure/closet/secure_closet/wall{
- dir = 4;
- icon_state = "sec_wall";
- name = "firearms locker";
- pixel_x = -28;
- req_access_txt = "5"
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/storage)
+"RA" = (
+/obj/structure/chair{
+ dir = 1
},
-/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
-/obj/machinery/light/directional/north,
-/obj/item/ammo_box/magazine/co9mm{
- ammo_type = /obj/item/ammo_casing/c9mm/ap;
- name = "Commander magazine (AP 9mm)"
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
+"Sy" = (
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/item/storage/firstaid/brute,
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/o2,
+/obj/item/storage/firstaid/toxin,
+/obj/item/storage/box/medipens,
+/obj/item/storage/box/syringes,
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/regular,
+/obj/structure/closet/secure_closet{
+ icon_state = "med";
+ name = "medicine locker"
},
-/obj/item/ammo_box/magazine/co9mm{
- ammo_type = /obj/item/ammo_casing/c9mm/ap;
- name = "Commander magazine (AP 9mm)"
+/turf/open/floor/plasteel/tech,
+/area/ship/storage)
+"SR" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/line,
+/obj/structure/sign/poster/official/moth/epi{
+ pixel_y = -32
},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"Vq" = (
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"Td" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 4
+ },
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/medical/glass{
- id_tag = "lobbydoors";
- name = "Sickbay"
- },
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/effect/turf_decal/corner/opaque/white/mono,
/turf/open/floor/plasteel/white,
/area/ship/cargo)
-"Vs" = (
-/obj/item/radio/intercom/wideband/directional/south,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/turf/open/floor/carpet/nanoweave/red,
-/area/ship/bridge)
-"Vu" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/formaldehyde{
- pixel_x = 5
- },
-/obj/item/reagent_containers/glass/bottle/formaldehyde{
- pixel_x = -5
- },
-/obj/item/reagent_containers/glass/bottle/epinephrine{
- pixel_x = -5;
- pixel_y = 8
- },
-/obj/item/reagent_containers/glass/bottle/charcoal{
- pixel_x = 5;
- pixel_y = 8
- },
-/obj/item/reagent_containers/syringe,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/medical)
-"VM" = (
-/obj/machinery/power/smes/shuttle/precharged{
- dir = 1
- },
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
+"Tg" = (
+/obj/machinery/power/shuttle/engine/electric{
dir = 4
},
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/door/poddoor{
- id = "traumaenginer"
+/obj/structure/cable{
+ icon_state = "0-4"
},
/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"Ti" = (
+/turf/closed/wall/mineral/titanium,
/area/ship/maintenance/starboard)
-"VY" = (
-/obj/machinery/light/small/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 4
+"Tq" = (
+/obj/structure/sign/warning/nosmoking{
+ pixel_x = 32
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/hallway/central)
+"Tr" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/line{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/turf/open/floor/plasteel/freezer,
-/area/ship/crew/toilet)
-"Wc" = (
-/obj/machinery/door/airlock/command{
- name = "Bridge"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
},
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"TA" = (
+/obj/machinery/computer/cargo/express{
+ dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
-"Wd" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
- dir = 4
+"TB" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/line{
+ dir = 1
},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"Wm" = (
-/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
+/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"Xb" = (
+/area/ship/hallway/central)
+"TH" = (
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/light/directional/south,
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ship/storage/eva)
+"TL" = (
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/structure/closet/crate/bin,
+/obj/machinery/light/directional/north,
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "0-4"
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_x = -20;
+ pixel_y = -11
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/medical)
+"TZ" = (
+/obj/structure/filingcabinet/medical,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/light/directional/north,
+/turf/open/floor/carpet/cyan,
+/area/ship/hallway/central)
+"Uc" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/storage)
+"Ug" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/line,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
},
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"Uh" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+ dir = 5
},
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
+/turf/open/floor/carpet/cyan,
+/area/ship/bridge)
+"Uu" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+ icon_state = "1-2"
},
+/obj/effect/turf_decal/industrial/warning,
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
-"Xh" = (
-/obj/machinery/door/airlock/medical{
+"Uz" = (
+/obj/effect/turf_decal/siding/white/end{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/light_switch{
dir = 4;
- name = "Restroom"
+ pixel_x = -20;
+ pixel_y = -11
},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/storage/eva)
+"UD" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+ dir = 6
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/plasteel/mono/white,
+/area/ship/hallway/central)
+"UG" = (
+/turf/template_noop,
+/area/template_noop)
+"UH" = (
+/obj/machinery/power/smes/engineering{
+ charge = 1e+006
},
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-8"
},
-/obj/machinery/door/firedoor/border_only{
- dir = 8
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"UK" = (
+/obj/structure/cable{
+ icon_state = "1-10"
},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/arrows/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
},
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/crew/toilet)
-"Xj" = (
-/obj/machinery/door/airlock/maintenance_hatch{
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/storage/eva)
+"UN" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/light_switch{
dir = 4;
- name = "Starboard Engines"
+ pixel_x = -20;
+ pixel_y = -11
},
+/turf/open/floor/carpet/cyan,
+/area/ship/bridge)
+"UO" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/maintenance/starboard)
+"UV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
@@ -2431,152 +2767,233 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/trimline/opaque/red/filled/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"UX" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/obj/machinery/door/firedoor/border_only{
- dir = 4
+/obj/effect/turf_decal/siding/white{
+ dir = 1
},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"Xs" = (
-/obj/machinery/light/small/directional/south{
- pixel_x = 17
+/obj/effect/turf_decal/siding/white,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/storage/eva)
+"VJ" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "traumawindows";
+ name = "Window Blast Door"
+ },
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
+/area/ship/science)
+"WB" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plasteel/freezer,
+/area/ship/crew/toilet)
+"WJ" = (
+/obj/structure/bed{
+ dir = 8
},
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/bridge)
-"XW" = (
-/obj/structure/bed,
/obj/structure/curtain/bounty,
-/obj/item/bedsheet/blue,
-/turf/open/floor/carpet/cyan,
-/area/ship/crew)
-"XX" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/item/bedsheet/syndie{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"WP" = (
+/obj/effect/turf_decal/industrial/outline/red,
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/structure/rack,
+/obj/item/tank/internals/plasmaman/full,
+/obj/item/tank/internals/plasmaman/full,
+/obj/item/tank/internals/plasmaman/full,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/storage/eva)
+"WX" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
-/obj/machinery/firealarm/directional/east{
- pixel_y = 6
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 4
+ },
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+ dir = 8
},
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/button/door{
- dir = 8;
- id = "traumaenginel";
- name = "Engine Shutter Control";
- pixel_x = 22;
- pixel_y = -7
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/storage)
+"Xd" = (
+/obj/item/areaeditor/shuttle,
+/obj/item/megaphone/command,
+/obj/item/clothing/glasses/sunglasses,
+/obj/structure/closet/secure_closet/wall{
+ dir = 4;
+ icon_state = "solgov_wall";
+ name = "captain's closet";
+ req_access_txt = "20";
+ pixel_x = -28
},
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
-"Yb" = (
+/obj/item/gun/ballistic/revolver,
+/obj/item/clothing/suit/armor/vest/capcarapace/cybersun,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/head/HoS/cybersun,
+/obj/item/clothing/under/syndicate/cybersun/officer,
+/obj/item/reagent_containers/food/drinks/flask,
+/obj/item/reagent_containers/food/drinks/bottle/gin,
+/turf/open/floor/carpet/cyan,
+/area/ship/bridge)
+"Xi" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/siding/white{
+/obj/effect/turf_decal/industrial/warning{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"Xu" = (
+/obj/machinery/atmospherics/components/binary/pump/on/layer2{
dir = 8
},
-/obj/effect/turf_decal/siding/white/corner,
-/obj/effect/turf_decal/siding/white/corner{
- dir = 4
+/obj/structure/closet/firecloset/wall{
+ dir = 1;
+ pixel_y = -28
},
-/obj/structure/cable{
- icon_state = "2-4"
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"Xx" = (
+/obj/docking_port/stationary{
+ dir = 8;
+ dwidth = 15;
+ height = 15;
+ width = 30
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
+/turf/template_noop,
+/area/template_noop)
+"XL" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/item/wrench/crescent,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"Ym" = (
+/obj/machinery/holopad/emergency/command,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
},
-/turf/open/floor/vault,
-/area/ship/storage)
-"Yk" = (
-/obj/structure/table,
-/obj/machinery/microwave{
- pixel_y = 5
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/turf/open/floor/carpet/cyan,
+/area/ship/bridge)
"Yn" = (
-/obj/effect/spawner/structure/window/shuttle,
/obj/structure/curtain/cloth{
color = "#ACD1E9"
},
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
/turf/open/floor/plating,
/area/ship/bridge)
-"Yv" = (
+"Yw" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/door/window{
- dir = 4
+/obj/item/storage/toolbox/electrical,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"YA" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/medical/surgery)
+"YM" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/medical)
+"YQ" = (
+/obj/effect/turf_decal/number/five,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/light_switch{
+ pixel_x = 11;
+ pixel_y = 22
},
-/obj/machinery/door/firedoor/border_only{
- dir = 4
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/effect/turf_decal/industrial/warning/corner{
dir = 1
},
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
-"YI" = (
-/obj/machinery/light/directional/west,
-/obj/structure/chair{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"YK" = (
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"YV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/siding/white/end,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/storage/eva)
+"Zv" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/structure/curtain/cloth,
+/turf/open/floor/plating,
+/area/ship/storage)
+"ZC" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/maintenance/port)
+"ZH" = (
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/obj/structure/cable{
icon_state = "2-4"
},
/obj/structure/cable{
icon_state = "1-4"
},
-/obj/effect/turf_decal/trimline/opaque/red/filled/line{
- dir = 8
+/obj/structure/cable{
+ icon_state = "1-8"
},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
dir = 1
},
-/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"YM" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/medical)
-"Zb" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor/preopen{
- dir = 4;
- id = "traumawindows";
- name = "Window Blast Door"
- },
-/turf/open/floor/plating,
-/area/ship/crew)
-"ZC" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/maintenance/port)
-"ZN" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
- dir = 1
- },
-/turf/open/floor/plasteel/tech,
-/area/ship/medical)
-"ZO" = (
-/obj/machinery/vending/cola/random,
+/area/ship/hallway/central)
+"ZJ" = (
/obj/effect/turf_decal/trimline/opaque/red/filled/line,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
(1,1,1) = {"
UG
@@ -2588,544 +3005,664 @@ UG
UG
UG
UG
-Ml
UG
+Xx
+UG
+UG
+UG
+UG
+UG
+UG
+UG
+UG
+UG
+UG
+"}
+(2,1,1) = {"
+UG
+UG
+Tg
+fp
+UG
+UG
+UG
+AJ
+KW
+yn
+sC
+rA
+KW
+AJ
+UG
+UG
+UG
+Ti
+PF
UG
UG
+"}
+(3,1,1) = {"
+UG
+Tg
+Jw
+ZC
+UG
+UG
+UG
+gL
+fX
+bv
+Ap
+bv
+na
+gL
+UG
UG
UG
+UO
+zK
+PF
UG
+"}
+(4,1,1) = {"
+fp
+ih
+Kk
+ZC
UG
UG
fp
+gL
+GK
+eS
+oc
+eS
+RA
+gL
+Ti
+UG
+UG
+UO
+xa
+QG
+Ti
+"}
+(5,1,1) = {"
+ZC
+rJ
+AX
ZC
ZC
+ZC
+ZC
+gL
+lS
+yX
+oc
+Gr
+lX
+gL
+UO
+UO
+UO
+UO
+yT
+Kp
+UO
+"}
+(6,1,1) = {"
+ZC
+HR
+Dr
+Hb
+Cy
+cK
+Eb
+AD
+GI
+Td
+pQ
+rn
+GI
+wc
+Xi
+sI
+Uu
+bu
+cd
+Mb
+UO
+"}
+(7,1,1) = {"
mP
+UH
+DS
+ZC
+ZC
+ZC
+tI
+gL
+xB
+uE
+uE
+oA
+lJ
+gL
+UO
+UO
+UO
+UO
+YQ
+JA
+HU
+"}
+(8,1,1) = {"
ZC
+XL
+Yw
ZC
fp
UG
+vx
+gL
+Ls
+HI
+cL
+Gw
+zq
+gL
UG
UG
+Ti
+UO
+zT
+kh
+UO
"}
-(2,1,1) = {"
+(9,1,1) = {"
+ZC
+KS
+Xu
+ZC
UG
UG
UG
+Ra
+pK
+QF
+UD
+CL
+tO
+Ra
UG
UG
UG
-Uc
-OK
-kO
-QQ
-BH
-Uc
+UO
+wt
+xW
+UO
+"}
+(10,1,1) = {"
+fp
+ZC
+Pz
+ZC
+UG
UG
UG
+an
+TZ
+mo
+Gj
+mu
+Tq
+an
+UG
UG
UG
+UO
+tb
+UO
+Ti
+"}
+(11,1,1) = {"
UG
fp
ZC
-MP
-Je
-aL
-fe
-Kh
-Ny
-Jn
+fp
+UG
+rT
+YA
+YA
+YA
+YA
+OM
+nW
+qA
+qA
+qA
+wb
UG
+Ti
+UO
+Ti
UG
"}
-(3,1,1) = {"
+(12,1,1) = {"
UG
UG
UG
UG
UG
+YA
+hS
+uT
+sO
+YA
+xp
+gW
+ke
+rk
+eT
+qA
UG
-OK
-mG
-Ln
-hv
-Sx
-OK
UG
UG
UG
UG
+"}
+(13,1,1) = {"
+UG
+UG
+UG
+UG
+UG
+Jh
+nb
+EW
+GZ
+fo
+ZH
+zy
+dl
+fe
+am
+VJ
+UG
+UG
+UG
UG
-ZC
-zT
-Lh
-vT
-IE
-CX
-XX
-KD
-dR
-Jn
UG
"}
-(4,1,1) = {"
+(14,1,1) = {"
UG
UG
UG
UG
UG
-Uc
-OK
-MK
-AG
-zE
-hq
-OK
-Uc
+YA
+as
+hQ
+Pg
+YA
+zM
+gW
+ke
+wp
+mx
+qA
UG
UG
UG
UG
-fp
-ZC
-ZC
-ZC
-ZC
-mw
-ZC
-ZC
-ZC
-fp
UG
-"}
-(5,1,1) = {"
+"}
+(15,1,1) = {"
+UG
+UG
+UG
+UG
+Qq
+YM
+Dp
+Dp
+Dp
+YM
+Pm
+SR
+OK
+Fr
+Fr
+OK
+Uc
+UG
UG
UG
-nu
-Nn
-Nn
-zo
-zo
-zo
-SR
-Yb
-hT
-OK
-YM
-JA
-Qq
UG
+"}
+(16,1,1) = {"
UG
UG
UG
UG
-ZC
-ZC
-vr
-ZC
+YM
+TL
+FH
+FH
+tT
+MW
+UV
+gW
+Zv
+Sy
+DX
+qv
+OK
UG
UG
UG
UG
"}
-(6,1,1) = {"
+(17,1,1) = {"
UG
-nu
-Nn
-Hr
-Nn
-SP
-iJ
-zo
-ed
-Lu
-bC
-OK
-fT
-ZN
-YM
-JA
-YM
-Qq
UG
UG
-PL
-cX
-sH
-ZC
-fp
UG
+qV
+zS
+up
+fW
+tF
+nI
+Lh
+zy
+AQ
+WX
+Rl
+Ai
+OK
UG
UG
-"}
-(7,1,1) = {"
-Nn
-Nn
-uk
-UJ
-Nn
-Qe
-VY
-zo
-Hk
-PG
-aT
-OK
-Vu
-Po
-DU
-lj
-OA
-YM
-YM
-JA
-gL
-gL
-Rh
-gL
-gL
-gL
-AJ
UG
-"}
-(8,1,1) = {"
-bX
-hH
-wD
-Xs
-Nn
-qd
-oX
-zo
-Ko
-QE
-SH
-OK
-Sy
-uo
-hQ
-HF
-cs
-YM
-Tt
-HP
-ve
-tE
-uN
-YI
-Ja
-Qp
-KW
UG
"}
-(9,1,1) = {"
-bX
-dI
-Tj
-Vs
-Nn
-zo
-Xh
-zo
-OK
-bu
-OK
-OK
-RB
-Go
-kP
-Yv
-zt
-YM
-EA
-Tq
-oQ
-ur
-nw
-xa
-eS
-cn
-gO
+(18,1,1) = {"
UG
-"}
-(10,1,1) = {"
-bX
-hF
-pK
-eJ
-Wc
-Ll
-Pr
-BK
-Ll
-sM
-Cr
+UG
+UG
+UG
+YM
+sd
+zh
vn
-qQ
-Rs
-ru
-Wm
-qQ
-YK
-RW
-dH
-uq
-ur
-go
-Bl
-Bl
-rh
-BN
-bl
-"}
-(11,1,1) = {"
-bX
-kR
-Dy
-MY
-Yn
-cI
-Kv
-FA
-UC
-Ug
-cI
-sz
-Wd
-Wd
-QP
-Wd
-Wd
-lb
-nm
-sq
-Vq
-oH
-lH
-IG
-eS
-cn
-TO
+bT
+MW
+UV
+gW
+Zv
+Ki
+tJ
+gf
+OK
+UG
+UG
+UG
UG
"}
-(12,1,1) = {"
-bX
-mO
-wG
-rM
-Nn
+(19,1,1) = {"
+UG
+UG
+tn
+OZ
+OZ
+OZ
+OZ
+OZ
+OZ
+OZ
+LH
+zl
Ev
Ev
Ev
Ev
-lY
Ev
+iA
+UG
+UG
+UG
+"}
+(20,1,1) = {"
+UG
+UG
+qr
+Qw
+sx
+Uz
+Hk
+HE
+TH
+OZ
+bQ
+ZJ
Ev
-vG
-jx
-mQ
-lF
-uE
-YM
-zg
-Pp
-ie
-vj
-uN
-tT
-uW
-ZO
-KW
+Kv
+iC
+jh
+Gs
+Ev
+iA
+UG
UG
"}
-(13,1,1) = {"
-Nn
-Nn
-zR
-Nq
-Nn
-UX
-kC
-Ki
-QU
-UR
-tO
+(21,1,1) = {"
+UG
+pf
+jK
+zD
+Of
+Rb
+jU
+Ln
+YV
+uU
+iQ
+zy
+Cp
+uc
+IL
+kw
+xN
+Bp
Ev
-wQ
-tW
-DH
-oS
-ck
-YM
-YM
-JA
-gL
-gL
-Xj
-gL
-gL
-gL
-AJ
+UG
UG
"}
-(14,1,1) = {"
+(22,1,1) = {"
UG
-nu
-Nn
-SI
-Nn
-se
-eM
-su
-qc
-TR
-MW
+UG
+JC
+UK
+la
+UX
+BU
+KZ
+Fe
+OZ
+TB
+us
Ev
-FE
-KR
-YM
-JA
-YM
-Qq
+OF
+yf
+iW
+nF
+iW
+PH
UG
UG
+"}
+(23,1,1) = {"
UG
-UO
-Lt
-UO
-Ti
UG
+OZ
+JQ
+WP
+zo
+zo
+zo
+zo
+zo
+Le
+KB
+Ev
+iz
+FE
+hW
+KU
+in
+Kc
UG
UG
"}
-(15,1,1) = {"
+(24,1,1) = {"
UG
UG
-nu
-Nn
-Nn
-Ev
+tn
+OZ
+OZ
+zo
+wr
+WB
+LJ
+eo
+li
+Ug
Ev
-TI
-iW
-Sc
-fa
+Pp
+CF
Ev
-YM
-YM
-Qq
+Hl
+CZ
+iA
UG
UG
+"}
+(25,1,1) = {"
UG
UG
UG
-Ti
-UO
-OB
-UO
+UG
+tn
+zo
+Nz
+rS
+ba
+zo
+Tr
+gW
+Ev
+vj
+Aj
+Ev
+iA
UG
UG
UG
UG
"}
-(16,1,1) = {"
+(26,1,1) = {"
UG
UG
UG
UG
UG
-iA
-Hl
-XW
-np
-tq
-Yk
-Ev
-Qq
+Nn
+Nn
+Nn
+Nn
+Nn
+bD
+Yn
+Nn
+Nn
+Nn
+Nn
UG
UG
UG
UG
-Ti
-UO
-UO
-UO
-UO
-GP
-UO
-UO
-UO
-Ti
UG
"}
-(17,1,1) = {"
+(27,1,1) = {"
UG
UG
UG
UG
UG
-UG
-PH
-XW
-iW
-el
-Ev
-iA
-UG
+Nn
+WJ
+Xd
+Ah
+ES
+Ym
+Uh
+UN
+BD
+EL
+Nn
UG
UG
UG
UG
-UO
-Gs
-Ps
-yi
-nl
-Xb
-Mx
-Hq
-VM
-Dj
UG
"}
-(18,1,1) = {"
+(28,1,1) = {"
UG
UG
UG
UG
UG
+nu
+Nn
+Lr
+vE
+FO
+zL
+qW
+GH
+zn
+Nn
+nu
UG
-iA
-Kc
-Zb
-Ev
-iA
UG
UG
UG
UG
+"}
+(29,1,1) = {"
UG
UG
-Ti
-UO
-MN
-kH
-iP
-Tx
-QY
-Ob
-Dj
UG
UG
-"}
-(19,1,1) = {"
UG
UG
+nu
+Nn
+xF
+TA
+hF
+Ca
+yQ
+Nn
+nu
+UG
UG
UG
UG
UG
UG
+"}
+(30,1,1) = {"
UG
UG
UG
@@ -3133,17 +3670,17 @@ UG
UG
UG
UG
+Nn
+ot
+ot
+ot
+ot
+ot
+Nn
UG
UG
UG
UG
-Ti
-UO
-UO
-HU
-UO
-UO
-Ti
UG
UG
UG
diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
index 9200c091f618..2c471b9ccb85 100644
--- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
+++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -514,7 +514,7 @@
req_access = list(151)
},
/obj/item/areaeditor/shuttle,
-/obj/item/clothing/under/syndicate/aclf,
+/obj/item/clothing/under/syndicate/officer,
/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
/obj/item/clothing/head/HoS/syndicate,
/obj/item/codespeak_manual/unlimited,
@@ -5349,9 +5349,9 @@
/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
dir = 5
},
-/obj/item/clothing/head/aclfcap,
-/obj/item/clothing/suit/aclf,
-/obj/item/clothing/under/syndicate/aclf,
+/obj/item/clothing/head/gorlexcap,
+/obj/item/clothing/suit/gorlex,
+/obj/item/clothing/under/syndicate/officer,
/obj/structure/closet/secure_closet{
anchored = 1;
icon_state = "syndicate";
@@ -5843,9 +5843,6 @@
/obj/machinery/door/firedoor/border_only{
dir = 1
},
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
/obj/machinery/door/airlock/hatch{
name = "Security"
},
diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm
index 8cdb11fd00b1..36fc398d942c 100644
--- a/code/__DEFINES/DNA.dm
+++ b/code/__DEFINES/DNA.dm
@@ -154,7 +154,6 @@
#define ORGAN_SLOT_LIVER "liver"
#define ORGAN_SLOT_TONGUE "tongue"
#define ORGAN_SLOT_VOICE "vocal_cords"
-#define ORGAN_SLOT_ADAMANTINE_RESONATOR "adamantine_resonator"
#define ORGAN_SLOT_HEART_AID "heartdrive"
#define ORGAN_SLOT_BRAIN_ANTIDROP "brain_antidrop"
#define ORGAN_SLOT_BRAIN_ANTISTUN "brain_antistun"
diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm
index 5814f8f27a1f..c428e1e7dd53 100644
--- a/code/__DEFINES/colors.dm
+++ b/code/__DEFINES/colors.dm
@@ -164,6 +164,8 @@
#define LIGHT_COLOR_LAVA "#C48A18"
/// Bright, non-saturated red. Leaning slightly towards pink for visibility. rgb(250, 100, 75)
#define LIGHT_COLOR_FLARE "#FA644B"
+/// Vivid red. Leans a bit darker to accentuate red colors and leave other channels a bit dry. rgb(200, 25, 25)
+#define LIGHT_COLOR_INTENSE_RED "#C81919"
/// Weird color, between yellow and green, very slimy. rgb(175, 200, 75)
#define LIGHT_COLOR_SLIME_LAMP "#AFC84B"
/// Extremely diluted yellow, close to skin color (for some reason). rgb(250, 225, 175)
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index b824bd2a17b1..8fd5d549c086 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -61,7 +61,6 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define isandroid(A) (is_species(A, /datum/species/android))
#define issynth(A) (is_species(A, /datum/species/synth))
#define ismilsynth(A) (is_species(A, /datum/species/synth/military))
-#define isgolem(A) (is_species(A, /datum/species/golem))
#define islizard(A) (is_species(A, /datum/species/lizard))
#define isplasmaman(A) (is_species(A, /datum/species/plasmaman))
#define ispodperson(A) (is_species(A, /datum/species/pod))
diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index 9f07a32d15f8..ad9d5ae5abc8 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -87,10 +87,8 @@
#define SPECIES_LIZARD "lizard"
#define SPECIES_ASHWALKER "ashwalker"
#define SPECIES_KOBOLD "kobold"
-#define SPECIES_GOLEM "golem"
#define SPECIES_MONKEY "monkey"
#define SPECIES_MOTH "moth"
-#define SPECIES_MUSH "mush"
#define SPECIES_PLASMAMAN "plasmaman"
#define SPECIES_POD "pod"
#define SPECIES_SHADOW "shadow"
diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm
index 0b517e50160c..ecc1acb6f0e1 100644
--- a/code/_globalvars/lists/names.dm
+++ b/code/_globalvars/lists/names.dm
@@ -14,7 +14,6 @@ GLOBAL_LIST_INIT(lizard_names_female, world.file2list("strings/names/lizard_fema
GLOBAL_LIST_INIT(clown_names, world.file2list("strings/names/clown.txt"))
GLOBAL_LIST_INIT(mime_names, world.file2list("strings/names/mime.txt"))
GLOBAL_LIST_INIT(carp_names, world.file2list("strings/names/carp.txt"))
-GLOBAL_LIST_INIT(golem_names, world.file2list("strings/names/golem.txt"))
GLOBAL_LIST_INIT(moth_first, world.file2list("strings/names/moth_first.txt"))
GLOBAL_LIST_INIT(moth_last, world.file2list("strings/names/moth_last.txt"))
GLOBAL_LIST_INIT(plasmaman_names, world.file2list("strings/names/plasmaman.txt"))
diff --git a/code/_globalvars/lists/poll_ignore.dm b/code/_globalvars/lists/poll_ignore.dm
index 674b15ceae2c..e25b0b6e9a87 100644
--- a/code/_globalvars/lists/poll_ignore.dm
+++ b/code/_globalvars/lists/poll_ignore.dm
@@ -11,7 +11,6 @@
#define POLL_IGNORE_CONSTRUCT "construct"
#define POLL_IGNORE_SPIDER "spider"
#define POLL_IGNORE_ASHWALKER "ashwalker"
-#define POLL_IGNORE_GOLEM "golem"
#define POLL_IGNORE_SWARMER "swarmer"
#define POLL_IGNORE_DRONE "drone"
#define POLL_IGNORE_FUGITIVE "fugitive"
@@ -36,7 +35,6 @@ GLOBAL_LIST_INIT(poll_ignore_desc, list(
POLL_IGNORE_CONSTRUCT = "Construct",
POLL_IGNORE_SPIDER = "Spiders",
POLL_IGNORE_ASHWALKER = "Ashwalker eggs",
- POLL_IGNORE_GOLEM = "Golems",
POLL_IGNORE_SWARMER = "Swarmer shells",
POLL_IGNORE_DRONE = "Drone shells",
POLL_IGNORE_FUGITIVE = "Fugitive Hunter",
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index c2a7fc963e30..1e697327c844 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -177,7 +177,6 @@ SUBSYSTEM_DEF(traumas)
"skeletons" = typecacheof(list(/datum/species/skeleton, /datum/species/plasmaman)),
"conspiracies" = typecacheof(list(/datum/species/abductor, /datum/species/lizard)),
"robots" = typecacheof(list(/datum/species/android, /datum/species/ipc)),
- "the supernatural" = typecacheof(list(/datum/species/golem/runic)),
"aliens" = typecacheof(list(
/datum/species/abductor, /datum/species/jelly, /datum/species/pod)),
"spiders" = typecacheof(list(/datum/species/spider))
diff --git a/code/datums/components/spooky.dm b/code/datums/components/spooky.dm
index 2cdefc057f85..9e75259536ef 100644
--- a/code/datums/components/spooky.dm
+++ b/code/datums/components/spooky.dm
@@ -31,7 +31,7 @@
H.Paralyze(15) //zombies can't resist the doot
C.Jitter(35)
C.stuttering = 20
- if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
+ if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live
to_chat(C, "DOOT")
spectral_change(H)
@@ -41,7 +41,7 @@
C.stuttering = 20
/datum/component/spooky/proc/spectral_change(mob/living/carbon/human/H, mob/user)
- if((H.getStaminaLoss() > 95) && (!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
+ if((H.getStaminaLoss() > 95) && (!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
H.Paralyze(20)
H.set_species(/datum/species/skeleton)
H.visible_message("[H] has given up on life as a mortal.")
diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index 998fa6906b4d..68c74921b8b7 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -208,26 +208,30 @@
to_chat(target, "[user] lands an expert tackle on you, knocking you down hard and maintaining a passive grab!")
user.SetKnockdown(0)
+ user.get_up(TRUE)
user.forceMove(get_turf(target))
target.adjustStaminaLoss(40)
target.Paralyze(5)
target.Knockdown(30)
if(ishuman(target) && ishuman(user))
INVOKE_ASYNC(S.dna.species, TYPE_PROC_REF(/datum/species, grab), S, T)
- S.setGrabState(GRAB_PASSIVE)
+ if(S.pulling == T)
+ S.setGrabState(GRAB_PASSIVE)
if(5 to INFINITY) // absolutely BODIED
user.visible_message("[user] lands a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", "You land a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", target)
to_chat(target, "[user] lands a monster tackle on you, knocking you senseless and aggressively pinning you!")
user.SetKnockdown(0)
+ user.get_up(TRUE)
user.forceMove(get_turf(target))
target.adjustStaminaLoss(40)
target.Paralyze(5)
target.Knockdown(30)
if(ishuman(target) && ishuman(user))
INVOKE_ASYNC(S.dna.species, TYPE_PROC_REF(/datum/species, grab), S, T)
- S.setGrabState(GRAB_AGGRESSIVE)
+ if(S.pulling == T)
+ S.setGrabState(GRAB_AGGRESSIVE)
return COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH
diff --git a/code/datums/components/weatherannouncer.dm b/code/datums/components/weatherannouncer.dm
new file mode 100644
index 000000000000..3821f9a1b559
--- /dev/null
+++ b/code/datums/components/weatherannouncer.dm
@@ -0,0 +1,170 @@
+#define WEATHER_ALERT_CLEAR 0
+#define WEATHER_ALERT_INCOMING 1
+#define WEATHER_ALERT_IMMINENT_OR_ACTIVE 2
+
+/// Component which makes you yell about what the weather is
+/datum/component/weather_announcer
+ /// Currently displayed warning level
+ var/warning_level = WEATHER_ALERT_CLEAR
+ /// Whether the incoming weather is actually going to harm you
+ var/is_weather_dangerous = TRUE
+ /// Are we actually turned on right now?
+ var/enabled = TRUE
+ /// Overlay added when things are alright
+ var/state_normal
+ /// Overlay added when you should start looking for shelter
+ var/state_warning
+ /// Overlay added when you are in danger
+ var/state_danger
+
+/datum/component/weather_announcer/Initialize(
+ state_normal,
+ state_warning,
+ state_danger,
+)
+ . = ..()
+ if (!ismovable(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ START_PROCESSING(SSprocessing, src)
+ RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays))
+ RegisterSignal(parent, COMSIG_MACHINERY_POWER_RESTORED, PROC_REF(on_powered))
+ RegisterSignal(parent, COMSIG_MACHINERY_POWER_LOST, PROC_REF(on_power_lost))
+
+ src.state_normal = state_normal
+ src.state_warning = state_warning
+ src.state_danger = state_danger
+ var/atom/speaker = parent
+ speaker.update_appearance(UPDATE_ICON)
+ update_light_color()
+
+/datum/component/weather_announcer/Destroy(force, silent)
+ STOP_PROCESSING(SSprocessing, src)
+ return ..()
+
+/// Add appropriate overlays
+/datum/component/weather_announcer/proc/on_update_overlays(atom/parent_atom, list/overlays)
+ SIGNAL_HANDLER
+ if (!enabled || !state_normal || !state_warning || !state_danger)
+ return
+
+ switch (warning_level)
+ if(WEATHER_ALERT_CLEAR)
+ overlays += state_normal
+ if(WEATHER_ALERT_INCOMING)
+ overlays += state_warning
+ if(WEATHER_ALERT_IMMINENT_OR_ACTIVE)
+ overlays += (is_weather_dangerous) ? state_danger : state_warning
+
+/// If powered, receive updates
+/datum/component/weather_announcer/proc/on_powered()
+ SIGNAL_HANDLER
+ enabled = TRUE
+ var/atom/speaker = parent
+ speaker.update_appearance(UPDATE_ICON)
+
+/// If no power, don't receive updates
+/datum/component/weather_announcer/proc/on_power_lost()
+ SIGNAL_HANDLER
+ enabled = FALSE
+ var/atom/speaker = parent
+ speaker.update_appearance(UPDATE_ICON)
+
+/datum/component/weather_announcer/process(seconds_per_tick)
+ if (!enabled)
+ return
+
+ var/previous_level = warning_level
+ var/previous_danger = is_weather_dangerous
+ set_current_alert_level()
+ if(previous_level == warning_level && previous_danger == is_weather_dangerous)
+ return // No change
+ var/atom/movable/speaker = parent
+ speaker.say(get_warning_message())
+ speaker.update_appearance(UPDATE_ICON)
+ update_light_color()
+
+/datum/component/weather_announcer/proc/update_light_color()
+ var/atom/movable/light = parent
+ switch(warning_level)
+ if(WEATHER_ALERT_CLEAR)
+ light.set_light_color(LIGHT_COLOR_GREEN)
+ if(WEATHER_ALERT_INCOMING)
+ light.set_light_color(LIGHT_COLOR_YELLOW)
+ if(WEATHER_ALERT_IMMINENT_OR_ACTIVE)
+ light.set_light_color(LIGHT_COLOR_INTENSE_RED)
+ light.update_light()
+
+/// Returns a string we should display to communicate what you should be doing
+/datum/component/weather_announcer/proc/get_warning_message()
+ if (!is_weather_dangerous)
+ return "No risk expected from incoming weather front."
+ switch(warning_level)
+ if(WEATHER_ALERT_CLEAR)
+ return "All clear, no weather alerts to report."
+ if(WEATHER_ALERT_INCOMING)
+ return "Weather front incoming, begin to seek shelter."
+ if(WEATHER_ALERT_IMMINENT_OR_ACTIVE)
+ return "Weather front imminent, find shelter immediately."
+ return "Error in meteorological calculation. Please report this deviation to a trained programmer."
+
+/datum/component/weather_announcer/proc/time_till_storm()
+ var/datum/weather_controller/local_weather_controller = SSmapping.get_map_zone_weather_controller(parent)
+ if(!local_weather_controller.next_weather)
+ return null
+ for(var/type_index in local_weather_controller.current_weathers)
+ var/datum/weather/check_weather = local_weather_controller.current_weathers[type_index]
+ if(!check_weather.barometer_predictable || check_weather.stage == WIND_DOWN_STAGE || check_weather.stage == END_STAGE)
+ continue
+ warning_level = WEATHER_ALERT_IMMINENT_OR_ACTIVE
+ return 0
+
+ var/time_until_next = INFINITY
+ var/next_time = local_weather_controller.next_weather - world.time || INFINITY
+ if (next_time && next_time < time_until_next)
+ time_until_next = next_time
+ return time_until_next
+
+/// Polls existing weather for what kind of warnings we should be displaying.
+/datum/component/weather_announcer/proc/set_current_alert_level()
+ var/time_until_next = time_till_storm()
+ if(isnull(time_until_next))
+ return // No problems if there are no mining z levels
+ if(time_until_next >= 2 MINUTES)
+ warning_level = WEATHER_ALERT_CLEAR
+ return
+
+ if(time_until_next >= 30 SECONDS)
+ warning_level = WEATHER_ALERT_INCOMING
+ return
+
+ // Weather is here, now we need to figure out if it is dangerous
+ warning_level = WEATHER_ALERT_IMMINENT_OR_ACTIVE
+
+ var/datum/weather_controller/local_weather_controller = SSmapping.get_map_zone_weather_controller(parent)
+ for(var/type_index in local_weather_controller.current_weathers)
+ var/datum/weather/check_weather = local_weather_controller.current_weathers[type_index]
+ if(!check_weather.barometer_predictable || check_weather.stage == WIND_DOWN_STAGE || check_weather.stage == END_STAGE)
+ continue
+ is_weather_dangerous = !check_weather.aesthetic
+ return
+
+/datum/component/weather_announcer/proc/on_examine(atom/radio, mob/examiner, list/examine_texts)
+ var/time_until_next = time_till_storm()
+ if(isnull(time_until_next))
+ return
+ if (time_until_next == 0)
+ examine_texts += span_warning ("A storm is currently active, please seek shelter.")
+ else
+ examine_texts += span_notice("The next storm is inbound in [DisplayTimeText(time_until_next)].")
+
+/datum/component/weather_announcer/RegisterWithParent()
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
+
+/datum/component/weather_announcer/UnregisterFromParent()
+ .=..()
+ UnregisterSignal(parent, COMSIG_PARENT_EXAMINE)
+
+#undef WEATHER_ALERT_CLEAR
+#undef WEATHER_ALERT_INCOMING
+#undef WEATHER_ALERT_IMMINENT_OR_ACTIVE
diff --git a/code/datums/diseases/advance/symptoms/species.dm b/code/datums/diseases/advance/symptoms/species.dm
index 49a3cf8d07d5..b19a4d453dd5 100644
--- a/code/datums/diseases/advance/symptoms/species.dm
+++ b/code/datums/diseases/advance/symptoms/species.dm
@@ -27,7 +27,7 @@
severity = 0
/datum/symptom/inorganic_adaptation/OnAdd(datum/disease/advance/A)
- A.infectable_biotypes |= MOB_MINERAL //Mineral covers plasmamen and golems.
+ A.infectable_biotypes |= MOB_MINERAL //Mineral covers plasmamen
/datum/symptom/inorganic_adaptation/OnRemove(datum/disease/advance/A)
A.infectable_biotypes &= ~MOB_MINERAL
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index f6d61833814e..af7d411245e2 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -57,7 +57,7 @@
var/hasSoul = TRUE // If false, renders the character unable to sell their soul.
var/holy_role = NONE //is this person a chaplain or admin role allowed to use bibles, Any rank besides 'NONE' allows for this.
- var/mob/living/enslaved_to //If this mind's master is another mob (i.e. adamantine golems)
+ var/mob/living/enslaved_to //If this mind's master is another mob
var/datum/language_holder/language_holder
var/unconvertable = FALSE
var/late_joiner = FALSE
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 5932ee024359..52087f03174c 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -219,40 +219,6 @@
desc = "Your biological functions have halted. You could live forever this way, but it's pretty boring."
icon_state = "stasis"
-//GOLEM GANG
-
-//OTHER DEBUFFS
-/datum/status_effect/strandling //get it, strand as in durathread strand + strangling = strandling hahahahahahahahahahhahahaha i want to die
- id = "strandling"
- status_type = STATUS_EFFECT_UNIQUE
- alert_type = /atom/movable/screen/alert/status_effect/strandling
-
-/datum/status_effect/strandling/on_apply()
- ADD_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron")
- return ..()
-
-/datum/status_effect/strandling/on_remove()
- REMOVE_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron")
- return ..()
-
-/atom/movable/screen/alert/status_effect/strandling
- name = "Choking strand"
- desc = "A magical strand of Durathread is wrapped around your neck, preventing you from breathing! Click this icon to remove the strand."
- icon_state = "his_grace"
- alerttooltipstyle = "hisgrace"
-
-/atom/movable/screen/alert/status_effect/strandling/Click(location, control, params)
- . = ..()
- if(usr != owner)
- return
- to_chat(owner, "You attempt to remove the durathread strand from around your neck.")
- if(do_after(owner, 35, null, owner))
- if(isliving(owner))
- var/mob/living/L = owner
- to_chat(owner, "You succesfuly remove the durathread strand.")
- L.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
-
-
/datum/status_effect/pacify/on_creation(mob/living/new_owner, set_duration)
if(isnum(set_duration))
duration = set_duration
diff --git a/code/game/machinery/scan_gate.dm b/code/game/machinery/scan_gate.dm
index 54c52f930a1f..afc154a0c95a 100644
--- a/code/game/machinery/scan_gate.dm
+++ b/code/game/machinery/scan_gate.dm
@@ -13,7 +13,6 @@
#define SCANGATE_MOTH "moth"
#define SCANGATE_JELLY "jelly"
#define SCANGATE_POD "pod"
-#define SCANGATE_GOLEM "golem"
#define SCANGATE_ZOMBIE "zombie"
#define SCANGATE_SPIDER "rachnid"
#define SCANGATE_IPC "ipc"
@@ -141,8 +140,6 @@
scan_species = /datum/species/jelly
if(SCANGATE_POD)
scan_species = /datum/species/pod
- if(SCANGATE_GOLEM)
- scan_species = /datum/species/golem
if(SCANGATE_ZOMBIE)
scan_species = /datum/species/zombie
if(SCANGATE_SPIDER)
@@ -246,7 +243,6 @@
#undef SCANGATE_MOTH
#undef SCANGATE_JELLY
#undef SCANGATE_POD
-#undef SCANGATE_GOLEM
#undef SCANGATE_ZOMBIE
#undef SCANGATE_SPIDER
#undef SCANGATE_IPC
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index bfac95dd3650..d1f47ff647f6 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -564,7 +564,7 @@
/obj/item/stack/sheet/mineral/wood/fifty,
/obj/item/stack/sheet/mineral/diamond/twenty,
/obj/item/stack/sheet/mineral/gold/fifty,
- /obj/item/stack/sheet/mineral/adamantine/ten,
+
/obj/item/stack/cable_coil/red,
/obj/item/stack/rods/fifty
)
@@ -626,7 +626,6 @@
/obj/item/stack/sheet/mineral/wood/fifty,
/obj/item/stack/sheet/mineral/diamond/twenty,
/obj/item/stack/sheet/mineral/gold/fifty,
- /obj/item/stack/sheet/mineral/adamantine/ten,
/obj/item/stack/cable_coil/red,
/obj/item/stack/rods/fifty
)
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index 627f3298ccd4..01f147a1b1d0 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -217,7 +217,7 @@
desc = "Use this to keep prisoners in line."
gender = PLURAL
icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "handcuff"
+ icon_state = "legcuff"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
flags_1 = CONDUCT_1
@@ -235,6 +235,17 @@
var/armed = 0
var/trap_damage = 20
+/obj/item/restraints/legcuffs/beartrap/goliath
+ name = "tentacle mass"
+ desc = "Ew."
+ icon_state = "goliathtrap"
+ flags_1 = NONE
+ slowdown = 10
+ breakouttime = 5 SECONDS
+ item_flags = DROPDEL
+ armed = 1
+ trap_damage = 0
+
/obj/item/restraints/legcuffs/beartrap/Initialize()
. = ..()
update_appearance()
@@ -294,8 +305,8 @@
snap = FALSE
if(snap)
close_trap()
- L.visible_message("[L] triggers \the [src].", \
- "You trigger \the [src]!")
+ L.visible_message("[L] gets caught by \the [src]!", \
+ "You get caught by \the [src]!")
L.apply_damage(trap_damage, BRUTE, def_zone)
/obj/item/restraints/legcuffs/beartrap/energy
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index f4aff30791f8..1296e889181d 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -322,7 +322,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
var/hit_hand = ((user.active_hand_index % 2 == 0) ? "r_" : "l_") + "arm"
if(ishuman(user))
var/mob/living/carbon/human/H = user
- if(!H.gloves && !HAS_TRAIT(H, TRAIT_PIERCEIMMUNE)) // golems, etc
+ if(!H.gloves && !HAS_TRAIT(H, TRAIT_PIERCEIMMUNE))
to_chat(H, "[src] cuts into your hand!")
H.apply_damage(force*0.5, BRUTE, hit_hand)
else if(ismonkey(user))
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 04a9898c523d..200fc408768f 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -465,11 +465,6 @@ GLOBAL_LIST_INIT(snow_recipes, list ( \
* Adamantine
*/
-
-GLOBAL_LIST_INIT(adamantine_recipes, list(
- new /datum/stack_recipe("incomplete servant golem shell", /obj/item/golem_shell/servant, req_amount=1, res_amount=1),
- ))
-
/obj/item/stack/sheet/mineral/adamantine
name = "adamantine"
icon_state = "sheet-adamantine"
@@ -479,10 +474,6 @@ GLOBAL_LIST_INIT(adamantine_recipes, list(
merge_type = /obj/item/stack/sheet/mineral/adamantine
grind_results = list(/datum/reagent/liquidadamantine = 10)
-/obj/item/stack/sheet/mineral/adamantine/get_main_recipes()
- . = ..()
- . += GLOB.adamantine_recipes
-
/obj/item/stack/sheet/mineral/adamantine/ten
amount = 10
diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm
index 235e267e43c3..e2dfc9a81dc3 100644
--- a/code/game/objects/items/tools/wirecutters.dm
+++ b/code/game/objects/items/tools/wirecutters.dm
@@ -65,11 +65,6 @@
user.visible_message("[user] cuts [C]'s restraints with [src]!")
qdel(C.handcuffed)
return
- else if(istype(C) && C.has_status_effect(STATUS_EFFECT_CHOKINGSTRAND))
- to_chat(C, "You attempt to remove the durathread strand from around your neck.")
- if(do_after(user, 15, null, C))
- to_chat(C, "You succesfuly remove the durathread strand.")
- C.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
else
..()
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index bc1155ec34aa..35b7663ca05e 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -134,13 +134,6 @@ LINEN BINS
item_state = "sheetrd"
dream_messages = list("authority", "a silvery ID", "a bomb", "a mech", "a facehugger", "maniacal laughter", "the research director")
-// for Free Golems.
-/obj/item/bedsheet/rd/royal_cape
- name = "Royal Cape of the Liberator"
- desc = "Majestic."
- dream_messages = list("mining", "stone", "a golem", "freedom", "doing whatever")
- custom_price = 500
-
/obj/item/bedsheet/medical
name = "medical blanket"
desc = "It's a sterilized* blanket commonly used in the Medbay. *Sterilization is voided if a virologist is present within a 10 LY radius*."
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 727187aa14df..56d0f0f2526f 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -166,102 +166,6 @@
if(4)
to_chat(new_spawn, "You wished for immortality, even as your friends lay dying behind you. No matter how many times you cast yourself into the lava, you awaken in this room again within a few days. There is no escape.")
-//Golem shells: Spawns in Free Golem ships in lavaland. Ghosts become mineral golems and are advised to spread personal freedom.
-/obj/effect/mob_spawn/human/golem
- name = "inert free golem shell"
- desc = "A humanoid shape, empty, lifeless, and full of potential."
- mob_name = "a free golem"
- icon = 'icons/obj/wizard.dmi'
- icon_state = "construct"
- mob_species = /datum/species/golem
- roundstart = FALSE
- death = FALSE
- anchored = FALSE
- move_resist = MOVE_FORCE_NORMAL
- density = FALSE
- var/has_owner = FALSE
- var/can_transfer = TRUE //if golems can switch bodies to this new shell
- var/mob/living/owner = null //golem's owner if it has one
- short_desc = "You are a Free Golem. Your family worships The Liberator."
- flavour_text = "In his infinite and divine wisdom, he set your clan free to \
- travel the stars with a single declaration: \"Yeah go do whatever.\" Though you are bound to the one who created you, it is customary in your society to repeat those same words to newborn \
- golems, so that no golem may ever be forced to serve again."
-
-/obj/effect/mob_spawn/human/golem/Initialize(mapload, datum/species/golem/species = null, mob/creator = null)
- if(species) //spawners list uses object name to register so this goes before ..()
- name += " ([initial(species.prefix)])"
- mob_species = species
- . = ..()
- var/area/A = get_area(src)
- if(!mapload && A)
- notify_ghosts("\A [initial(species.prefix)] golem shell has been completed in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE, ignore_key = POLL_IGNORE_GOLEM)
- if(has_owner && creator)
- short_desc = "You are a golem."
- flavour_text = "You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools."
- important_info = "Serve [creator], and assist [creator.p_them()] in completing [creator.p_their()] goals at any cost."
- owner = creator
-
-/obj/effect/mob_spawn/human/golem/special(mob/living/new_spawn, name)
- var/datum/species/golem/X = mob_species
- to_chat(new_spawn, "[initial(X.info_text)]")
- if(!owner)
- to_chat(new_spawn, "Build golem shells in the autolathe, and feed refined mineral sheets to the shells to bring them to life! You are generally a peaceful group unless provoked.")
- else
- new_spawn.mind.store_memory("Serve [owner.real_name], your creator.")
- new_spawn.mind.enslave_mind_to_creator(owner)
- log_game("[key_name(new_spawn)] possessed a golem shell enslaved to [key_name(owner)].")
- log_admin("[key_name(new_spawn)] possessed a golem shell enslaved to [key_name(owner)].")
- if(ishuman(new_spawn))
- var/mob/living/carbon/human/H = new_spawn
- if(has_owner)
- var/datum/species/golem/G = H.dna.species
- G.owner = owner
- H.set_cloned_appearance()
- if(!name)
- if(has_owner)
- H.fully_replace_character_name(null, "[initial(X.prefix)] Golem ([rand(1,999)])")
- else
- H.fully_replace_character_name(null, H.dna.species.random_name())
- else
- H.fully_replace_character_name(null, name)
- if(has_owner)
- new_spawn.mind.assigned_role = "Servant Golem"
- else
- new_spawn.mind.assigned_role = "Free Golem"
-
-/obj/effect/mob_spawn/human/golem/attack_hand(mob/user)
- . = ..()
- if(.)
- return
- if(isgolem(user) && can_transfer)
- var/mob/living/carbon/human/H = user
- var/transfer_choice = alert("Transfer your soul to [src]? (Warning, your old body will die!)",,"Yes","No")
- if(transfer_choice != "Yes")
- return
- if(QDELETED(src) || uses <= 0)
- return
- log_game("[key_name(H)] golem-swapped into [src]")
- H.visible_message("A faint light leaves [H], moving to [src] and animating it!","You leave your old body behind, and transfer into [src]!")
- show_flavour = FALSE
- var/mob/living/carbon/human/newgolem = create(newname = H.real_name)
- H.transfer_trait_datums(newgolem)
- H.mind.transfer_to(newgolem)
- H.death()
- return
-
-/obj/effect/mob_spawn/human/golem/servant
- has_owner = TRUE
- name = "inert servant golem shell"
- mob_name = "a servant golem"
-
-
-/obj/effect/mob_spawn/human/golem/adamantine
- name = "dust-caked free golem shell"
- desc = "A humanoid shape, empty, lifeless, and full of potential."
- mob_name = "a free golem"
- can_transfer = FALSE
- mob_species = /datum/species/golem/adamantine
-
//Malfunctioning cryostasis sleepers: Spawns in makeshift shelters in lavaland. Ghosts become hermits with knowledge of how they got to where they are now.
/obj/effect/mob_spawn/human/hermit
name = "malfunctioning cryostasis sleeper"
diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm
index ac8d2185b940..321a5ce25e90 100644
--- a/code/game/turfs/closed/minerals.dm
+++ b/code/game/turfs/closed/minerals.dm
@@ -161,6 +161,7 @@
//Currently, Adamantine won't spawn as it has no uses. -Durandan
var/mineralChance = 13
+
/turf/closed/mineral/random/Initialize(mapload, inherited_virtual_z)
mineralSpawnChanceList = typelist("mineralSpawnChanceList", mineralSpawnChanceList)
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm
index b7fca049449c..ac7c85cb2fe8 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm
@@ -34,10 +34,6 @@
icon_state = "pipe[nodes[1] ? "1" : "0"][nodes[2] ? "1" : "0"]-[piping_layer]"
return ..()
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer1
- piping_layer = 1
- icon_state = "pipe11-1"
-
/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2
piping_layer = 2
icon_state = "pipe11-2"
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm
index 61d909c7fc71..d452f11c11e7 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm
@@ -37,10 +37,6 @@
if(nodes[i])
. += getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i]))
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer1
- piping_layer = 1
- icon_state = "manifold-1"
-
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2
piping_layer = 2
icon_state = "manifold-2"
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm
index 57e9b6ea797b..40a049064148 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm
@@ -35,10 +35,6 @@
if(nodes[i])
. += getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i]))
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer1
- piping_layer = 1
- icon_state = "manifold4w-1"
-
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2
piping_layer = 2
icon_state = "manifold4w-2"
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm
index debbe9350c14..60379cb3a57e 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm
@@ -28,10 +28,6 @@
icon_state = "pipe[nodes[1] ? "1" : "0"][nodes[2] ? "1" : "0"]-[piping_layer]"
return ..()
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1
- piping_layer = 1
- icon_state = "pipe11-1"
-
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2
piping_layer = 2
icon_state = "pipe11-2"
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index f4c2a5a27f4e..8245a3333e4c 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -148,11 +148,11 @@
. = ..()
if(istype(I, /obj/item/clothing/glasses/eyepatch))
var/obj/item/clothing/glasses/eyepatch/old_patch = I
- var/obj/item/clothing/glasses/blindfold/eyepatch/double_patch = new/obj/item/clothing/glasses/blindfold/eyepatch
- double_patch.forceMove(user.drop_location())
+ var/obj/item/clothing/glasses/blindfold/eyepatch/double_patch = new()
to_chat(user, "You combine the eyepatches with a knot.")
- old_patch.Destroy()
- Destroy()
+ qdel(old_patch)
+ qdel(src)
+ user.put_in_hands(double_patch)
/obj/item/clothing/glasses/monocle
name = "monocle"
diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm
index 807bfb217516..68f64cdd515e 100644
--- a/code/modules/clothing/gloves/boxing.dm
+++ b/code/modules/clothing/gloves/boxing.dm
@@ -4,7 +4,6 @@
icon_state = "boxing"
item_state = "boxing"
equip_delay_other = 60
- species_exception = list(/datum/species/golem) // now you too can be a golem boxing champion
supports_variations = VOX_VARIATION
/obj/item/clothing/gloves/boxing/green
diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm
index bd5c45f95bec..7f83603e7f01 100644
--- a/code/modules/clothing/head/berets.dm
+++ b/code/modules/clothing/head/berets.dm
@@ -162,6 +162,11 @@
icon_state = "beret_cmo"
armor = list("bio" = 30, "acid" = 20)
+/obj/item/clothing/head/beret/cmo/cybersun
+ name = "medical director beret"
+ desc = "A burgundy-red beret with a silver cross. It smells very sterile."
+ icon_state = "meddirectorberet"
+
//Command
/obj/item/clothing/head/beret/captain
name = "captain beret"
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 50e895148218..9df87d4a5f51 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -466,11 +466,11 @@
icon_state = "JackFrostHat"
item_state = "JackFrostHat"
-/obj/item/clothing/head/aclfcap
+/obj/item/clothing/head/gorlexcap
name = "2nd Battlegroup peaked cap"
- desc = "A cap worn by officers of the Gorlex Marauders 2nd Battlegroup, or as they say, the ACLF."
- icon_state = "aclfcap"
- item_state = "aclfcap"
+ desc = "A cap worn by officers of the Gorlex Marauders 2nd Battlegroup."
+ icon_state = "gorlexcap"
+ item_state = "gorlexcap"
flags_inv = 0
armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = 60
diff --git a/code/modules/clothing/outfits/syndicate.dm b/code/modules/clothing/outfits/syndicate.dm
index fbe35ec5738a..d1ba5c1ce35b 100644
--- a/code/modules/clothing/outfits/syndicate.dm
+++ b/code/modules/clothing/outfits/syndicate.dm
@@ -211,7 +211,7 @@
id = /obj/item/card/id/syndicate_command/captain_id
ears = /obj/item/radio/headset/syndicate/alt/captain
- uniform = /obj/item/clothing/under/syndicate/aclf
+ uniform = /obj/item/clothing/under/syndicate/officer
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/HoS/syndicate
gloves = /obj/item/clothing/gloves/combat
@@ -232,7 +232,7 @@
/datum/outfit/job/syndicate/captain/twink
name = "Captain (Twinkleshine)"
- uniform = /obj/item/clothing/under/syndicate/aclf
+ uniform = /obj/item/clothing/under/syndicate/officer
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/combat
ears = /obj/item/radio/headset/syndicate/alt/captain
@@ -253,10 +253,10 @@
/datum/outfit/job/syndicate/captain/gorlex
name = "Captain (Gorlex Marauders)"
- uniform = /obj/item/clothing/under/syndicate/aclf
+ uniform = /obj/item/clothing/under/syndicate/officer
- head = /obj/item/clothing/head/aclfcap
- suit = /obj/item/clothing/suit/aclf
+ head = /obj/item/clothing/head/gorlexcap
+ suit = /obj/item/clothing/suit/gorlex
/datum/outfit/job/syndicate/captain/cybersun
name = "Captain (Cybersun)"
@@ -365,17 +365,17 @@
//Chief Medical Officer
/datum/outfit/job/syndicate/cmo
- name = "Chief Medical Officer (Syndicate)"
+ name = "Medical Director (Cybersun)"
jobtype = /datum/job/cmo
- uniform = /obj/item/clothing/under/syndicate
+ uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer/cybersun
ears = /obj/item/radio/headset/syndicate/alt/captain
id = /obj/item/card/id/syndicate_command/captain_id
shoes = /obj/item/clothing/shoes/jackboots
belt = /obj/item/pda/heads/cmo
l_pocket = /obj/item/pinpointer/crew
- shoes = /obj/item/clothing/shoes/sneakers/brown
- suit = /obj/item/clothing/suit/toggle/labcoat/cmo
+ head = /obj/item/clothing/head/beret/cmo/cybersun
+ suit = /obj/item/clothing/suit/toggle/labcoat/raincoat
l_hand = /obj/item/storage/firstaid/medical
suit_store = /obj/item/flashlight/pen
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
@@ -383,6 +383,18 @@
/datum/outfit/job/syndicate/cmo/suns
name = "Medical Director (SUNS)"
+ uniform = /obj/item/clothing/under/syndicate
+ ears = /obj/item/radio/headset/syndicate/alt/captain
+ id = /obj/item/card/id/syndicate_command/captain_id
+ shoes = /obj/item/clothing/shoes/jackboots
+ belt = /obj/item/pda/heads/cmo
+ l_pocket = /obj/item/pinpointer/crew
+ shoes = /obj/item/clothing/shoes/sneakers/brown
+ suit = /obj/item/clothing/suit/toggle/labcoat/cmo
+ l_hand = /obj/item/storage/firstaid/medical
+ suit_store = /obj/item/flashlight/pen
+ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
+
//"Head Of Personnel"
/datum/outfit/job/syndicate/head_of_personnel
@@ -438,7 +450,8 @@
/datum/outfit/job/syndicate/hos/twink
name = "Lieutenant (Twinkleshine)"
- uniform = /obj/item/clothing/under/syndicate/aclf
+
+ uniform = /obj/item/clothing/under/syndicate/officer
head = /obj/item/clothing/head/HoS/beret/syndicate
ears = /obj/item/radio/headset/syndicate/alt
mask = /obj/item/clothing/mask/chameleon
@@ -448,7 +461,7 @@
belt = /obj/item/storage/belt/military/assault
shoes = /obj/item/clothing/shoes/combat
suit = /obj/item/clothing/suit/armor/vest
- alt_suit = /obj/item/clothing/suit/aclf
+ alt_suit = /obj/item/clothing/suit/gorlex
id = /obj/item/card/id/syndicate_command/lieutenant
implants = list(/obj/item/implant/weapons_auth)
backpack_contents = list(/obj/item/melee/baton)
@@ -475,10 +488,8 @@
shoes = /obj/item/clothing/shoes/jackboots
belt = /obj/item/pda/medical
shoes = /obj/item/clothing/shoes/sneakers/white
- suit = /obj/item/clothing/suit/toggle/labcoat
alt_suit = /obj/item/clothing/suit/apron/surgical
l_hand = /obj/item/storage/firstaid/medical
- suit_store = /obj/item/flashlight/pen
/datum/outfit/job/syndicate/doctor/suns
name = "Medical Doctor (SUNS)"
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 8a918876dfcd..24836f6f2404 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -8,7 +8,6 @@
allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
togglename = "buttons"
- species_exception = list(/datum/species/golem)
/obj/item/clothing/suit/toggle/labcoat/cmo
name = "chief medical officer's labcoat"
@@ -85,7 +84,6 @@ You're pretty sure this is just a raincoat.
allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
togglename = "buttons"
- species_exception = list(/datum/species/golem)
/obj/item/clothing/suit/longcoat/virologist
name = "virologist longcoat"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 5bb6923dec73..59b252a9836a 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -686,11 +686,11 @@
item_state = "DutchJacket"
body_parts_covered = ARMS
-/obj/item/clothing/suit/aclf
+/obj/item/clothing/suit/gorlex
name = "\improper 2nd Battlegroup jacket"
- desc = "An armored jacket worn by the Gorlex Marauders 2nd Battlegroup."
+ desc = "An armored jacket worn by the 2nd Battlegroup."
body_parts_covered = CHEST|GROIN|ARMS|HANDS
- icon_state = "aclfjacket"
- item_state = "aclfjacket"
+ icon_state = "gorlexjacket"
+ item_state = "gorlexjacket"
blood_overlay_type = "coat"
armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm
index b50de5f3d17e..7a95273c22f2 100644
--- a/code/modules/clothing/under/jobs/medical.dm
+++ b/code/modules/clothing/under/jobs/medical.dm
@@ -11,6 +11,16 @@
permeability_coefficient = 0.5
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
+/obj/item/clothing/under/rank/medical/chief_medical_officer/cybersun
+ desc = "It's a jumpsuit worn by those with the experience to be a \"Medical Director\" for Cybersun. It provides minor biological protection."
+ name = "medical director's jumpsuit"
+ icon_state = "cybersun_md"
+ item_state = "w_suit"
+ icon = 'icons/obj/clothing/under/syndicate.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/under/syndicate.dmi'
+ can_adjust = FALSE
+ supports_variations = DIGITIGRADE_VARIATION
+
/obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
name = "chief medical officer's jumpskirt"
desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index e2e972ab70ae..a05f580781e2 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -92,10 +92,10 @@
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
alt_covers_chest = TRUE
-/obj/item/clothing/under/syndicate/aclf
- name = "2nd Battlegroup uniform"
- desc = "A black uniform worn by the officers of the Gorlex Marauders 2nd Battlegroup."
- icon_state = "aclf"
+/obj/item/clothing/under/syndicate/officer
+ name = "syndicate officer uniform"
+ desc = "A black uniform worn by officers of many branches of the Syndicate."
+ icon_state = "officer"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
alt_covers_chest = TRUE
diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm
index 86323c2e00bc..e4ccbd1c8f90 100644
--- a/code/modules/food_and_drinks/food/snacks/meat.dm
+++ b/code/modules/food_and_drinks/food/snacks/meat.dm
@@ -68,20 +68,6 @@
tastes = list("slime" = 1, "jelly" = 1)
foodtype = MEAT | RAW | TOXIC
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem
- icon_state = "golemmeat"
- desc = "Edible rocks, welcome to the future."
- list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/iron = 3)
- filling_color = "#A9A9A9"
- tastes = list("rock" = 1)
- foodtype = MEAT | RAW | GROSS
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine
- icon_state = "agolemmeat"
- desc = "From the slime pen to the rune to the kitchen, science."
- filling_color = "#66CDAA"
- foodtype = MEAT | RAW | GROSS
-
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard
icon_state = "lizardmeat"
desc = "Delicious dino damage."
diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm
index 95ef84ae5cb7..dfbed9ba9112 100644
--- a/code/modules/food_and_drinks/food/snacks_frozen.dm
+++ b/code/modules/food_and_drinks/food/snacks_frozen.dm
@@ -262,9 +262,9 @@
bonus_reagents = list(/datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 3, /datum/reagent/consumable/sugar = 2)
overlay_state = "jumbo"
-/obj/item/reagent_containers/food/snacks/popsicle/nogga_black
- name = "nogga black"
- desc = "A salty licorice icecream recently reintroduced due to all the records of the controversy being lost to time. Those who cannot remember the past are doomed to repeat it."
+/obj/item/reagent_containers/food/snacks/popsicle/licorice
+ name = "licorice icecream"
+ desc = "A salty licorice icecream."
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4)
tastes = list("salty liquorice")
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
index 588eb863fbd7..92647559d9cd 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
@@ -296,8 +296,8 @@
result = /obj/item/reagent_containers/food/snacks/popsicle/jumbo
subcategory = CAT_ICE
-/datum/crafting_recipe/food/nogga_black
- name = "Nogga black"
+/datum/crafting_recipe/food/licorice
+ name = "Licorice icecream"
reqs = list(
/obj/item/popsicle_stick = 1,
/datum/reagent/consumable/blumpkinjuice = 4, //natural source of ammonium chloride
@@ -307,5 +307,5 @@
/datum/reagent/consumable/vanilla = 2,
/datum/reagent/consumable/sugar = 2
)
- result = /obj/item/reagent_containers/food/snacks/popsicle/nogga_black
+ result = /obj/item/reagent_containers/food/snacks/popsicle/licorice
subcategory = CAT_ICE
diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm
index 159c1e1df6aa..9cf57432b4ea 100644
--- a/code/modules/jobs/job_exp.dm
+++ b/code/modules/jobs/job_exp.dm
@@ -45,6 +45,7 @@ GLOBAL_PROTECT(exp_to_update)
return FALSE
if(CONFIG_GET(flag/use_exp_restrictions_admin_bypass) && check_rights_for(src, R_ADMIN))
return FALSE // if admin exemption is enabled, and client is an admin, let them through
+ return TRUE
/client/proc/get_exp_living(pure_numeric = FALSE)
if(!prefs.exp)
diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm
index 5ac130370a6c..1b989c847ba6 100644
--- a/code/modules/jobs/job_types/paramedic.dm
+++ b/code/modules/jobs/job_types/paramedic.dm
@@ -45,14 +45,6 @@
//Shiptest outfits
-/datum/outfit/job/paramedic/traumateam
- name = "Paramedic (Trauma Team Technician)"
-
- uniform = /obj/item/clothing/under/rank/security/brig_phys
- shoes = /obj/item/clothing/shoes/combat
- backpack = /obj/item/storage/backpack/ert/medical
- belt = /obj/item/storage/belt/medical/webbing/paramedic
-
/datum/outfit/job/paramedic/inteq
name = "IRMG Corpsman (Inteq)"
diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm
index 6a3f13da7c78..cc5ec142932e 100644
--- a/code/modules/jobs/job_types/shaft_miner.dm
+++ b/code/modules/jobs/job_types/shaft_miner.dm
@@ -27,7 +27,8 @@
backpack_contents = list(
/obj/item/flashlight/seclite=1,\
/obj/item/kitchen/knife/combat/survival=1,\
- /obj/item/stack/marker_beacon/ten=1)
+ /obj/item/stack/marker_beacon/ten=1,\
+ /obj/item/radio/weather_monitor=1)
backpack = /obj/item/storage/backpack/explorer
satchel = /obj/item/storage/backpack/satchel/explorer
diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm
index d1b930174490..6484b22963ba 100644
--- a/code/modules/jobs/jobs.dm
+++ b/code/modules/jobs/jobs.dm
@@ -97,7 +97,7 @@ GLOBAL_LIST_INIT(exp_jobsmap, list(
GLOBAL_LIST_INIT(exp_specialmap, list(
EXP_TYPE_LIVING = list(), // all living mobs
EXP_TYPE_ANTAG = list(),
- EXP_TYPE_SPECIAL = list("Lifebringer","Ash Walker","Exile","Servant Golem","Free Golem","Hermit","Translocated Vet","Escaped Prisoner","Hotel Staff","SuperFriend","Space Syndicate","Ancient Crew","Space Doctor","Space Bartender","Beach Bum","Skeleton","Zombie","Space Bar Patron","Lavaland Syndicate","Ghost Role"), // Ghost roles
+ EXP_TYPE_SPECIAL = list("Lifebringer","Ash Walker","Exile","Hermit","Translocated Vet","Escaped Prisoner","Hotel Staff","SuperFriend","Space Syndicate","Ancient Crew","Space Doctor","Space Bartender","Beach Bum","Skeleton","Zombie","Space Bar Patron","Lavaland Syndicate","Ghost Role"), // Ghost roles
EXP_TYPE_GHOST = list() // dead people, observers
))
diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm
index 61570535cbbf..7b51b433adde 100644
--- a/code/modules/language/language_holder.dm
+++ b/code/modules/language/language_holder.dm
@@ -341,28 +341,6 @@ Key procs
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/draconic = list(LANGUAGE_ATOM))
-/datum/language_holder/golem
- understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM))
- spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM))
-
-/datum/language_holder/golem/bone
- understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM),
- /datum/language/calcic = list(LANGUAGE_ATOM))
- spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM),
- /datum/language/calcic = list(LANGUAGE_ATOM))
-
-/datum/language_holder/golem/runic
- understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM),
- /datum/language/narsie = list(LANGUAGE_ATOM))
- spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM),
- /datum/language/narsie = list(LANGUAGE_ATOM))
-
/datum/language_holder/fly
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/buzzwords = list(LANGUAGE_ATOM))
diff --git a/code/modules/language/terrum.dm b/code/modules/language/terrum.dm
deleted file mode 100644
index 04f1ad740821..000000000000
--- a/code/modules/language/terrum.dm
+++ /dev/null
@@ -1,19 +0,0 @@
-/datum/language/terrum
- name = "Terrum"
- desc = "The language of the golems. Sounds similar to old-earth Hebrew."
- speech_verb = "rumbles"
- ask_verb = "questions"
- exclaim_verb = "tremors"
- sing_verb = "yodels"
- flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding
- key = "g"
- space_chance = 40
- syllables = list(
- "sha", "vu", "nah", "ha", "yom", "ma", "cha", "ar", "et", "mol", "lua",
- "ch", "na", "sh", "ni", "yah", "bes", "ol", "hish", "ev", "la", "ot", "la",
- "khe", "tza", "chak", "hak", "hin", "hok", "lir", "tov", "yef", "yfe",
- "cho", "ar", "kas", "kal", "ra", "lom", "im", "'", "'", "'", "'", "bok",
- "erev", "shlo", "lo", "ta", "im", "yom"
- )
- icon_state = "golem"
- default_priority = 90
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index 8cf62d92abd4..debdb2e2ea02 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -64,11 +64,16 @@
/obj/item/kinetic_crusher/attackby(obj/item/I, mob/living/user)
if(I.tool_behaviour == TOOL_CROWBAR)
if(LAZYLEN(trophies))
- to_chat(user, "You remove [src]'s trophies.")
- I.play_tool_sound(src)
- for(var/t in trophies)
- var/obj/item/crusher_trophy/T = t
- T.remove_from(src, user)
+ var/list/choose_options = list()
+ for(var/obj/item/crusher_trophy/T in trophies)
+ choose_options += list(T.name = image(icon = T.icon, icon_state = T.icon_state))
+ var/picked_option = show_radial_menu(user, src, choose_options, radius = 38, require_near = TRUE)
+ if(picked_option)
+ to_chat(user, "You remove [picked_option].")
+ I.play_tool_sound(src)
+ for(var/obj/item/crusher_trophy/T in trophies)
+ if(T.name == picked_option)
+ T.remove_from(src, user)
else
to_chat(user, "There are no trophies on [src].")
else if(istype(I, /obj/item/crusher_trophy))
diff --git a/code/modules/mining/equipment/miningradio.dm b/code/modules/mining/equipment/miningradio.dm
new file mode 100644
index 000000000000..a0bef397d8ca
--- /dev/null
+++ b/code/modules/mining/equipment/miningradio.dm
@@ -0,0 +1,23 @@
+/// Portable mining radio purchasable by miners
+/obj/item/radio/weather_monitor
+ icon = 'icons/obj/miningradio.dmi'
+ name = "mining weather radio"
+ icon_state = "miningradio"
+ desc = "A weather radio designed for use in inhospitable environments. Gives audible warnings when storms approach."
+ luminosity = 1
+ light_power = 1
+ light_range = 1.6
+
+/obj/item/radio/weather_monitor/update_overlays()
+ . = ..()
+ . += emissive_appearance(icon, "small_emissive", src, alpha = src.alpha)
+
+/obj/item/radio/weather_monitor/Initialize(mapload)
+ . = ..()
+ AddComponent( \
+ /datum/component/weather_announcer, \
+ state_normal = "weatherwarning", \
+ state_warning = "urgentwarning", \
+ state_danger = "direwarning", \
+ )
+ set_frequency(FREQ_COMMON)
diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm
index 9c989b986a33..2af4c1b5ce4f 100644
--- a/code/modules/mining/equipment/wormhole_jaunter.dm
+++ b/code/modules/mining/equipment/wormhole_jaunter.dm
@@ -1,7 +1,7 @@
/**********************Jaunter**********************/
/obj/item/wormhole_jaunter
name = "wormhole jaunter"
- desc = "A single use device harnessing outdated wormhole technology, Nanotrasen has since turned its eyes to bluespace for more accurate teleportation. The wormholes it creates are unpleasant to travel through, to say the least.\nThanks to modifications provided by the Free Golems, this jaunter can be worn on the belt to provide protection from chasms."
+ desc = "A single use device harnessing outdated wormhole technology, Nanotrasen has since turned its eyes to bluespace for more accurate teleportation. The wormholes it creates are unpleasant to travel through, to say the least.\nThis jaunter has been modified to fit on your belt, providing you protection from chasms."
icon = 'icons/obj/mining.dmi'
icon_state = "Jaunter"
item_state = "electronic"
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 03a6a9fb39a1..ba2a1c6984a4 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -127,79 +127,10 @@
/obj/item/stack/sheet/rglass = 1,
/obj/item/vending_refill/mining_equipment = 1)
-/obj/item/circuitboard/machine/vending/mining_equipment/golem
- name = "golem equipment vendor (Machine Board)"
- build_path = /obj/machinery/vending/mining_equipment/golem
-
/obj/item/vending_refill/mining_equipment
machine_name = "mining equipment vendor"
icon_state = "mining-refill"
-/obj/item/vending_refill/mining_equipment_golem
- machine_name = "golem equipment vendor"
- icon_state = "mining-refill"
-
-
-/obj/machinery/vending/mining_equipment/golem
- name = "golem equipment vendor"
- desc = "An modified equipment vendor which appears to be a prototype of the current mining equipment vendor. Ore Redemption Points can be spent here to purchase rough-and-tumble goods."
- circuit = /obj/item/circuitboard/machine/vending/mining_equipment
- refill_canister = /obj/item/vending_refill/mining_equipment_golem
- products = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces.
- /obj/item/stack/marker_beacon/thirty = 6,
- /obj/item/reagent_containers/food/drinks/bottle/whiskey = 3,
- /obj/item/storage/box/gum/bubblegum = 5,
- /obj/item/clothing/mask/cigarette/cigar/havana = 3,
- /obj/item/soap/nanotrasen = 1,
- /obj/item/hivelordstabilizer = 6,
- /obj/item/fulton_core = 1,
- /obj/item/survivalcapsule = 3,
- /obj/item/storage/belt/mining = 3,
- /obj/item/card/mining_point_card = 5,
- /obj/item/reagent_containers/hypospray/medipen/survival = 6,
- /obj/item/storage/firstaid/brute = 3,
- /obj/item/storage/box/minertracker = 5,
- /obj/item/wormhole_jaunter = 3,
- /obj/item/kinetic_crusher = 1,
- /obj/item/gun/energy/kinetic_accelerator = 3,
- /obj/item/mining_scanner = 5,
- /obj/item/t_scanner/adv_mining_scanner = 2,
- /obj/item/resonator = 3,
- /obj/item/extraction_pack = 3,
- /obj/item/lazarus_injector = 1,
- /obj/item/pickaxe/silver = 3,
- /obj/item/storage/backpack/duffelbag/mining_conscript = 3,
- /obj/item/tank/jetpack/suit = 3,
- /obj/item/spacecash/bundle/c1000 = 5,
- /obj/item/clothing/suit/space/hardsuit/mining/independent = 3,
- /obj/item/resonator/upgraded = 1,
- /obj/item/clothing/shoes/bhop = 3,
- /obj/item/survivalcapsule/luxury = 3,
- /mob/living/simple_animal/hostile/mining_drone = 3,
- /obj/item/mine_bot_upgrade = 3,
- /obj/item/mine_bot_upgrade/health = 3,
- /obj/item/borg/upgrade/modkit/cooldown/minebot = 3,
- /obj/item/slimepotion/slime/sentience/mining = 1,
- /obj/item/borg/upgrade/modkit/minebot_passthrough = 3,
- /obj/item/borg/upgrade/modkit/tracer = 3,
- /obj/item/borg/upgrade/modkit/tracer/adjustable = 3,
- /obj/item/borg/upgrade/modkit/chassis_mod = 3,
- /obj/item/borg/upgrade/modkit/range = 3,
- /obj/item/borg/upgrade/modkit/damage = 3,
- /obj/item/borg/upgrade/modkit/cooldown = 3,
- /obj/item/borg/upgrade/modkit/aoe/mobs = 2,
- // golem extra things
- /obj/item/card/id/mining = 5,
- /obj/item/clothing/glasses/science = 5,
- /obj/item/reagent_containers/food/snacks/monkeycube = 5,
- /obj/item/storage/belt/utility = 3,
- /obj/item/bedsheet/rd/royal_cape = 3,
- /obj/item/slime_extract/grey = 1,
- /obj/item/borg/upgrade/modkit/trigger_guard = 4,
- /obj/item/storage/box/rndboards = 1
-
- )
-
/**********************Mining Equipment Voucher**********************/
/obj/item/mining_voucher
diff --git a/code/modules/mob/dead/new_player/ship_select.dm b/code/modules/mob/dead/new_player/ship_select.dm
index 0ace7574101a..88146c9ea0fd 100644
--- a/code/modules/mob/dead/new_player/ship_select.dm
+++ b/code/modules/mob/dead/new_player/ship_select.dm
@@ -112,6 +112,8 @@
.["ships"] = list()
.["shipSpawnAllowed"] = SSovermap.player_ship_spawn_allowed()
.["purchaseBanned"] = is_banned_from(user.ckey, "Ship Purchasing")
+ // if the player has a client which is not eligible for playtime restriction (for admin + player DB flag playtime exemption), they "auto meet" playtime requirements
+ .["autoMeet"] = user.client && !user.client.is_playtime_restriction_eligible()
.["playMin"] = user.client ? user.client.get_exp_living(TRUE) : 0
for(var/datum/overmap/ship/controlled/S as anything in SSovermap.controlled_ships)
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 7d06c9e1f827..a7dc41b307c4 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -15,7 +15,7 @@
var/silent = 0 ///Can't talk. Value goes down every life proc. NOTE TO FUTURE CODERS: DO NOT INITIALIZE NUMERICAL VARS AS NULL OR I WILL MURDER YOU.
var/dreaming = 0 ///How many dream images we have left to send
- var/obj/item/handcuffed = null///Whether or not the mob is handcuffed
+ var/obj/item/handcuffed = null ///Whether or not the mob is handcuffed
var/obj/item/legcuffed = null ///Same as handcuffs but for legs. Bear traps use this.
var/disgust = 0
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 8c72925e7c96..4473b3156d27 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -646,7 +646,7 @@
return threatcount
-//Used for new human mobs created by cloning/goleming/podding
+//Used for new human mobs created by cloning/podding
/mob/living/carbon/human/proc/set_cloned_appearance()
if(gender == MALE)
facial_hairstyle = "Full Beard"
@@ -1336,83 +1336,6 @@
/mob/living/carbon/human/species/fly
race = /datum/species/fly
-/mob/living/carbon/human/species/golem
- race = /datum/species/golem
-
-/mob/living/carbon/human/species/golem/random
- race = /datum/species/golem/random
-
-/mob/living/carbon/human/species/golem/adamantine
- race = /datum/species/golem/adamantine
-
-/mob/living/carbon/human/species/golem/plasma
- race = /datum/species/golem/plasma
-
-/mob/living/carbon/human/species/golem/diamond
- race = /datum/species/golem/diamond
-
-/mob/living/carbon/human/species/golem/gold
- race = /datum/species/golem/gold
-
-/mob/living/carbon/human/species/golem/silver
- race = /datum/species/golem/silver
-
-/mob/living/carbon/human/species/golem/plasteel
- race = /datum/species/golem/plasteel
-
-/mob/living/carbon/human/species/golem/titanium
- race = /datum/species/golem/titanium
-
-/mob/living/carbon/human/species/golem/plastitanium
- race = /datum/species/golem/plastitanium
-
-/mob/living/carbon/human/species/golem/alien_alloy
- race = /datum/species/golem/alloy
-
-/mob/living/carbon/human/species/golem/wood
- race = /datum/species/golem/wood
-
-/mob/living/carbon/human/species/golem/uranium
- race = /datum/species/golem/uranium
-
-/mob/living/carbon/human/species/golem/sand
- race = /datum/species/golem/sand
-
-/mob/living/carbon/human/species/golem/glass
- race = /datum/species/golem/glass
-
-/mob/living/carbon/human/species/golem/bluespace
- race = /datum/species/golem/bluespace
-
-/mob/living/carbon/human/species/golem/bananium
- race = /datum/species/golem/bananium
-
-/mob/living/carbon/human/species/golem/blood_cult
- race = /datum/species/golem/runic
-
-/mob/living/carbon/human/species/golem/cloth
- race = /datum/species/golem/cloth
-
-/mob/living/carbon/human/species/golem/plastic
- race = /datum/species/golem/plastic
-
-/mob/living/carbon/human/species/golem/bronze
- race = /datum/species/golem/bronze
-
-/mob/living/carbon/human/species/golem/cardboard
- race = /datum/species/golem/cardboard
-
-/mob/living/carbon/human/species/golem/leather
- race = /datum/species/golem/leather
-
-/mob/living/carbon/human/species/golem/bone
- race = /datum/species/golem/bone
-
-/mob/living/carbon/human/species/golem/durathread
- race = /datum/species/golem/durathread
-
-/mob/living/carbon/human/species/golem/snow
- race = /datum/species/golem/snow
/mob/living/carbon/human/species/jelly
race = /datum/species/jelly
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 1444b71d9c51..123ecf6d4fba 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -695,15 +695,8 @@
return
if(src == M)
- if(has_status_effect(STATUS_EFFECT_CHOKINGSTRAND))
- to_chat(src, "You attempt to remove the durathread strand from around your neck.")
- if(do_after(src, 35, null, src))
- to_chat(src, "You succesfuly remove the durathread strand.")
- remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
- return
check_self_for_injuries()
-
else
if(wear_suit)
wear_suit.add_fingerprint(M)
@@ -712,7 +705,6 @@
..()
-
/mob/living/carbon/human/check_self_for_injuries()
if(stat >= UNCONSCIOUS)
return
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 09bd6161b151..bbe40388435a 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -66,9 +66,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/disliked_food = GROSS
///Bitfield for food types that the species absolutely hates, giving them even more disgust than disliked food. Meat is "toxic" to moths, for example.
var/toxic_food = TOXIC
- ///Inventory slots the race can't equip stuff to. Golems cannot wear jumpsuits, for example.
+ ///Inventory slots the race can't equip stuff to.
var/list/no_equip = list()
- /// Allows the species to equip items that normally require a jumpsuit without having one equipped. Used by golems.
+ /// Allows the species to equip items that normally require a jumpsuit without having one equipped.
var/nojumpsuit = FALSE
///What languages this species can understand and say. Use a [language holder datum][/datum/language_holder] in this var.
var/species_language_holder = /datum/language_holder
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
deleted file mode 100644
index 380d91aebbe6..000000000000
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ /dev/null
@@ -1,1113 +0,0 @@
-/datum/species/golem
- // Animated beings of stone. They have increased defenses, and do not need to breathe. They're also slow as fuuuck.
- name = "\improper Golem"
- id = "iron golem"
- species_traits = list(NOBLOOD,MUTCOLORS,NO_UNDERWEAR)
- inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
- inherent_biotypes = MOB_HUMANOID|MOB_MINERAL
- mutant_organs = list(/obj/item/organ/adamantine_resonator)
- mutanttongue = /obj/item/organ/tongue/golem_base
- speedmod = 2
- armor = 55
- siemens_coeff = 0
- punchdamagelow = 5
- punchdamagehigh = 14
- punchstunthreshold = 11 //about 40% chance to stun
- no_equip = list(ITEM_SLOT_MASK, ITEM_SLOT_OCLOTHING, ITEM_SLOT_GLOVES, ITEM_SLOT_FEET, ITEM_SLOT_ICLOTHING, ITEM_SLOT_SUITSTORE)
- nojumpsuit = 1
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC
- sexes = FALSE
- damage_overlay_type = ""
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem
- species_language_holder = /datum/language_holder/golem
- // To prevent golem subtypes from overwhelming the odds when random species
- // changes, only the Random Golem type can be chosen
-
- species_chest = /obj/item/bodypart/chest/golem
- species_head = /obj/item/bodypart/head/golem
- species_l_arm = /obj/item/bodypart/l_arm/golem
- species_r_arm = /obj/item/bodypart/r_arm/golem
- species_l_leg = /obj/item/bodypart/leg/left/golem
- species_r_leg = /obj/item/bodypart/leg/right/golem
-
- fixed_mut_color = "aaa"
- var/info_text = "As an Iron Golem, you don't have any special traits."
- var/random_eligible = TRUE //If false, the golem subtype can't be made through golem mutation toxin
-
- var/prefix = "Iron"
- var/list/special_names = list("Tarkus")
- var/human_surname_chance = 3
- var/special_name_chance = 5
- var/owner //dobby is a free golem
-
-/datum/species/golem/random_name(gender,unique,lastname)
- var/golem_surname = pick(GLOB.golem_names)
- // 3% chance that our golem has a human surname, because
- // cultural contamination
- if(prob(human_surname_chance))
- golem_surname = pick(GLOB.last_names)
- else if(special_names && special_names.len && prob(special_name_chance))
- golem_surname = pick(special_names)
-
- var/golem_name = "[prefix] [golem_surname]"
- return golem_name
-
-/datum/species/golem/random
- name = "Random Golem"
- id = "random golem"
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
- var/static/list/random_golem_types
-
-/datum/species/golem/random/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- if(!random_golem_types)
- random_golem_types = subtypesof(/datum/species/golem) - type
- for(var/V in random_golem_types)
- var/datum/species/golem/G = V
- if(!initial(G.random_eligible))
- random_golem_types -= G
- var/datum/species/golem/golem_type = pick(random_golem_types)
- var/mob/living/carbon/human/H = C
- H.set_species(golem_type)
- to_chat(H, "[initial(golem_type.info_text)]")
-
-/datum/species/golem/adamantine
- name = "Adamantine Golem"
- id = "adamantine golem"
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine
- mutant_organs = list(/obj/item/organ/adamantine_resonator, /obj/item/organ/vocal_cords/adamantine)
- fixed_mut_color = "4ed"
- info_text = "As an Adamantine Golem, you possess special vocal cords allowing you to \"resonate\" messages to all golems. Your unique mineral makeup makes you immune to most types of magic."
- prefix = "Adamantine"
- special_names = null
-
-/datum/species/golem/adamantine/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- ADD_TRAIT(C, TRAIT_ANTIMAGIC, SPECIES_TRAIT)
-
-/datum/species/golem/adamantine/on_species_loss(mob/living/carbon/C)
- REMOVE_TRAIT(C, TRAIT_ANTIMAGIC, SPECIES_TRAIT)
- ..()
-
-//The suicide bombers of golemkind
-/datum/species/golem/plasma
- name = "Plasma Golem"
- id = "plasma golem"
- fixed_mut_color = "a3d"
- meat = /obj/item/stack/ore/plasma
- //Can burn and takes damage from heat
- inherent_traits = list(TRAIT_NOBREATH, TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER) //no RESISTHEAT, NOFIRE
- info_text = "As a Plasma Golem, you burn easily. Be careful, if you get hot enough while burning, you'll blow up!"
- heatmod = 0 //fine until they blow up
- prefix = "Plasma"
- special_names = list("Flood","Fire","Bar","Man")
- var/boom_warning = FALSE
- var/datum/action/innate/ignite/ignite
-
-/datum/species/golem/plasma/spec_life(mob/living/carbon/human/H)
- if(H.bodytemperature > 750)
- if(!boom_warning && H.on_fire)
- to_chat(H, "You feel like you could blow up at any moment!")
- boom_warning = TRUE
- else
- if(boom_warning)
- to_chat(H, "You feel more stable.")
- boom_warning = FALSE
-
- if(H.bodytemperature > 850 && H.on_fire && prob(25))
- explosion(get_turf(H),1,2,4,flame_range = 5)
- if(H)
- H.gib()
- if(H.fire_stacks < 2) //flammable
- H.adjust_fire_stacks(1)
- ..()
-
-/datum/species/golem/plasma/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- if(ishuman(C))
- ignite = new
- ignite.Grant(C)
-
-/datum/species/golem/plasma/on_species_loss(mob/living/carbon/C)
- if(ignite)
- ignite.Remove(C)
- ..()
-
-/datum/action/innate/ignite
- name = "Ignite"
- desc = "Set yourself aflame, bringing yourself closer to exploding!"
- check_flags = AB_CHECK_CONSCIOUS
- button_icon_state = "sacredflame"
-
-/datum/action/innate/ignite/Activate()
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- if(H.fire_stacks)
- to_chat(owner, "You ignite yourself!")
- else
- to_chat(owner, "You try to ignite yourself, but fail!")
- H.IgniteMob() //firestacks are already there passively
-
-//Harder to hurt
-/datum/species/golem/diamond
- name = "Diamond Golem"
- id = "diamond golem"
- fixed_mut_color = "0ff"
- armor = 70 //up from 55
- meat = /obj/item/stack/ore/diamond
- info_text = "As a Diamond Golem, you are more resistant than the average golem."
- prefix = "Diamond"
- special_names = list("Back","Grill")
-
-//Faster but softer and less armoured
-/datum/species/golem/gold
- name = "Gold Golem"
- id = "gold golem"
- fixed_mut_color = "cc0"
- speedmod = 1
- armor = 25 //down from 55
- meat = /obj/item/stack/ore/gold
- info_text = "As a Gold Golem, you are faster but less resistant than the average golem."
- prefix = "Golden"
- special_names = list("Boy")
-
-//Heavier, thus higher chance of stunning when punching
-/datum/species/golem/silver
- name = "Silver Golem"
- id = "silver golem"
- fixed_mut_color = "ddd"
- punchstunthreshold = 9 //60% chance, from 40%
- meat = /obj/item/stack/ore/silver
- info_text = "As a Silver Golem, your attacks have a higher chance of stunning. Being made of silver, your body is immune to most types of magic."
- prefix = "Silver"
- special_names = list("Surfer", "Chariot", "Lining")
-
-/datum/species/golem/silver/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
-
-/datum/species/golem/silver/on_species_loss(mob/living/carbon/C)
- REMOVE_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
- ..()
-
-//Harder to stun, deals more damage, massively slowpokes, but gravproof and obstructive. Basically, The Wall.
-/datum/species/golem/plasteel
- name = "Plasteel Golem"
- id = "plasteel golem"
- fixed_mut_color = "bbb"
- stunmod = 0.4
- punchdamagelow = 12
- punchdamagehigh = 21
- punchstunthreshold = 18 //still 40% stun chance
- speedmod = 4 //pretty fucking slow
- meat = /obj/item/stack/ore/iron
- info_text = "As a Plasteel Golem, you are slower, but harder to stun, and hit very hard when punching. You also magnetically attach to surfaces and so don't float without gravity and cannot have positions swapped with other beings."
- attack_verb = "smash"
- attack_sound = 'sound/effects/meteorimpact.ogg' //hits pretty hard
- prefix = "Plasteel"
- special_names = null
-
-/datum/species/golem/plasteel/negates_gravity(mob/living/carbon/human/H)
- return TRUE
-
-/datum/species/golem/plasteel/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- ADD_TRAIT(C, TRAIT_NOMOBSWAP, SPECIES_TRAIT) //THE WALL THE WALL THE WALL
-
-/datum/species/golem/plasteel/on_species_loss(mob/living/carbon/C)
- REMOVE_TRAIT(C, TRAIT_NOMOBSWAP, SPECIES_TRAIT) //NOTHING ON ERF CAN MAKE IT FALL
- ..()
-
-//Immune to ash storms
-/datum/species/golem/titanium
- name = "Titanium Golem"
- id = "titanium golem"
- fixed_mut_color = "fff"
- meat = /obj/item/stack/ore/titanium
- info_text = "As a Titanium Golem, you are immune to ash storms, and slightly more resistant to burn damage."
- burnmod = 0.9
- prefix = "Titanium"
- special_names = list("Dioxide")
-
-/datum/species/golem/titanium/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- . = ..()
- C.weather_immunities |= "ash"
-
-/datum/species/golem/titanium/on_species_loss(mob/living/carbon/C)
- . = ..()
- C.weather_immunities -= "ash"
-
-//Immune to ash storms and lava
-/datum/species/golem/plastitanium
- name = "Plastitanium Golem"
- id = "plastitanium golem"
- fixed_mut_color = "888"
- meat = /obj/item/stack/ore/titanium
- info_text = "As a Plastitanium Golem, you are immune to both ash storms and lava, and slightly more resistant to burn damage."
- burnmod = 0.8
- prefix = "Plastitanium"
- special_names = null
-
-/datum/species/golem/plastitanium/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- . = ..()
- C.weather_immunities |= "lava"
- C.weather_immunities |= "ash"
-
-/datum/species/golem/plastitanium/on_species_loss(mob/living/carbon/C)
- . = ..()
- C.weather_immunities -= "ash"
- C.weather_immunities -= "lava"
-
-//Fast and regenerates... but can only speak like an abductor
-/datum/species/golem/alloy
- name = "Alien Alloy Golem"
- id = "alloy golem"
- fixed_mut_color = "333"
- meat = /obj/item/stack/sheet/mineral/abductor
- mutanttongue = /obj/item/organ/tongue/abductor
- speedmod = 1 //faster
- info_text = "As an Alloy Golem, you are made of advanced alien materials: you are faster and regenerate over time. You are, however, only able to be heard by other alloy golems."
- prefix = "Alien"
- special_names = list("Outsider", "Technology", "Watcher", "Stranger") //ominous and unknown
-
- species_chest = /obj/item/bodypart/chest/golem/alloy
- species_head = /obj/item/bodypart/head/golem/alloy
- species_l_arm = /obj/item/bodypart/l_arm/golem/alloy
- species_r_arm = /obj/item/bodypart/r_arm/golem/alloy
- species_l_leg = /obj/item/bodypart/leg/left/golem/alloy
- species_r_leg = /obj/item/bodypart/leg/right/golem/alloy
-
-//Regenerates because self-repairing super-advanced alien tech
-/datum/species/golem/alloy/spec_life(mob/living/carbon/human/H)
- if(H.stat == DEAD)
- return
- H.heal_overall_damage(2,2, 0, BODYTYPE_ORGANIC)
- H.adjustToxLoss(-2)
- H.adjustOxyLoss(-2)
-
-//Since this will usually be created from a collaboration between podpeople and free golems, wood golems are a mix between the two races
-/datum/species/golem/wood
- name = "Wood Golem"
- id = "wood golem"
- fixed_mut_color = "9E704B"
- meat = /obj/item/stack/sheet/mineral/wood
- //Can burn and take damage from heat
- inherent_traits = list(TRAIT_NOBREATH, TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
- armor = 30
- burnmod = 1.25
- heatmod = 1.5
- info_text = "As a Wooden Golem, you have plant-like traits: you take damage from extreme temperatures, can be set on fire, and have lower armor than a normal golem. You regenerate when in the light and wither in the darkness."
- prefix = "Wooden"
- special_names = list("Bark", "Willow", "Catalpa", "Woody", "Oak", "Sap", "Twig", "Branch", "Maple", "Birch", "Elm", "Basswood", "Cottonwood", "Larch", "Aspen", "Ash", "Beech", "Buckeye", "Cedar", "Chestnut", "Cypress", "Fir", "Hawthorn", "Hazel", "Hickory", "Ironwood", "Juniper", "Leaf", "Mangrove", "Palm", "Pawpaw", "Pine", "Poplar", "Redwood", "Redbud", "Sassafras", "Spruce", "Sumac", "Trunk", "Walnut", "Yew")
- human_surname_chance = 0
- special_name_chance = 100
- inherent_factions = list("plants", "vines")
-
-/datum/species/golem/wood/spec_life(mob/living/carbon/human/H)
- if(H.stat == DEAD)
- return
- var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
- if(isturf(H.loc)) //else, there's considered to be no light
- var/turf/T = H.loc
- light_amount = min(1,T.get_lumcount()) - 0.5
- H.adjust_nutrition(light_amount * 10)
- if(H.nutrition > NUTRITION_LEVEL_ALMOST_FULL)
- H.set_nutrition(NUTRITION_LEVEL_ALMOST_FULL)
- if(light_amount > 0.2) //if there's enough light, heal
- H.heal_overall_damage(1,1,0, BODYPART_ORGANIC)
- H.adjustToxLoss(-1)
- H.adjustOxyLoss(-1)
-
- if(H.nutrition < NUTRITION_LEVEL_STARVING + 50)
- H.take_overall_damage(2,0)
-
-/datum/species/golem/wood/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
- if(chem.type == /datum/reagent/toxin/plantbgone)
- H.adjustToxLoss(3)
- H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM)
- return TRUE
- return ..()
-
-//Radioactive
-/datum/species/golem/uranium
- name = "Uranium Golem"
- id = "uranium golem"
- fixed_mut_color = "7f0"
- meat = /obj/item/stack/ore/uranium
- info_text = "As an Uranium Golem, you emit radiation pulses every once in a while. It won't harm fellow golems, but organic lifeforms will be affected."
-
- var/last_event = 0
- var/active = null
- prefix = "Uranium"
- special_names = list("Oxide", "Rod", "Meltdown", "235")
-
-/datum/species/golem/uranium/spec_life(mob/living/carbon/human/H)
- if(!active)
- if(world.time > last_event+30)
- active = 1
- radiation_pulse(H, 50)
- last_event = world.time
- active = null
- ..()
-
-//Immune to physical bullets and resistant to brute, but very vulnerable to burn damage. Dusts on death.
-/datum/species/golem/sand
- name = "Sand Golem"
- id = "sand golem"
- fixed_mut_color = "ffdc8f"
- meat = /obj/item/stack/ore/glass //this is sand
- armor = 0
- burnmod = 3 //melts easily
- brutemod = 0.25
- info_text = "As a Sand Golem, you are immune to physical bullets and take very little brute damage, but are extremely vulnerable to burn damage and energy weapons. You will also turn to sand when dying, preventing any form of recovery."
- attack_sound = 'sound/effects/shovel_dig.ogg'
- prefix = "Sand"
- special_names = list("Castle", "Bag", "Dune", "Worm", "Storm")
-
-/datum/species/golem/sand/spec_death(gibbed, mob/living/carbon/human/H)
- H.visible_message("[H] turns into a pile of sand!")
- for(var/obj/item/W in H)
- H.dropItemToGround(W)
- for(var/i=1, i <= rand(3,5), i++)
- new /obj/item/stack/ore/glass(get_turf(H))
- qdel(H)
-
-/datum/species/golem/sand/bullet_act(obj/projectile/P, mob/living/carbon/human/H)
- if(!(P.original == H && P.firer == H))
- if(P.flag == "bullet" || P.flag == "bomb")
- playsound(H, 'sound/effects/shovel_dig.ogg', 70, TRUE)
- H.visible_message("The [P.name] sinks harmlessly in [H]'s sandy body!", \
- "The [P.name] sinks harmlessly in [H]'s sandy body!")
- return BULLET_ACT_BLOCK
- return ..()
-
-//Reflects lasers and resistant to burn damage, but very vulnerable to brute damage. Shatters on death.
-/datum/species/golem/glass
- name = "Glass Golem"
- id = "glass golem"
- fixed_mut_color = "5a96b4aa" //transparent body
- meat = /obj/item/shard
- armor = 0
- brutemod = 3 //very fragile
- burnmod = 0.25
- info_text = "As a Glass Golem, you reflect lasers and energy weapons, and are very resistant to burn damage. However, you are extremely vulnerable to brute damage. On death, you'll shatter beyond any hope of recovery."
- attack_sound = 'sound/effects/glassbr2.ogg'
- prefix = "Glass"
- special_names = list("Lens", "Prism", "Fiber", "Bead")
-
-/datum/species/golem/glass/spec_death(gibbed, mob/living/carbon/human/H)
- playsound(H, "shatter", 70, TRUE)
- H.visible_message("[H] shatters!")
- for(var/obj/item/W in H)
- H.dropItemToGround(W)
- for(var/i=1, i <= rand(3,5), i++)
- new /obj/item/shard(get_turf(H))
- qdel(H)
-
-/datum/species/golem/glass/bullet_act(obj/projectile/P, mob/living/carbon/human/H)
- if(!(P.original == H && P.firer == H)) //self-shots don't reflect
- if(P.flag == "laser" || P.flag == "energy")
- H.visible_message("The [P.name] gets reflected by [H]'s glass skin!", \
- "The [P.name] gets reflected by [H]'s glass skin!")
- if(P.starting)
- var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
- var/new_y = P.starting.y + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
- // redirect the projectile
- P.firer = H
- P.preparePixelProjectile(locate(clamp(new_x, 1, world.maxx), clamp(new_y, 1, world.maxy), H.z), H)
- return BULLET_ACT_FORCE_PIERCE
- return ..()
-
-//Teleports when hit or when it wants to
-/datum/species/golem/bluespace
- name = "Bluespace Golem"
- id = "bluespace golem"
- fixed_mut_color = "33f"
- meat = /obj/item/stack/ore/bluespace_crystal
- info_text = "As a Bluespace Golem, you are spatially unstable: You will teleport when hit, and you can teleport manually at a long distance."
- attack_verb = "bluespace punch"
- attack_sound = 'sound/effects/phasein.ogg'
- prefix = "Bluespace"
- special_names = list("Crystal", "Polycrystal")
-
- var/datum/action/innate/unstable_teleport/unstable_teleport
- var/teleport_cooldown = 100
- var/last_teleport = 0
-
-/datum/species/golem/bluespace/proc/reactive_teleport(mob/living/carbon/human/H)
- H.visible_message("[H] teleports!", "You destabilize and teleport!")
- new /obj/effect/particle_effect/sparks(get_turf(H))
- playsound(get_turf(H), "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- do_teleport(H, get_turf(H), 6, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
- last_teleport = world.time
-
-/datum/species/golem/bluespace/spec_hitby(atom/movable/AM, mob/living/carbon/human/H)
- ..()
- var/obj/item/I
- if(istype(AM, /obj/item))
- I = AM
- if(I.thrownby == WEAKREF(H)) //No throwing stuff at yourself to trigger the teleport
- return 0
- else
- reactive_teleport(H)
-
-/datum/species/golem/bluespace/spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style)
- ..()
- if(world.time > last_teleport + teleport_cooldown && M != H && M.a_intent != INTENT_HELP)
- reactive_teleport(H)
-
-/datum/species/golem/bluespace/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H)
- ..()
- if(world.time > last_teleport + teleport_cooldown && user != H)
- reactive_teleport(H)
-
-/datum/species/golem/bluespace/on_hit(obj/projectile/P, mob/living/carbon/human/H)
- ..()
- if(world.time > last_teleport + teleport_cooldown)
- reactive_teleport(H)
-
-/datum/species/golem/bluespace/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- if(ishuman(C))
- unstable_teleport = new
- unstable_teleport.Grant(C)
- last_teleport = world.time
-
-/datum/species/golem/bluespace/on_species_loss(mob/living/carbon/C)
- if(unstable_teleport)
- unstable_teleport.Remove(C)
- ..()
-
-/datum/action/innate/unstable_teleport
- name = "Unstable Teleport"
- check_flags = AB_CHECK_CONSCIOUS
- button_icon_state = "jaunt"
- icon_icon = 'icons/mob/actions/actions_spells.dmi'
- var/cooldown = 150
- var/last_teleport = 0
-
-/datum/action/innate/unstable_teleport/IsAvailable()
- if(..())
- if(world.time > last_teleport + cooldown)
- return 1
- return 0
-
-/datum/action/innate/unstable_teleport/Activate()
- var/mob/living/carbon/human/H = owner
- H.visible_message("[H] starts vibrating!", "You start charging your bluespace core...")
- playsound(get_turf(H), 'sound/weapons/flash.ogg', 25, TRUE)
- addtimer(CALLBACK(src, PROC_REF(teleport), H), 15)
-
-/datum/action/innate/unstable_teleport/proc/teleport(mob/living/carbon/human/H)
- H.visible_message("[H] disappears in a shower of sparks!", "You teleport!")
- var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread
- spark_system.set_up(10, 0, src)
- spark_system.attach(H)
- spark_system.start()
- do_teleport(H, get_turf(H), 12, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
- last_teleport = world.time
- UpdateButtonIcon() //action icon looks unavailable
- //action icon looks available again
- addtimer(CALLBACK(src, PROC_REF(UpdateButtonIcon)), cooldown + 5)
-
-
-//honk
-/datum/species/golem/bananium
- name = "Bananium Golem"
- id = "bananium golem"
- fixed_mut_color = "ff0"
- punchdamagelow = 0
- punchdamagehigh = 1
- punchstunthreshold = 2 //Harmless and can't stun
- meat = /obj/item/stack/ore/bananium
- info_text = "As a Bananium Golem, you are made for pranking. Your body emits natural honks, and you can barely even hurt people when punching them. Your skin also bleeds banana peels when damaged."
- attack_verb = "honk"
- attack_sound = 'sound/items/airhorn2.ogg'
- prefix = "Bananium"
- special_names = null
- mutanttongue = /obj/item/organ/tongue/golem_honk
-
- species_chest = /obj/item/bodypart/chest/golem/bananium
- species_head = /obj/item/bodypart/head/golem/bananium
- species_l_arm = /obj/item/bodypart/l_arm/golem/bananium
- species_r_arm = /obj/item/bodypart/r_arm/golem/bananium
- species_l_leg = /obj/item/bodypart/leg/left/golem/bananium
- species_r_leg = /obj/item/bodypart/leg/right/golem/bananium
-
- var/last_honk = 0
- var/honkooldown = 0
- var/last_banana = 0
- var/banana_cooldown = 100
- var/active = null
-
-/datum/species/golem/bananium/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- last_banana = world.time
- last_honk = world.time
- RegisterSignal(C, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-
-/datum/species/golem/bananium/on_species_loss(mob/living/carbon/C)
- . = ..()
- UnregisterSignal(C, COMSIG_MOB_SAY)
-
-/datum/species/golem/bananium/random_name(gender,unique,lastname)
- var/clown_name = pick(GLOB.clown_names)
- var/golem_name = "[uppertext(clown_name)]"
- return golem_name
-
-/datum/species/golem/bananium/spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style)
- ..()
- if(world.time > last_banana + banana_cooldown && M != H && M.a_intent != INTENT_HELP)
- new/obj/item/grown/bananapeel/specialpeel(get_turf(H))
- last_banana = world.time
-
-/datum/species/golem/bananium/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H)
- ..()
- if(world.time > last_banana + banana_cooldown && user != H)
- new/obj/item/grown/bananapeel/specialpeel(get_turf(H))
- last_banana = world.time
-
-/datum/species/golem/bananium/on_hit(obj/projectile/P, mob/living/carbon/human/H)
- ..()
- if(world.time > last_banana + banana_cooldown)
- new/obj/item/grown/bananapeel/specialpeel(get_turf(H))
- last_banana = world.time
-
-/datum/species/golem/bananium/spec_hitby(atom/movable/AM, mob/living/carbon/human/H)
- ..()
- var/obj/item/I
- if(istype(AM, /obj/item))
- I = AM
- if(I.thrownby == WEAKREF(H)) //No throwing stuff at yourself to make bananas
- return 0
- else
- new/obj/item/grown/bananapeel/specialpeel(get_turf(H))
- last_banana = world.time
-
-/datum/species/golem/bananium/spec_life(mob/living/carbon/human/H)
- if(!active)
- if(world.time > last_honk + honkooldown)
- active = 1
- playsound(get_turf(H), 'sound/items/bikehorn.ogg', 50, TRUE)
- last_honk = world.time
- honkooldown = rand(20, 80)
- active = null
- ..()
-
-/datum/species/golem/bananium/spec_death(gibbed, mob/living/carbon/human/H)
- playsound(get_turf(H), 'sound/misc/sadtrombone.ogg', 70, FALSE)
-
-/datum/species/golem/bananium/proc/handle_speech(datum/source, list/speech_args)
- speech_args[SPEECH_SPANS] |= SPAN_CLOWN
-
-/datum/species/golem/runic
- name = "Runic Golem"
- id = "cult_golem"
- sexes = FALSE
- info_text = "As a Runic Golem, you possess eldritch powers granted by the Elder Goddess Nar'Sie."
- species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES) //no mutcolors
- inherent_traits = list(TRAIT_NOFLASH,TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
- inherent_biotypes = MOB_HUMANOID|MOB_MINERAL
- prefix = "Runic"
- special_names = null
- inherent_factions = list("cult")
- species_language_holder = /datum/language_holder/golem/runic
- random_eligible = FALSE //Zesko claims runic golems break the game
-
- var/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/golem/phase_shift
- var/obj/effect/proc_holder/spell/pointed/abyssal_gaze/abyssal_gaze
- var/obj/effect/proc_holder/spell/pointed/dominate/dominate
-
- species_chest = /obj/item/bodypart/chest/golem/cult
- species_head = /obj/item/bodypart/head/golem/cult
- species_l_arm = /obj/item/bodypart/l_arm/golem/cult
- species_r_arm = /obj/item/bodypart/r_arm/golem/cult
- species_l_leg = /obj/item/bodypart/leg/left/golem/cult
- species_r_leg = /obj/item/bodypart/leg/right/golem/cult
-
-/datum/species/golem/runic/random_name(gender,unique,lastname)
- var/edgy_first_name = pick("Razor","Blood","Dark","Evil","Cold","Pale","Black","Silent","Chaos","Deadly","Coldsteel")
- var/edgy_last_name = pick("Edge","Night","Death","Razor","Blade","Steel","Calamity","Twilight","Shadow","Nightmare") //dammit Razor Razor
- var/golem_name = "[edgy_first_name] [edgy_last_name]"
- return golem_name
-
-/datum/species/golem/runic/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- . = ..()
- phase_shift = new
- phase_shift.charge_counter = 0
- C.AddSpell(phase_shift)
- abyssal_gaze = new
- abyssal_gaze.charge_counter = 0
- C.AddSpell(abyssal_gaze)
- dominate = new
- dominate.charge_counter = 0
- C.AddSpell(dominate)
-
-/datum/species/golem/runic/on_species_loss(mob/living/carbon/C)
- . = ..()
- if(phase_shift)
- C.RemoveSpell(phase_shift)
- if(abyssal_gaze)
- C.RemoveSpell(abyssal_gaze)
- if(dominate)
- C.RemoveSpell(dominate)
-
-/datum/species/golem/runic/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
- if(chem.type == /datum/reagent/water/holywater)
- H.adjustFireLoss(4)
- H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM)
-
- if(chem.type == /datum/reagent/fuel/unholywater)
- H.adjustBruteLoss(-4)
- H.adjustFireLoss(-4)
- H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM)
- return ..()
-
-/datum/species/golem/cloth
- name = "Cloth Golem"
- id = "cloth golem"
- sexes = FALSE
- info_text = "As a Cloth Golem, you are able to reform yourself after death, provided your remains aren't burned or destroyed. You are, of course, very flammable. \
- Being made of cloth, your body is magic resistant and faster than that of other golems, but weaker and less resilient."
- species_traits = list(NOBLOOD,NO_UNDERWEAR) //no mutcolors, and can burn
- inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_NOBREATH,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_CHUNKYFINGERS)
- inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID
- armor = 15 //feels no pain, but not too resistant
- burnmod = 2 // don't get burned
- speedmod = 1 // not as heavy as stone
- punchdamagelow = 4
- punchstunthreshold = 7
- punchdamagehigh = 8 // not as heavy as stone
- prefix = "Cloth"
- special_names = null
-
- species_chest = /obj/item/bodypart/chest/golem/cloth
- species_head = /obj/item/bodypart/head/golem/cloth
- species_l_arm = /obj/item/bodypart/l_arm/golem/cloth
- species_r_arm = /obj/item/bodypart/r_arm/golem/cloth
- species_l_leg = /obj/item/bodypart/leg/left/golem/cloth
- species_r_leg = /obj/item/bodypart/leg/right/golem/cloth
-
-/datum/species/golem/cloth/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
-
-/datum/species/golem/cloth/on_species_loss(mob/living/carbon/C)
- REMOVE_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
- ..()
-
-/datum/species/golem/cloth/random_name(gender,unique,lastname)
- var/pharaoh_name = pick("Neferkare", "Hudjefa", "Khufu", "Mentuhotep", "Ahmose", "Amenhotep", "Thutmose", "Hatshepsut", "Tutankhamun", "Ramses", "Seti", \
- "Merenptah", "Djer", "Semerkhet", "Nynetjer", "Khafre", "Pepi", "Intef", "Ay") //yes, Ay was an actual pharaoh
- var/golem_name = "[pharaoh_name] \Roman[rand(1,99)]"
- return golem_name
-
-/datum/species/golem/cloth/spec_life(mob/living/carbon/human/H)
- if(H.fire_stacks < 1)
- H.adjust_fire_stacks(1) //always prone to burning
- ..()
-
-/datum/species/golem/cloth/spec_death(gibbed, mob/living/carbon/human/H)
- if(gibbed)
- return
- if(H.on_fire)
- H.visible_message("[H] burns into ash!")
- H.dust(just_ash = TRUE)
- return
-
- H.visible_message("[H] falls apart into a pile of bandages!")
- new /obj/structure/cloth_pile(get_turf(H), H)
- ..()
-
-/obj/structure/cloth_pile
- name = "pile of bandages"
- desc = "It emits a strange aura, as if there was still life within it..."
- max_integrity = 50
- armor = list("melee" = 90, "bullet" = 90, "laser" = 25, "energy" = 80, "bomb" = 50, "bio" = 100, "fire" = -50, "acid" = -50)
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "pile_bandages"
- resistance_flags = FLAMMABLE
-
- var/revive_time = 900
- var/mob/living/carbon/human/cloth_golem
-
-/obj/structure/cloth_pile/Initialize(mapload, mob/living/carbon/human/H)
- . = ..()
- if(!QDELETED(H) && is_species(H, /datum/species/golem/cloth))
- H.unequip_everything()
- H.forceMove(src)
- cloth_golem = H
- to_chat(cloth_golem, "You start gathering your life energy, preparing to rise again...")
- addtimer(CALLBACK(src, PROC_REF(revive)), revive_time)
- else
- return INITIALIZE_HINT_QDEL
-
-/obj/structure/cloth_pile/Destroy()
- if(cloth_golem)
- QDEL_NULL(cloth_golem)
- return ..()
-
-/obj/structure/cloth_pile/burn()
- visible_message("[src] burns into ash!")
- new /obj/effect/decal/cleanable/ash(get_turf(src))
- ..()
-
-/obj/structure/cloth_pile/proc/revive(full_heal = FALSE, admin_revive = FALSE)
- if(QDELETED(src) || QDELETED(cloth_golem)) //QDELETED also checks for null, so if no cloth golem is set this won't runtime
- return
- if(cloth_golem.hellbound)
- QDEL_NULL(cloth_golem)
- return
-
- invisibility = INVISIBILITY_MAXIMUM //disappear before the animation
- new /obj/effect/temp_visual/mummy_animation(get_turf(src))
- if(cloth_golem.revive(full_heal = TRUE, admin_revive = TRUE))
- cloth_golem.grab_ghost()
- sleep(20)
- cloth_golem.forceMove(get_turf(src))
- cloth_golem.visible_message("[src] rises and reforms into [cloth_golem]!","You reform into yourself!")
- cloth_golem = null
- qdel(src)
-
-/obj/structure/cloth_pile/attackby(obj/item/P, mob/living/carbon/human/user, params)
- . = ..()
-
- if(resistance_flags & ON_FIRE)
- return
-
- if(P.get_temperature())
- visible_message("[src] bursts into flames!")
- fire_act()
-
-/datum/species/golem/plastic
- name = "Plastic Golem"
- id = "plastic golem"
- prefix = "Plastic"
- special_names = list("Sheet", "Bag", "Bottle")
- fixed_mut_color = "fffa"
- info_text = "As a Plastic Golem, you are capable of ventcrawling and passing through plastic flaps as long as you are naked."
-
-/datum/species/golem/plastic/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- . = ..()
- C.ventcrawler = VENTCRAWLER_NUDE
-
-/datum/species/golem/plastic/on_species_loss(mob/living/carbon/C)
- . = ..()
- C.ventcrawler = initial(C.ventcrawler)
-
-/datum/species/golem/bronze
- name = "Bronze Golem"
- id = "bronze golem"
- prefix = "Bronze"
- special_names = list("Bell")
- fixed_mut_color = "cd7f32"
- info_text = "As a Bronze Golem, you are very resistant to loud noises, and make loud noises if something hard hits you, however this ability does hurt your hearing."
- special_step_sounds = list('sound/machines/clockcult/integration_cog_install.ogg', 'sound/magic/clockwork/fellowship_armory.ogg')
- mutantears = /obj/item/organ/ears/bronze
- var/last_gong_time = 0
- var/gong_cooldown = 150
-
-/datum/species/golem/bronze/bullet_act(obj/projectile/P, mob/living/carbon/human/H)
- if(!(world.time > last_gong_time + gong_cooldown))
- return ..()
- if(P.flag == "bullet" || P.flag == "bomb")
- gong(H)
- return ..()
-
-/datum/species/golem/bronze/spec_hitby(atom/movable/AM, mob/living/carbon/human/H)
- ..()
- if(world.time > last_gong_time + gong_cooldown)
- gong(H)
-
-/datum/species/golem/bronze/spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style)
- ..()
- if(world.time > last_gong_time + gong_cooldown && M.a_intent != INTENT_HELP)
- gong(H)
-
-/datum/species/golem/bronze/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H)
- ..()
- if(world.time > last_gong_time + gong_cooldown)
- gong(H)
-
-/datum/species/golem/bronze/on_hit(obj/projectile/P, mob/living/carbon/human/H)
- ..()
- if(world.time > last_gong_time + gong_cooldown)
- gong(H)
-
-/datum/species/golem/bronze/proc/gong(mob/living/carbon/human/H)
- last_gong_time = world.time
- for(var/mob/living/M in get_hearers_in_view(7,H))
- if(M.stat == DEAD) //F
- return
- if(M == H)
- H.show_message("You cringe with pain as your body rings around you!", MSG_AUDIBLE)
- H.playsound_local(H, 'sound/effects/gong.ogg', 100, TRUE)
- H.soundbang_act(2, 0, 100, 1)
- H.jitteriness += 7
- var/distance = max(0,get_dist(get_turf(H),get_turf(M)))
- switch(distance)
- if(0 to 1)
- M.show_message("GONG!", MSG_AUDIBLE)
- M.playsound_local(H, 'sound/effects/gong.ogg', 100, TRUE)
- M.soundbang_act(1, 0, 30, 3)
- M.confused += 10
- M.jitteriness += 4
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "gonged", /datum/mood_event/loud_gong)
- if(2 to 3)
- M.show_message("GONG!", MSG_AUDIBLE)
- M.playsound_local(H, 'sound/effects/gong.ogg', 75, TRUE)
- M.soundbang_act(1, 0, 15, 2)
- M.jitteriness += 3
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "gonged", /datum/mood_event/loud_gong)
- else
- M.show_message("GONG!", MSG_AUDIBLE)
- M.playsound_local(H, 'sound/effects/gong.ogg', 50, TRUE)
-
-
-/datum/species/golem/cardboard //Faster but weaker, can also make new shells on its own
- name = "Cardboard Golem"
- id = "cardboard golem"
- prefix = "Cardboard"
- special_names = list("Box")
- info_text = "As a Cardboard Golem, you aren't very strong, but you are a bit quicker and can easily create more brethren by using cardboard on yourself."
- species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES)
- inherent_traits = list(TRAIT_NOBREATH, TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER, TRAIT_NOFLASH)
- attack_verb = "whips"
- attack_sound = 'sound/weapons/whip.ogg'
- miss_sound = 'sound/weapons/etherealmiss.ogg'
- fixed_mut_color = null
- armor = 25
- burnmod = 1.25
- heatmod = 2
- speedmod = 1.5
- punchdamagelow = 4
- punchstunthreshold = 7
- punchdamagehigh = 8
- var/last_creation = 0
- var/brother_creation_cooldown = 300
-
- species_chest = /obj/item/bodypart/chest/golem/cardboard
- species_head = /obj/item/bodypart/head/golem/cardboard
- species_l_arm = /obj/item/bodypart/l_arm/golem/cardboard
- species_r_arm = /obj/item/bodypart/r_arm/golem/cardboard
- species_l_leg = /obj/item/bodypart/leg/left/golem/cardboard
- species_r_leg = /obj/item/bodypart/leg/right/golem/cardboard
-
-/datum/species/golem/cardboard/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H)
- . = ..()
- if(user != H)
- return FALSE //forced reproduction is rape.
- if(istype(I, /obj/item/stack/sheet/cardboard))
- var/obj/item/stack/sheet/cardboard/C = I
- if(last_creation + brother_creation_cooldown > world.time) //no cheesing dork
- return
- if(C.amount < 10)
- to_chat(H, "You do not have enough cardboard!")
- return FALSE
- to_chat(H, "You attempt to create a new cardboard brother.")
- if(do_after(user, 30, target = user))
- if(last_creation + brother_creation_cooldown > world.time) //no cheesing dork
- return
- if(!C.use(10))
- to_chat(H, "You do not have enough cardboard!")
- return FALSE
- to_chat(H, "You create a new cardboard golem shell.")
- create_brother(H.loc)
-
-/datum/species/golem/cardboard/proc/create_brother(location)
- new /obj/effect/mob_spawn/human/golem/servant(location, /datum/species/golem/cardboard, owner)
- last_creation = world.time
-
-/datum/species/golem/leather
- name = "Leather Golem"
- id = "leather golem"
- special_names = list("Face", "Man", "Belt") //Ah dude 4 strength 4 stam leather belt AHHH
- inherent_traits = list(TRAIT_NOBREATH, TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER, TRAIT_STRONG_GRABBER)
- prefix = "Leather"
- fixed_mut_color = "624a2e"
- info_text = "As a Leather Golem, you are flammable, but you can grab things with incredible ease, allowing all your grabs to start at a strong level."
- grab_sound = 'sound/weapons/whipgrab.ogg'
- attack_sound = 'sound/weapons/whip.ogg'
-
-/datum/species/golem/durathread
- name = "Durathread Golem"
- id = "durathread golem"
- prefix = "Durathread"
- special_names = list("Boll","Weave")
- species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES)
- fixed_mut_color = null
- inherent_traits = list(TRAIT_NOBREATH, TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER, TRAIT_NOFLASH)
- info_text = "As a Durathread Golem, your strikes will cause those your targets to start choking, but your woven body won't withstand fire as well."
-
- species_head = /obj/item/bodypart/head/golem/durathread
- species_l_arm = /obj/item/bodypart/l_arm/golem/durathread
- species_r_arm = /obj/item/bodypart/r_arm/golem/durathread
- species_l_leg = /obj/item/bodypart/leg/left/golem/durathread
- species_r_leg = /obj/item/bodypart/leg/right/golem/durathread
-
-/datum/species/golem/durathread/spec_unarmedattacked(mob/living/carbon/human/user, mob/living/carbon/human/target)
- . = ..()
- target.apply_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
-
-/datum/species/golem/bone
- name = "Bone Golem"
- id = "bone golem"
- prefix = "Bone"
- special_names = list("Head", "Broth", "Fracture", "Rattler", "Appetit")
- liked_food = GROSS | MEAT | RAW
- toxic_food = null
- species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES)
- inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID
- mutanttongue = /obj/item/organ/tongue/bone
- sexes = FALSE
- fixed_mut_color = null
- inherent_traits = list(TRAIT_NOFLASH,TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_FAKEDEATH)
- species_language_holder = /datum/language_holder/golem/bone
- info_text = "As a Bone Golem, You have a powerful spell that lets you chill your enemies with fear, and milk heals you! Just make sure to watch our for bone-hurting juice."
- var/datum/action/innate/bonechill/bonechill
-
- species_chest = /obj/item/bodypart/chest/golem/bone
- species_head = /obj/item/bodypart/head/golem/bone
- species_l_arm = /obj/item/bodypart/l_arm/golem/bone
- species_r_arm = /obj/item/bodypart/r_arm/golem/bone
- species_l_leg = /obj/item/bodypart/leg/left/golem/bone
- species_r_leg = /obj/item/bodypart/leg/right/golem/bone
-
-/datum/species/golem/bone/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- if(ishuman(C))
- bonechill = new
- bonechill.Grant(C)
-
-/datum/species/golem/bone/on_species_loss(mob/living/carbon/C)
- if(bonechill)
- bonechill.Remove(C)
- ..()
-
-/datum/species/golem/bone/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
- if(chem.type == /datum/reagent/consumable/milk)
- if(chem.volume > 10)
- H.reagents.remove_reagent(chem.type, chem.volume - 10)
- to_chat(H, "The excess milk is dripping off your bones!")
- H.heal_bodypart_damage(1.5,0, 0)
- H.reagents.remove_reagent(chem.type, chem.metabolization_rate)
- return TRUE
- if(chem.type == /datum/reagent/toxin/bonehurtingjuice)
- H.adjustStaminaLoss(7.5, 0)
- H.adjustBruteLoss(0.5, 0)
- if(prob(20))
- switch(rand(1, 3))
- if(1)
- H.say(pick("oof.", "ouch.", "my bones.", "oof ouch.", "oof ouch my bones."), forced = /datum/reagent/toxin/bonehurtingjuice)
- if(2)
- H.manual_emote(pick("oofs silently.", "looks like their bones hurt.", "grimaces, as though their bones hurt."))
- if(3)
- to_chat(H, "Your bones hurt!")
- if(chem.overdosed)
- if(prob(4) && iscarbon(H)) //big oof
- var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly.
- var/obj/item/bodypart/bp = H.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood
- if(bp)
- playsound(H, get_sfx("desceration"), 50, TRUE, -1) //You just want to socialize
- H.visible_message("[H] rattles loudly and flails around!!", "Your bones hurt so much that your missing muscles spasm!!")
- H.say("OOF!!", forced=/datum/reagent/toxin/bonehurtingjuice)
- bp.receive_damage(200, 0, 0) //But I don't think we should
- else
- to_chat(H, "Your missing arm aches from wherever you left it.")
- H.emote("sigh")
- H.reagents.remove_reagent(chem.type, chem.metabolization_rate)
- return TRUE
-
- return ..()
-
-/datum/action/innate/bonechill
- name = "Bone Chill"
- desc = "Rattle your bones and strike fear into your enemies!"
- check_flags = AB_CHECK_CONSCIOUS
- icon_icon = 'icons/mob/actions/actions_spells.dmi'
- button_icon_state = "bonechill"
- var/cooldown = 600
- var/last_use
- var/snas_chance = 3
-
-/datum/action/innate/bonechill/Activate()
- if(world.time < last_use + cooldown)
- to_chat("You aren't ready yet to rattle your bones again!")
- return
- owner.visible_message("[owner] rattles [owner.p_their()] bones harrowingly.", "You rattle your bones")
- last_use = world.time
- if(prob(snas_chance))
- playsound(get_turf(owner),'sound/magic/RATTLEMEBONES2.ogg', 100)
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- var/mutable_appearance/badtime = mutable_appearance('icons/mob/human_parts.dmi', "b_golem_eyes", -FIRE_LAYER-0.5)
- badtime.appearance_flags = RESET_COLOR
- H.overlays_standing[FIRE_LAYER+0.5] = badtime
- H.apply_overlay(FIRE_LAYER+0.5)
- addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon, remove_overlay), FIRE_LAYER+0.5), 25)
- else
- playsound(get_turf(owner),'sound/magic/RATTLEMEBONES.ogg', 100)
- for(var/mob/living/L in orange(7, get_turf(owner)))
- if((L.mob_biotypes & MOB_UNDEAD) || isgolem(L) || HAS_TRAIT(L, TRAIT_RESISTCOLD))
- return //Do not affect our brothers
-
- to_chat(L, "A spine-chilling sound chills you to the bone!")
- L.apply_status_effect(/datum/status_effect/bonechill)
- SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "spooked", /datum/mood_event/spooked)
-
-/datum/species/golem/snow
- name = "Snow Golem"
- id = "snow golem"
- fixed_mut_color = "null" //custom sprites
- armor = 45 //down from 55
- burnmod = 3 //melts easily
- info_text = "As a Snow Golem, you are extremely vulnerable to burn damage, but you can generate snowballs and shoot cryokinetic beams. You will also turn to snow when dying, preventing any form of recovery."
- prefix = "Snow"
- special_names = list("Flake", "Blizzard", "Storm")
- species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES) //no mutcolors, no eye sprites
- inherent_traits = list(TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOGUNS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
-
- var/obj/effect/proc_holder/spell/targeted/conjure_item/snowball/ball
- var/obj/effect/proc_holder/spell/aimed/cryo/cryo
-
- species_chest = /obj/item/bodypart/chest/golem/snow
- species_head = /obj/item/bodypart/head/golem/snow
- species_l_arm = /obj/item/bodypart/l_arm/golem/snow
- species_r_arm = /obj/item/bodypart/r_arm/golem/snow
- species_l_leg = /obj/item/bodypart/leg/left/golem/snow
- species_r_leg = /obj/item/bodypart/leg/right/golem/snow
-
-/datum/species/golem/snow/spec_death(gibbed, mob/living/carbon/human/H)
- H.visible_message("[H] turns into a pile of snow!")
- for(var/obj/item/W in H)
- H.dropItemToGround(W)
- for(var/i=1, i <= rand(3,5), i++)
- new /obj/item/stack/sheet/mineral/snow(get_turf(H))
- new /obj/item/reagent_containers/food/snacks/grown/carrot(get_turf(H))
- qdel(H)
-
-/datum/species/golem/snow/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- . = ..()
- C.weather_immunities |= "snow"
- ball = new
- ball.charge_counter = 0
- C.AddSpell(ball)
- cryo = new
- cryo.charge_counter = 0
- C.AddSpell(cryo)
-
-/datum/species/golem/snow/on_species_loss(mob/living/carbon/C)
- . = ..()
- C.weather_immunities -= "snow"
- if(ball)
- C.RemoveSpell(ball)
- if(cryo)
- C.RemoveSpell(cryo)
-
-/obj/effect/proc_holder/spell/targeted/conjure_item/snowball
- name = "Snowball"
- desc = "Concentrates cryokinetic forces to create snowballs, useful for throwing at people."
- item_type = /obj/item/toy/snowball
- charge_max = 15
- action_icon = 'icons/obj/toy.dmi'
- action_icon_state = "snowball"
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index d7d6754b0e5d..a0e409c2053d 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -571,7 +571,7 @@ There are several things that need to be remembered:
remove_overlay(LEGCUFF_LAYER)
clear_alert("legcuffed")
if(legcuffed)
- overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', "legcuff1", -LEGCUFF_LAYER)
+ overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', legcuffed.icon_state, -LEGCUFF_LAYER)
apply_overlay(LEGCUFF_LAYER)
throw_alert("legcuffed", /atom/movable/screen/alert/restrained/legcuffed, new_master = src.legcuffed)
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 d6b7c68bd958..bd09f06f3521 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -132,8 +132,6 @@ Difficulty: Very Hard
if(H.mind)
if(istype(H.mind.martial_art, /datum/martial_art/the_sleeping_carp))
. = TRUE
- if (is_species(H, /datum/species/golem/sand))
- . = TRUE
/mob/living/simple_animal/hostile/megafauna/colossus/proc/alternating_dir_shots()
ranged_cooldown = world.time + 40
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
index 1fa691b85de7..c078196749fc 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
@@ -328,7 +328,7 @@
for(var/mob/living/L in loc)
if((!QDELETED(spawner) && spawner.faction_check_mob(L)) || L.stat == DEAD)
continue
- visible_message("[src] grabs hold of [L]!")
+ visible_message("[src] wraps a mass of tentacles around [L]!")
on_hit(L)
latched = TRUE
if(!latched)
@@ -337,10 +337,11 @@
deltimer(timerid)
timerid = addtimer(CALLBACK(src, PROC_REF(retract)), 10, TIMER_STOPPABLE)
-/obj/effect/temp_visual/goliath_tentacle/proc/on_hit(mob/living/L)
- L.Stun(100)
- L.adjustBruteLoss(rand(10,15))
-
+/obj/effect/temp_visual/goliath_tentacle/proc/on_hit(mob/living/target)
+ target.apply_damage(rand(20,30), BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
+ if(iscarbon(target))
+ var/obj/item/restraints/legcuffs/beartrap/goliath/B = new /obj/item/restraints/legcuffs/beartrap/goliath(get_turf(target))
+ B.on_entered(src, target)
/obj/effect/temp_visual/goliath_tentacle/proc/retract()
icon_state = "marker"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index 1254b33c7341..474c9c5d9ca6 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -416,8 +416,7 @@
"Soldier" = 5,
"Oldminer" = 8,
"Kobold" = 5,
- "Golem" = 6,
- "SRM" = 10,
+ "SRM" = 6,
"Operative" = 5,
pick("Shadow", "YeOlde") = 4
)
@@ -797,119 +796,6 @@
r_pocket = /obj/item/kitchen/knife/combat/bone
if(prob(30))
l_pocket = /obj/item/kitchen/knife/combat/bone
- if("Golem")
- mob_species = pickweight(list(
- /datum/species/golem/adamantine = 5,
- /datum/species/golem/plasma = 10,
- /datum/species/golem/diamond = 10,
- /datum/species/golem/gold = 10,
- /datum/species/golem/silver = 10,
- /datum/species/golem/plasteel = 10,
- /datum/species/golem/titanium = 10,
- /datum/species/golem/plastitanium = 10
- )
- )
- if(prob(70))
- back = /obj/item/storage/backpack
- backpack_contents = list()
- if(prob(75))
- backpack_contents += pickweight(list(
- /obj/item/slime_extract/grey = 1,
- /obj/item/slime_scanner = 1,
- /obj/item/resonator/upgraded = 1,
- /obj/item/gps = 1,
- /obj/item/fulton_core = 2,
- /obj/item/extraction_pack = 3,
- /obj/item/stack/sheet/mineral/plasma/twenty = 3,
- /obj/item/stack/marker_beacon/ten = 3,
- /obj/item/mining_scanner = 2,
- /obj/item/extinguisher/mini = 3,
- /obj/item/flashlight/seclite=3,
- /obj/item/research_notes/loot/medium = 3,
- /obj/item/stack/sheet/metal/fifty = 3,
- /obj/item/research_notes/loot/big = 1
- )
- )
- if(prob(75))
- backpack_contents += pickweight(list(
- /obj/item/slime_extract/grey = 1,
- /obj/item/slime_scanner = 1,
- /obj/item/resonator/upgraded = 1,
- /obj/item/gps = 1,
- /obj/item/fulton_core = 2,
- /obj/item/extraction_pack = 3,
- /obj/item/stack/sheet/mineral/plasma/twenty = 3,
- /obj/item/stack/marker_beacon/ten = 3,
- /obj/item/mining_scanner = 2,
- /obj/item/extinguisher/mini = 3,
- /obj/item/flashlight/seclite=3,
- /obj/item/research_notes/loot/medium = 3,
- /obj/item/stack/sheet/metal/fifty = 3,
- /obj/item/research_notes/loot/big = 1
- )
- )
- if(prob(75))
- backpack_contents += pickweight(list(
- /obj/item/slime_extract/grey = 1,
- /obj/item/slime_scanner = 1,
- /obj/item/resonator/upgraded = 1,
- /obj/item/gps = 1,
- /obj/item/fulton_core = 2,
- /obj/item/extraction_pack = 3,
- /obj/item/stack/sheet/mineral/plasma/twenty = 3,
- /obj/item/stack/marker_beacon/ten = 3,
- /obj/item/mining_scanner = 2,
- /obj/item/extinguisher/mini = 3,
- /obj/item/flashlight/seclite=3,
- /obj/item/research_notes/loot/medium = 3,
- /obj/item/stack/sheet/metal/fifty = 3,
- /obj/item/research_notes/loot/big = 1
- )
- )
- if(prob(3))
- backpack_contents += list(
- /obj/item/storage/box/rndboards
- )
- if(prob(20))
- backpack_contents += pickweight(list(
- /obj/item/storage/box/stockparts/basic = 4,
- /obj/item/storage/box/stockparts/t2 = 3,
- /obj/item/storage/box/stockparts/t3 = 2,
- /obj/item/storage/box/stockparts/deluxe = 1
- )
- )
- if(prob(30))
- glasses = pickweight(list(
- /obj/item/clothing/glasses/meson = 2,
- /obj/item/clothing/glasses/hud/health = 2,
- /obj/item/clothing/glasses/hud/diagnostic =2,
- /obj/item/clothing/glasses/science = 2,
- /obj/item/clothing/glasses/welding = 2,
- /obj/item/clothing/glasses/night = 1
- )
- )
- if(prob(10))
- belt = pickweight(list(
- /obj/item/storage/belt/mining/vendor,
- /obj/item/storage/belt/utility/full
- )
- )
- if(prob(50))
- neck = /obj/item/bedsheet/rd/royal_cape
- if(prob(10))
- l_pocket = pickweight(list(
- /obj/item/crowbar/power,
- /obj/item/screwdriver/power,
- /obj/item/weldingtool/experimental
- )
- )
- if(prob(10))
- r_pocket = pickweight(list(
- /obj/item/crowbar/power,
- /obj/item/screwdriver/power,
- /obj/item/weldingtool/experimental
- )
- )
if("YeOlde")
mob_gender = FEMALE
uniform = /obj/item/clothing/under/costume/maid
diff --git a/code/modules/overmap/_overmap_datum.dm b/code/modules/overmap/_overmap_datum.dm
index 076188f6ec58..5244f2850188 100644
--- a/code/modules/overmap/_overmap_datum.dm
+++ b/code/modules/overmap/_overmap_datum.dm
@@ -222,7 +222,7 @@
if(!istype(dock_target))
CRASH("Overmap datum [src] tried to dock to an invalid overmap datum.")
if(docked_to)
- CRASH("Overmap datum [src] tried to dock to [docked_to] when it is already docked to another overmap datum.")
+ CRASH("Overmap datum [src] tried to dock to [dock_target] when it is already docked to another overmap datum ([docked_to])!.")
if(docking || current_docking_ticket)
return "Already docking!"
diff --git a/code/modules/overmap/objects/outpost/outpost_types.dm b/code/modules/overmap/objects/outpost/outpost_types.dm
index fb707213e5eb..670a916721ae 100644
--- a/code/modules/overmap/objects/outpost/outpost_types.dm
+++ b/code/modules/overmap/objects/outpost/outpost_types.dm
@@ -2,6 +2,13 @@
Map templates
*/
+/datum/map_template/outpost
+ // Necessary to stop planetary outposts from having space underneath all their turfs.
+ // They were being "placed on top", so instead of their baseturf, there was just space underneath.
+ // (Interestingly, this is much less of a problem for ruins: PlaceOnTop ignores the top closed turf in the baseturfs stack
+ // of the new tile, meaning that placing plating on top of a wall doesn't result in a wall underneath the plating.)
+ should_place_on_top = FALSE
+
/datum/map_template/outpost/New()
. = ..(path = "_maps/outpost/[name].dmm")
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index e6b09920de63..d17e12264706 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -41,20 +41,6 @@
var/last_projectile_params
-/obj/machinery/power/emitter/welded/Initialize()
- welded = TRUE
- return ..()
-
-/obj/machinery/power/emitter/ctf
- name = "Energy Cannon"
- active = TRUE
- active_power_usage = FALSE
- idle_power_usage = FALSE
- locked = TRUE
- req_access_txt = "100"
- welded = TRUE
- use_power = FALSE
-
/obj/machinery/power/emitter/Initialize()
. = ..()
RefreshParts()
@@ -371,6 +357,26 @@
if(user)
user.visible_message("[user.name] emags [src].", "You short out the lock.")
+/obj/machinery/power/emitter/ctf
+ name = "Energy Cannon"
+ active = TRUE
+ active_power_usage = FALSE
+ idle_power_usage = FALSE
+ locked = TRUE
+ req_access_txt = "100"
+ welded = TRUE
+ use_power = FALSE
+
+/obj/machinery/power/emitter/welded/Initialize()
+ welded = TRUE
+ return ..()
+
+/obj/machinery/power/emitter/welded/upgraded/Initialize()
+ . = ..()
+ component_parts = list()
+ component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null)
+ component_parts += new /obj/item/stock_parts/manipulator/femto(null)
+ RefreshParts()
/obj/machinery/power/emitter/prototype
name = "Prototype Emitter"
diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm
index cc92a758eba0..0c25c8a2282e 100644
--- a/code/modules/projectiles/boxes_magazines/external/pistol.dm
+++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm
@@ -28,7 +28,7 @@
/obj/item/ammo_box/magazine/m10mm/rubber
name = "pistol magazine (10mm rubber)"
desc = "An 8-round handgun magazine for the stechkin pistol. These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor."
- icon_state = "9x19pR"
+ icon_state = "9x19p"
ammo_type = /obj/item/ammo_casing/c10mm/rubber
/obj/item/ammo_box/magazine/m45
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index b250e23751d5..d6b9e05413a9 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -67,6 +67,7 @@
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ var/list/attachment_options = list() //This.. works for now.. gun refactor soon
var/obj/item/firing_pin/pin = /obj/item/firing_pin //standard firing pin for most guns
var/can_flashlight = FALSE //if a flashlight can be added or removed if it already has one.
@@ -545,33 +546,26 @@
return
if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return
- if((can_flashlight && gun_light) && (can_bayonet && bayonet)) //give them a choice instead of removing both
- var/list/possible_items = list(gun_light, bayonet)
- var/obj/item/item_to_remove = input(user, "Select an attachment to remove", "Attachment Removal") as null|obj in sortNames(possible_items)
- if(!item_to_remove || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
- return
- return remove_gun_attachment(user, I, item_to_remove)
-
- else if(gun_light && can_flashlight) //if it has a gun_light and can_flashlight is false, the flashlight is permanently attached.
+ attachment_options = list()
+ get_gun_attachments()
+ if(LAZYLEN(attachment_options) == 1)
+ remove_gun_attachments(user, I, attachment_options[1])
+ else if (LAZYLEN(attachment_options))
+ var/picked_option = show_radial_menu(user, src, attachment_options, radius = 38, require_near = TRUE)
+ remove_gun_attachments(user, I, picked_option)
+
+/obj/item/gun/proc/get_gun_attachments()
+ if(can_flashlight && gun_light)
+ attachment_options += list("Light" = image(icon = gun_light.icon, icon_state = gun_light.icon_state))
+ if(can_bayonet && bayonet)
+ attachment_options += list("Knife" = image(icon = bayonet.icon, icon_state = bayonet.icon_state))
+
+/obj/item/gun/proc/remove_gun_attachments(mob/living/user, obj/item/I, picked_option)
+ if(picked_option == "Light")
return remove_gun_attachment(user, I, gun_light, "unscrewed")
-
- else if(bayonet && can_bayonet) //if it has a bayonet, and the bayonet can be removed
+ else if(picked_option == "Knife")
return remove_gun_attachment(user, I, bayonet, "unfix")
- /*WS Edit - Fixes Pin Removal
- else if(pin && user.is_holding(src))
- user.visible_message("[user] attempts to remove [pin] from [src] with [I].",
- "You attempt to remove [pin] from [src]. (It will take [DisplayTimeText(FIRING_PIN_REMOVAL_DELAY)].)", null, 3)
- if(I.use_tool(src, user, FIRING_PIN_REMOVAL_DELAY, volume = 50))
- if(!pin) //check to see if the pin is still there, or we can spam messages by clicking multiple times during the tool delay
- return
- user.visible_message("[pin] is pried out of [src] by [user], destroying the pin in the process.",
- "You pry [pin] out with [I], destroying the pin in the process.", null, 3)
- QDEL_NULL(pin)
- return TRUE
- WS End */
-
-
/obj/item/gun/welder_act(mob/living/user, obj/item/I)
. = ..()
if(.)
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 7ba4a57bc057..229d49c4a8c6 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -128,27 +128,29 @@
to_chat(user, "You cannot seem to get \the [src] out of your hands!")
return FALSE
-/obj/item/gun/energy/proc/eject_cell(mob/user, obj/item/stock_parts/cell/gun/tac_load = null)
- playsound(src, load_sound, sound_volume, load_sound_vary)
- cell.forceMove(drop_location())
- var/obj/item/stock_parts/cell/gun/old_cell = cell
- /*if(insert_cell(user, tac_load))
- to_chat(user, "You perform a tactical reload on \the [src].")
- else
- to_chat(user, "You dropped the old cell, but the new one doesn't fit. How embarassing.")*/
- cell = null
- user.put_in_hands(old_cell)
- old_cell.update_appearance()
- to_chat(user, "You pull the cell out of \the [src].")
- update_appearance()
+/obj/item/gun/energy/proc/eject_cell(mob/user, obj/item/I)
+ to_chat(user, "You begin unscrewing and pulling out the cell...")
+ if(I.use_tool(src, user, unscrewing_time, volume=100))
+ to_chat(user, "You remove the power cell.")
+ playsound(src, load_sound, sound_volume, load_sound_vary)
+ cell.forceMove(drop_location())
+ var/obj/item/stock_parts/cell/gun/old_cell = cell
+ cell = null
+ user.put_in_hands(old_cell)
+ old_cell.update_appearance()
+ to_chat(user, "You pull the cell out of \the [src].")
+ update_appearance()
-/obj/item/gun/energy/screwdriver_act(mob/living/user, obj/item/I)
- if(cell && !internal_cell && !bayonet && (!gun_light || !can_flashlight))
- to_chat(user, "You begin unscrewing and pulling out the cell...")
- if(I.use_tool(src, user, unscrewing_time, volume=100))
- to_chat(user, "You remove the power cell.")
- eject_cell(user)
- return ..()
+/obj/item/gun/energy/get_gun_attachments()
+ if(cell && !internal_cell)
+ attachment_options += list("Cell" = image(icon = cell.icon, icon_state = cell.icon_state))
+ ..()
+
+/obj/item/gun/energy/remove_gun_attachments(mob/living/user, obj/item/I, picked_option)
+ if(picked_option == "Cell")
+ eject_cell(user, I)
+ return TRUE
+ ..()
/obj/item/gun/energy/can_shoot(visuals)
if(safety && !visuals)
@@ -226,8 +228,6 @@
. = ..()
if(!automatic_charge_overlays || QDELETED(src))
return
- if(cell)
- . += "[icon_state]_cell"
// Every time I see code this "flexible", a kitten fucking dies //it got worse
//todo: refactor this a bit to allow showing of charge on a gun's cell
var/overlay_icon_state = "[icon_state]_charge"
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 8a829153fcfd..5f39d407d749 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -49,11 +49,17 @@
/obj/item/gun/energy/kinetic_accelerator/crowbar_act(mob/living/user, obj/item/I)
. = TRUE
- if(modkits.len)
- to_chat(user, "You pry the modifications out.")
- I.play_tool_sound(src, 100)
+ if(LAZYLEN(modkits))
+ var/list/choose_options = list()
for(var/obj/item/borg/upgrade/modkit/M in modkits)
- M.uninstall(src)
+ choose_options += list(M.name = image(icon = M.icon, icon_state = M.icon_state))
+ var/picked_option = show_radial_menu(user, src, choose_options, radius = 38, require_near = TRUE)
+ if(picked_option)
+ to_chat(user, "You remove [picked_option].")
+ I.play_tool_sound(src, 100)
+ for(var/obj/item/borg/upgrade/modkit/M in modkits)
+ if(M.name == picked_option)
+ M.uninstall(src)
else
to_chat(user, "There are no modifications currently installed.")
diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
index 88ce3870e575..f781313bf582 100644
--- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
@@ -434,7 +434,7 @@ WS End*/
SEND_SIGNAL(carbies, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
if(HAS_TRAIT_FROM(M, TRAIT_HUSK, "burn") && carbies.getFireLoss() < THRESHOLD_UNHUSK && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/c2/instabitaluri) + reac_volume >= 100))
carbies.cure_husk("burn")
- carbies.visible_message("A rubbery liquid coats [carbies]'s burns. [carbies] looks a lot healthier!") //we're avoiding using the phrases "burnt flesh" and "burnt skin" here because carbies could be a skeleton or a golem or something
+ carbies.visible_message("A rubbery liquid coats [carbies]'s burns. [carbies] looks a lot healthier!") //we're avoiding using the phrases "burnt flesh" and "burnt skin" here because carbies could be a skeleton or something
..()
return TRUE
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 9915ca9c4d24..05d91f17fe47 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -637,14 +637,6 @@
return TRUE
return ..()
-/datum/reagent/mutationtoxin/golem
- name = "Golem Mutation Toxin"
- description = "A crystal toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/golem/random
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "rocks"
-
/datum/reagent/mutationtoxin/abductor
name = "Abductor Mutation Toxin"
description = "An alien toxin."
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index dca353500b42..735b232a6cd7 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -268,7 +268,7 @@
return
var/fill_name = fill_icon_state? fill_icon_state : icon_state
- var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "[fill_name][fill_icon_thresholds[1]]")
+ var/mutable_appearance/filling = mutable_appearance(fill_icon, "[fill_name][fill_icon_thresholds[1]]")
var/percent = round((reagents.total_volume / volume) * 100)
for(var/i in 1 to fill_icon_thresholds.len)
diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm
index 16bf2a9241cb..1f13dcd3b3b4 100644
--- a/code/modules/research/designs/limbgrower_designs.dm
+++ b/code/modules/research/designs/limbgrower_designs.dm
@@ -8,7 +8,7 @@
build_type = LIMBGROWER
reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
build_path = /obj/item/bodypart/l_arm
- category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_GOLEM,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
+ category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
/datum/design/rightarm
name = "Right Arm"
@@ -16,7 +16,7 @@
build_type = LIMBGROWER
reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
build_path = /obj/item/bodypart/r_arm
- category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_GOLEM,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
+ category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
/datum/design/leftleg
name = "Left Leg"
@@ -24,7 +24,7 @@
build_type = LIMBGROWER
reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
build_path = /obj/item/bodypart/leg/left
- category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_GOLEM,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
+ category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
/datum/design/rightleg
name = "Right Leg"
@@ -32,7 +32,7 @@
build_type = LIMBGROWER
reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
build_path = /obj/item/bodypart/leg/right
- category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_GOLEM,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
+ category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
/datum/design/digitigrade/leftleg
name = "Digitigrade Left Leg"
@@ -319,38 +319,6 @@
build_path = /obj/item/organ/stomach/fly
category = list("initial",SPECIES_FLYPERSON)
-/datum/design/golem_tongue
- name = "Golem Tongue"
- id = "golemtongue"
- build_type = LIMBGROWER
- reagents_list = list(/datum/reagent/medicine/synthflesh = 10)
- build_path = /obj/item/organ/tongue/golem_base
- category = list("initial",SPECIES_GOLEM)
-
-/datum/design/golem_vocal_chords
- name = "Adamantine Vocal Chords"
- id = "golemvocalchords"
- build_type = LIMBGROWER
- reagents_list = list(/datum/reagent/medicine/synthflesh = 20)
- build_path = /obj/item/organ/vocal_cords/adamantine
- category = list("initial",SPECIES_GOLEM)
-
-/datum/design/golem_resonator
- name = "Adamantine Resonator"
- id = "golemresonator"
- build_type = LIMBGROWER
- reagents_list = list(/datum/reagent/medicine/synthflesh = 20)
- build_path = /obj/item/organ/adamantine_resonator
- category = list("initial",SPECIES_GOLEM)
-
-/datum/design/golem_vocal_chords
- name = "Adamantine Vocal Chords"
- id = "golemvocalchords"
- build_type = LIMBGROWER
- reagents_list = list(/datum/reagent/medicine/synthflesh = 20)
- build_path = /obj/item/organ/vocal_cords/adamantine
- category = list("initial",SPECIES_GOLEM)
-
/datum/design/skeleton_tongue
name = "Skeleton... Tongue?"
id = "skeletontongue"
@@ -453,8 +421,6 @@
race = "Abductor"
if(SPECIES_FLYPERSON)
race = "Flyperson"
- if(SPECIES_GOLEM)
- race = "Golem"
if(SPECIES_POD)
race = "Phytosian"
if(SPECIES_SKELETON)
@@ -497,16 +463,6 @@
id = "limbdesign_fly"
build_path = /obj/item/disk/design_disk/limbs/fly
-/obj/item/disk/design_disk/limbs/golem
- name = "Golem Limb Design Disk"
- species = SPECIES_GOLEM
-
-/datum/design/limb_disk/golem
- name = "Golem Limb Design Disk"
- desc = "Contains designs for golem bodyparts and organs for the limbgrower."
- id = "limbdesign_golem"
- build_path = /obj/item/disk/design_disk/limbs/golem
-
/obj/item/disk/design_disk/limbs/pod
name = "Phytosian Limb Design Disk"
species = SPECIES_POD
diff --git a/code/modules/research/designs/mining_designs.dm b/code/modules/research/designs/mining_designs.dm
index cf4ba7b9fa41..2cddc5043c3f 100644
--- a/code/modules/research/designs/mining_designs.dm
+++ b/code/modules/research/designs/mining_designs.dm
@@ -120,3 +120,13 @@
build_path = /obj/item/borg/upgrade/modkit/aoe/turfs
category = list("Mining Designs", "Cyborg Upgrade Modules")
departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/weather_monitor
+ name = "Weather Radio"
+ desc = "A weather radio designed for use in inhospitable environments. Gives audible warnings when storms approach."
+ id = "weatherradio"
+ build_type = PROTOLATHE
+ materials = list(/datum/material/iron=75, /datum/material/glass=25)
+ build_path = /obj/item/radio/weather_monitor
+ category = list("Mining Designs")
+ departmental_flags = DEPARTMENTAL_FLAG_CARGO
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index f6694ce969bb..79009ed1fdf6 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -94,9 +94,9 @@
/datum/techweb_node/xenoorgan_biotech
id = "xenoorgan_bio"
display_name = "Xeno-organ Biology"
- description = "Phytosians, Golems, even Skeletons... We finally understand the less well known species enough to replicate their anatomy."
+ description = "Phytosians, even Skeletons... We finally understand the less well known species enough to replicate their anatomy."
prereq_ids = list("adv_biotech")
- design_ids = list("limbdesign_abductor", "limbdesign_fly", "limbdesign_golem", "limbdesign_pod", "limbdesign_skeleton", "limbdesign_snail")
+ design_ids = list("limbdesign_abductor", "limbdesign_fly", "limbdesign_pod", "limbdesign_skeleton", "limbdesign_snail")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -559,7 +559,7 @@
display_name = "Mining Technology"
description = "Better than Efficiency V."
prereq_ids = list("engineering", "basic_plasma")
- design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "ore_redemption", "mining_equipment_vendor", "cargoexpress", "plasmacutter", "mecha_kineticgun")//e a r l y g a m e)
+ design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "ore_redemption", "mining_equipment_vendor", "cargoexpress", "plasmacutter", "mecha_kineticgun", "weatherradio")//e a r l y g a m e)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm
index d44f1bd4ad8b..501ff548e08f 100644
--- a/code/modules/research/xenobiology/crossbreeding/charged.dm
+++ b/code/modules/research/xenobiology/crossbreeding/charged.dm
@@ -258,12 +258,7 @@ Charged extracts:
/obj/item/slimecross/charged/adamantine
colour = "adamantine"
- effect_desc = "Creates a completed golem shell."
-
-/obj/item/slimecross/charged/adamantine/do_effect(mob/user)
- user.visible_message("[src] produces a fully formed golem shell!")
- new /obj/effect/mob_spawn/human/golem/servant(get_turf(src), /datum/species/golem/adamantine, user)
- ..()
+ effect_desc = "Does nothing. Sorry :)"
/obj/item/slimecross/charged/rainbow
colour = "rainbow"
diff --git a/code/modules/research/xenobiology/crossbreeding/chilling.dm b/code/modules/research/xenobiology/crossbreeding/chilling.dm
index 085f8486ac32..89fa16cca7f5 100644
--- a/code/modules/research/xenobiology/crossbreeding/chilling.dm
+++ b/code/modules/research/xenobiology/crossbreeding/chilling.dm
@@ -290,14 +290,7 @@ Chilling extracts:
/obj/item/slimecross/chilling/black
colour = "black"
- effect_desc = "Transforsms the user into a random type of golem."
-
-/obj/item/slimecross/chilling/black/do_effect(mob/user)
- if(ishuman(user))
- user.visible_message("[src] crystallizes along [user]'s skin, turning into metallic scales!")
- var/mob/living/carbon/human/H = user
- H.set_species(/datum/species/golem/random)
- ..()
+ effect_desc = "Does nothing. :)"
/obj/item/slimecross/chilling/lightpink
colour = "light pink"
diff --git a/code/modules/research/xenobiology/crossbreeding/industrial.dm b/code/modules/research/xenobiology/crossbreeding/industrial.dm
index 6eead050c385..da9387883f0c 100644
--- a/code/modules/research/xenobiology/crossbreeding/industrial.dm
+++ b/code/modules/research/xenobiology/crossbreeding/industrial.dm
@@ -188,12 +188,6 @@ Industrial extracts:
plasmarequired = 3
itempath = /obj/item/storage/fancy/heart_box
-/obj/item/slimecross/industrial/adamantine
- colour = "adamantine"
- effect_desc = "Produces sheets of adamantine."
- plasmarequired = 10
- itempath = /obj/item/stack/sheet/mineral/adamantine
-
/obj/item/slimecross/industrial/rainbow
colour = "rainbow"
effect_desc = "Produces random slime extracts."
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 939c14589586..113f130562de 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -497,14 +497,6 @@
addtimer(CALLBACK(src, PROC_REF(reset_armor), species), 1200)
return 450
- if(SLIME_ACTIVATE_MAJOR)
- to_chat(user, "You feel your body rapidly crystallizing...")
- if(do_after(user, 120, target = user))
- to_chat(user, "You feel solid.")
- user.set_species(pick(/datum/species/golem/adamantine))
- return
- to_chat(user, "You stop feeding [src], and your body returns to its slimelike state.")
-
/obj/item/slime_extract/adamantine/proc/reset_armor(datum/species/jelly/luminescent/species)
if(istype(species))
species.armor -= 25
diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm
index bf583bcd2157..1115224a6733 100644
--- a/code/modules/ruins/lavaland_ruin_code.dm
+++ b/code/modules/ruins/lavaland_ruin_code.dm
@@ -26,86 +26,6 @@
/obj/item/seeds/sunflower/moonflower = 8
)
-//Free Golems
-
-/obj/item/disk/design_disk/golem_shell
- name = "Golem Creation Disk"
- desc = "A gift from the Liberator."
- illustration = "poyo"
- max_blueprints = 1
-
-/obj/item/disk/design_disk/golem_shell/Initialize()
- . = ..()
- var/datum/design/golem_shell/G = new
- blueprints[1] = G
-
-/datum/design/golem_shell
- name = "Golem Shell Construction"
- desc = "Allows for the construction of a Golem Shell."
- id = "golem"
- build_type = AUTOLATHE
- materials = list(/datum/material/iron = 40000)
- build_path = /obj/item/golem_shell
- category = list("Imported")
-
-/obj/item/golem_shell
- name = "incomplete free golem shell"
- icon = 'icons/obj/wizard.dmi'
- icon_state = "construct"
- desc = "The incomplete body of a golem. Add ten sheets of any mineral to finish."
- var/shell_type = /obj/effect/mob_spawn/human/golem
- var/has_owner = FALSE //if the resulting golem obeys someone
- w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/golem_shell/attackby(obj/item/I, mob/user, params)
- ..()
- var/static/list/golem_shell_species_types = list(
- /obj/item/stack/sheet/metal = /datum/species/golem,
- /obj/item/stack/sheet/glass = /datum/species/golem/glass,
- /obj/item/stack/sheet/plasteel = /datum/species/golem/plasteel,
- /obj/item/stack/sheet/mineral/sandstone = /datum/species/golem/sand,
- /obj/item/stack/sheet/mineral/plasma = /datum/species/golem/plasma,
- /obj/item/stack/sheet/mineral/diamond = /datum/species/golem/diamond,
- /obj/item/stack/sheet/mineral/gold = /datum/species/golem/gold,
- /obj/item/stack/sheet/mineral/silver = /datum/species/golem/silver,
- /obj/item/stack/sheet/mineral/uranium = /datum/species/golem/uranium,
- /obj/item/stack/sheet/mineral/bananium = /datum/species/golem/bananium,
- /obj/item/stack/sheet/mineral/titanium = /datum/species/golem/titanium,
- /obj/item/stack/sheet/mineral/plastitanium = /datum/species/golem/plastitanium,
- /obj/item/stack/sheet/mineral/abductor = /datum/species/golem/alloy,
- /obj/item/stack/sheet/mineral/wood = /datum/species/golem/wood,
- /obj/item/stack/sheet/bluespace_crystal = /datum/species/golem/bluespace,
- /obj/item/stack/sheet/runed_metal = /datum/species/golem/runic,
- /obj/item/stack/medical/gauze = /datum/species/golem/cloth,
- /obj/item/stack/sheet/cotton/cloth = /datum/species/golem/cloth,
- /obj/item/stack/sheet/mineral/adamantine = /datum/species/golem/adamantine,
- /obj/item/stack/sheet/plastic = /datum/species/golem/plastic,
- /obj/item/stack/tile/bronze = /datum/species/golem/bronze,
- /obj/item/stack/sheet/cardboard = /datum/species/golem/cardboard,
- /obj/item/stack/sheet/leather = /datum/species/golem/leather,
- /obj/item/stack/sheet/bone = /datum/species/golem/bone,
- /obj/item/stack/sheet/durathread = /datum/species/golem/durathread,
- /obj/item/stack/sheet/cotton/durathread = /datum/species/golem/durathread,
- /obj/item/stack/sheet/mineral/snow = /datum/species/golem/snow)
-
- if(istype(I, /obj/item/stack))
- var/obj/item/stack/O = I
- var/species = golem_shell_species_types[O.merge_type]
- if(species)
- if(O.use(10))
- to_chat(user, "You finish up the golem shell with ten sheets of [O].")
- new shell_type(get_turf(src), species, user)
- qdel(src)
- else
- to_chat(user, "You need at least ten sheets to finish a golem!")
- else
- to_chat(user, "You can't build a golem out of this kind of material!")
-
-//made with xenobiology, the golem obeys its creator
-/obj/item/golem_shell/servant
- name = "incomplete servant golem shell"
- shell_type = /obj/effect/mob_spawn/human/golem/servant
-
///Syndicate Listening Post
/obj/effect/mob_spawn/human/lavaland_syndicate
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index f706bc87a491..8bfe1f7e9bd8 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -598,7 +598,7 @@
all_shuttle_areas += M.shuttle_areas
for(var/turf/oldT as anything in old_turfs)
- if(!(oldT?.loc in all_shuttle_areas))
+ if(!oldT || !(oldT.loc in all_shuttle_areas))
continue
var/area/old_area = oldT.loc
for(var/obj/docking_port/mobile/bottom_shuttle in all_towed_shuttles)
diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm
index 5f6403ca3cdd..61c05c4170fe 100644
--- a/code/modules/spells/spell_types/construct_spells.dm
+++ b/code/modules/spells/spell_types/construct_spells.dm
@@ -291,11 +291,6 @@
return FALSE
return TRUE
-/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/golem
- charge_max = 800
- jaunt_in_type = /obj/effect/temp_visual/dir_setting/cult/phase
- jaunt_out_type = /obj/effect/temp_visual/dir_setting/cult/phase/out
-
/obj/effect/proc_holder/spell/targeted/projectile/dumbfire/juggernaut
name = "Gauntlet Echo"
desc = "Channels energy into your gauntlet - firing its essence forward in a slow moving, yet devastating, attack."
diff --git a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
index ad71810adcd3..045c052a7c41 100644
--- a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
@@ -216,288 +216,3 @@
/obj/item/bodypart/leg/right/skeleton
limb_id = "skeleton"
should_draw_greyscale = FALSE
-
-///MUSHROOM
-/obj/item/bodypart/head/mushroom
- limb_id = "mush"
- is_dimorphic = FALSE
-
-/obj/item/bodypart/chest/mushroom
- limb_id = "mush"
- is_dimorphic = FALSE
-
-/obj/item/bodypart/l_arm/mushroom
- limb_id = "mush"
-
-/obj/item/bodypart/r_arm/mushroom
- limb_id = "mush"
-
-/obj/item/bodypart/leg/left/mushroom
- limb_id = "mush"
-
-/obj/item/bodypart/leg/right/mushroom
- limb_id = "mush"
-
-///GOLEMS (i hate xenobio)
-/obj/item/bodypart/head/golem
- limb_id = "golem"
- is_dimorphic = FALSE
-
-/obj/item/bodypart/chest/golem
- limb_id = "golem"
- is_dimorphic = FALSE
-
-/obj/item/bodypart/l_arm/golem
- limb_id = "golem"
-
-/obj/item/bodypart/r_arm/golem
- limb_id = "golem"
-
-/obj/item/bodypart/leg/left/golem
- limb_id = "golem"
-
-/obj/item/bodypart/leg/right/golem
- limb_id = "golem"
-
-///
-/obj/item/bodypart/head/golem/alloy
- limb_id = "a_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/alloy
- limb_id = "a_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/alloy
- limb_id = "a_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/alloy
- limb_id = "a_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/alloy
- limb_id = "a_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/alloy
- limb_id = "a_golem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/bananium
- limb_id = "ba_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/bananium
- limb_id = "ba_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/bananium
- limb_id = "ba_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/bananium
- limb_id = "ba_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/bananium
- limb_id = "ba_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/bananium
- limb_id = "ba_golem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/cult
- limb_id = "cultgolem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/cult
- limb_id = "cultgolem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/cult
- limb_id = "cultgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/cult
- limb_id = "cultgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/cult
- limb_id = "cultgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/cult
- limb_id = "cultgolem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/clock
- limb_id = "clockgolem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/clock
- limb_id = "clockgolem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/clock
- limb_id = "clockgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/clock
- limb_id = "clockgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/clock
- limb_id = "clockgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/clock
- limb_id = "clockgolem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/cloth
- limb_id = "clothgolem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/cloth
- limb_id = "clothgolem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/cloth
- limb_id = "clothgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/cloth
- limb_id = "clothgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/cloth
- limb_id = "clothgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/cloth
- limb_id = "clothgolem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/cardboard
- limb_id = "c_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/cardboard
- limb_id = "c_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/cardboard
- limb_id = "c_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/cardboard
- limb_id = "c_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/cardboard
- limb_id = "c_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/cardboard
- limb_id = "c_golem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/durathread
- limb_id = "d_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/durathread
- limb_id = "d_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/durathread
- limb_id = "d_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/durathread
- limb_id = "d_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/durathread
- limb_id = "d_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/durathread
- limb_id = "d_golem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/bone
- limb_id = "b_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/bone
- limb_id = "b_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/bone
- limb_id = "b_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/bone
- limb_id = "b_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/bone
- limb_id = "b_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/bone
- limb_id = "b_golem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/snow
- limb_id = "sn_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/snow
- limb_id = "sn_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/snow
- limb_id = "sn_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/snow
- limb_id = "sn_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/snow
- limb_id = "sn_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/snow
- limb_id = "sn_golem"
- should_draw_greyscale = FALSE
diff --git a/code/modules/surgery/experimental_dissection.dm b/code/modules/surgery/experimental_dissection.dm
index 7cf752ddf998..48f423a12512 100644
--- a/code/modules/surgery/experimental_dissection.dm
+++ b/code/modules/surgery/experimental_dissection.dm
@@ -60,7 +60,7 @@
if(H?.dna?.species)
if(isabductor(H))
cost = (BASE_HUMAN_REWARD*24)
- else if(isgolem(H) || iszombie(H) || isshadow(H) || isandroid(H))
+ else if(iszombie(H) || isshadow(H) || isandroid(H))
cost = (BASE_HUMAN_REWARD*20)
else if(isjellyperson(H) || ispodperson(H) || isalien(H))
cost = (BASE_HUMAN_REWARD*14)
diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm
index 4f22083377ae..f1eb39b84162 100644
--- a/code/modules/surgery/organs/ears.dm
+++ b/code/modules/surgery/organs/ears.dm
@@ -186,12 +186,6 @@
ear_owner.dna.species.mutant_bodyparts -= "ears"
ear_owner.update_body()
-/obj/item/organ/ears/bronze
- name = "tin ears"
- desc = "The robust ears of a bronze golem. "
- damage_multiplier = 0.1 //STRONK
- bang_protect = 1 //Fear me weaklings.
-
/obj/item/organ/ears/cybernetic
name = "cybernetic ears"
icon_state = "ears-c"
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index 40920cc5d21a..4469410f9b58 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -21,7 +21,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/ratvar
))
@@ -45,15 +44,6 @@
/obj/item/organ/tongue/could_speak_language(language)
return is_type_in_typecache(language, languages_possible)
-//Say_mod-Only Tongues
-/obj/item/organ/tongue/golem_base
- name = "golem tongue"
- say_mod = "rumbles"
-
-/obj/item/organ/tongue/golem_honk
- name = "bananium tongue"
- say_mod = "honks"
-
/obj/item/organ/tongue/toma
name = "mutated tongue"
say_mod = "mumbles"
@@ -108,7 +98,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/buzzwords,
/datum/language/ratvar
))
@@ -245,7 +234,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/calcic,
/datum/language/ratvar
))
@@ -328,7 +316,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/ratvar,
))
@@ -353,7 +340,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/ratvar,
/datum/language/slime
))
@@ -378,7 +364,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/buzzwords
))
@@ -420,7 +405,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/teceti_unified
))
@@ -444,7 +428,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/vox_pidgin
))
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 1a0f1ea60f3d..63b6d5c0bfa0 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -22,38 +22,6 @@
/obj/item/organ/vocal_cords/proc/handle_speech(message) //actually say the message
owner.say(message, spans = spans, sanitize = FALSE)
-/obj/item/organ/adamantine_resonator
- name = "adamantine resonator"
- desc = "Fragments of adamantine exist in all golems, stemming from their origins as purely magical constructs. These are used to \"hear\" messages from their leaders."
- zone = BODY_ZONE_HEAD
- slot = ORGAN_SLOT_ADAMANTINE_RESONATOR
- icon_state = "adamantine_resonator"
-
-/obj/item/organ/vocal_cords/adamantine
- name = "adamantine vocal cords"
- desc = "When adamantine resonates, it causes all nearby pieces of adamantine to resonate as well. Adamantine golems use this to broadcast messages to nearby golems."
- actions_types = list(/datum/action/item_action/organ_action/use/adamantine_vocal_cords)
- icon_state = "adamantine_cords"
-
-/datum/action/item_action/organ_action/use/adamantine_vocal_cords/Trigger()
- if(!IsAvailable())
- return
- var/message = input(owner, "Resonate a message to all nearby golems.", "Resonate")
- if(QDELETED(src) || QDELETED(owner) || !message)
- return
- owner.say(".x[message]")
-
-/obj/item/organ/vocal_cords/adamantine/handle_speech(message)
- var/msg = "[owner.real_name] resonates, \"[message]\""
- for(var/m in GLOB.player_list)
- if(iscarbon(m))
- var/mob/living/carbon/C = m
- if(C.getorganslot(ORGAN_SLOT_ADAMANTINE_RESONATOR))
- to_chat(C, msg)
- if(isobserver(m))
- var/link = FOLLOW_LINK(m, owner)
- to_chat(m, "[link] [msg]")
-
//Colossus drop, forces the listeners to obey certain commands
/obj/item/organ/vocal_cords/colossus
name = "divine vocal cords"
diff --git a/code/modules/unit_tests/ship_outpost_placement.dm b/code/modules/unit_tests/ship_outpost_placement.dm
index e1e27097ee6f..73dc32a088fa 100644
--- a/code/modules/unit_tests/ship_outpost_placement.dm
+++ b/code/modules/unit_tests/ship_outpost_placement.dm
@@ -1,6 +1,8 @@
/datum/unit_test/ship_outpost_placement/Run()
- for(var/mapname as anything in SSmapping.ship_purchase_list)
- var/datum/map_template/shuttle/map = SSmapping.ship_purchase_list[mapname]
+ // checks all shuttle templates, including those
+ // disabled or intended as subshuttles
+ for(var/name as anything in SSmapping.shuttle_templates)
+ var/datum/map_template/shuttle/map = SSmapping.shuttle_templates[name]
try
// they'll spawn in empty space, and won't be docked
new /datum/overmap/ship/controlled(list("x" = 1, "y" = 1), map)
@@ -11,6 +13,11 @@
var/datum/overmap/outpost/test_outpost = new outpost_type()
for(var/datum/overmap/ship/controlled/cur_ship as anything in SSovermap.controlled_ships)
+ // already-docked ships are ignored.
+ // this was added to stop runtimes when subshuttles, which were docked to their parent ship, attempted to dock to the outpost as part of this test.
+ // all ships which start undocked will end the loop undocked, so this shouldn't cause any ships to be wrongfully skipped.
+ if(cur_ship.docked_to)
+ continue
cur_ship.Dock(test_outpost, TRUE)
var/obj/docking_port/stationary/ship_dock = cur_ship.shuttle_port.docked
diff --git a/html/changelogs/AutoChangeLog-pr-2432.yml b/html/changelogs/AutoChangeLog-pr-2432.yml
new file mode 100644
index 000000000000..9b162c910470
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2432.yml
@@ -0,0 +1,5 @@
+author: thgvr
+changes:
+ - {balance: 'Goliaths no longer stun you, instead they apply a bear-trap like mass
+ of tentacles that slows you. Resist to break them off.'}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2531.yml b/html/changelogs/AutoChangeLog-pr-2531.yml
deleted file mode 100644
index 1049f0a9d2c5..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2531.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: MoonTheBird
-changes:
- - {rscadd: "Added a LOT of RILENA merch. Plushies, drinks, hoodies, shirts, cosplays...
- And if you're a RILENA fan (positive trait), you get a special pin, like the
- clown or mime fan!"}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2576.yml b/html/changelogs/AutoChangeLog-pr-2576.yml
new file mode 100644
index 000000000000..abd7b06d284e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2576.yml
@@ -0,0 +1,5 @@
+author: MarkSuckerberg
+changes:
+ - {tweak: Combining eyepatches should now try to put the result into your hands
+ afterwards}
+delete-after: true
diff --git a/html/changelogs/archive/2023-12.yml b/html/changelogs/archive/2023-12.yml
index 5bcae97e6108..6328cce0853b 100644
--- a/html/changelogs/archive/2023-12.yml
+++ b/html/changelogs/archive/2023-12.yml
@@ -12,3 +12,24 @@
- rscadd: Revamps blood-red hardsuits, as well as adding their equivalents to each
Gorlex branch!
- rscdel: The Scarlet Hardsuit has been shelved.
+2023-12-05:
+ MoonTheBird:
+ - rscadd: Added a LOT of RILENA merch. Plushies, drinks, hoodies, shirts, cosplays...
+ And if you're a RILENA fan (positive trait), you get a special pin, like the
+ clown or mime fan!
+2023-12-07:
+ FalloutFalcon:
+ - rscadd: improved radial menu for mining tools
+ - tweak: menus for removing attachments
+ PositiveEntropy:
+ - rscadd: The Li-Tieguai is now officially, a Syndicate ship!
+ meemofcourse:
+ - tweak: The 2nd Battlegroup officer uniform is now the Syndicate Officer uniform
+ - tweak: The 2nd Battlegroup officer jacket and cap have been updated to reflect
+ not being part of the ACLF
+ thgvr:
+ - rscdel: Removes golems
+ tmtmtl30:
+ - bugfix: Small playtime-based ship join restriction edge cases fixed.
+ - bugfix: Ship-spawn unit tests have been fixed and expanded.
+ - bugfix: fixes planetary outposts from having space underneath all the turfs
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index f6b279ef0616..2ad16e574534 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index 9ce60cc531ee..3a54f3ac93f2 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/under/syndicate.dmi b/icons/mob/clothing/under/syndicate.dmi
index 27c030aa4b43..7168514ee697 100644
Binary files a/icons/mob/clothing/under/syndicate.dmi and b/icons/mob/clothing/under/syndicate.dmi differ
diff --git a/icons/mob/human_parts.dmi b/icons/mob/human_parts.dmi
index 115688eeca5e..e1bbea2b2006 100644
Binary files a/icons/mob/human_parts.dmi and b/icons/mob/human_parts.dmi differ
diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi
index 6fb879f40e7c..4e816bbecc65 100644
Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi
index 0f2433459af1..0354d2352120 100644
Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 64d0cc4ef8ce..142386586679 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/mob/species/misc/digitigrade.dmi b/icons/mob/species/misc/digitigrade.dmi
index 104387630acb..7c6aca4107b1 100644
Binary files a/icons/mob/species/misc/digitigrade.dmi and b/icons/mob/species/misc/digitigrade.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 4816c2bb666f..f9eeb5d1d91d 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index c464ebddf84e..e0a755c5ca83 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/under/syndicate.dmi b/icons/obj/clothing/under/syndicate.dmi
index 9ae89d62123f..3a0b6ff996b7 100644
Binary files a/icons/obj/clothing/under/syndicate.dmi and b/icons/obj/clothing/under/syndicate.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index b1ed971658eb..ddf9be7b356f 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/food/frozen_treats.dmi b/icons/obj/food/frozen_treats.dmi
index 453bfaf277b7..389949dcfa08 100644
Binary files a/icons/obj/food/frozen_treats.dmi and b/icons/obj/food/frozen_treats.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 5748d2dec958..7a20a687e055 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/icons/obj/miningradio.dmi b/icons/obj/miningradio.dmi
new file mode 100644
index 000000000000..08b6052e91a0
Binary files /dev/null and b/icons/obj/miningradio.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 1fa68293cd4a..d94097ddf2e5 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/shiptest.dme b/shiptest.dme
index ea4b5af13172..919c61c53c36 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -530,6 +530,7 @@
#include "code\datums\components\udder.dm"
#include "code\datums\components\uplink.dm"
#include "code\datums\components\wearertargeting.dm"
+#include "code\datums\components\weatherannouncer.dm"
#include "code\datums\components\wet_floor.dm"
#include "code\datums\components\crafting\crafting.dm"
#include "code\datums\components\crafting\guncrafting.dm"
@@ -2310,7 +2311,6 @@
#include "code\modules\language\swarmer.dm"
#include "code\modules\language\sylvan.dm"
#include "code\modules\language\teceti_unified.dm"
-#include "code\modules\language\terrum.dm"
#include "code\modules\language\vox_pidgin.dm"
#include "code\modules\language\xenocommon.dm"
#include "code\modules\library\lib_codex_gigas.dm"
@@ -2366,6 +2366,7 @@
#include "code\modules\mining\equipment\marker_beacons.dm"
#include "code\modules\mining\equipment\mineral_scanner.dm"
#include "code\modules\mining\equipment\mining_tools.dm"
+#include "code\modules\mining\equipment\miningradio.dm"
#include "code\modules\mining\equipment\regenerative_core.dm"
#include "code\modules\mining\equipment\resonator.dm"
#include "code\modules\mining\equipment\survival_pod.dm"
@@ -2523,7 +2524,6 @@
#include "code\modules\mob\living\carbon\human\species_types\dullahan.dm"
#include "code\modules\mob\living\carbon\human\species_types\ethereal.dm"
#include "code\modules\mob\living\carbon\human\species_types\flypeople.dm"
-#include "code\modules\mob\living\carbon\human\species_types\golems.dm"
#include "code\modules\mob\living\carbon\human\species_types\humans.dm"
#include "code\modules\mob\living\carbon\human\species_types\IPC.dm"
#include "code\modules\mob\living\carbon\human\species_types\jellypeople.dm"
diff --git a/strings/names/golem.txt b/strings/names/golem.txt
deleted file mode 100644
index 7cfcefa899da..000000000000
--- a/strings/names/golem.txt
+++ /dev/null
@@ -1,157 +0,0 @@
-Ablation
-Alabaster
-Alunite
-Andesite
-Anyhdrite
-Basalt
-Basin
-Bauxite
-Bedrock
-Bismuth
-Bismuthinite
-Bituminous Coal
-Borax
-Boulder
-Brimstone
-Brittle
-Calcite
-Cassiterite
-Cenozoic
-Chalk
-Chasm
-Cheridite
-Chert
-Chromite
-Cinnabar
-Claystone
-Coast
-Cobaltite
-Column
-Conglomerate
-Core
-Crevasse
-Crust
-Cryolite
-Crystal
-Dacite
-Diorite
-Dolomite
-Dolostone
-Dragonforce
-Earthflow
-Epoch
-Eutrophication
-Fault
-Flint
-Foliation
-Foreshock
-Fossil
-Gabbro
-Galena
-Garnierite
-Geode
-Geoge
-Gneiss
-Granite
-Graphite
-Gravel
-Groove
-Grotto
-Gypsum
-Hematite
-Hornblende
-Humus
-Igneous
-Ilmenite
-Iron
-Island
-Jasper
-Jet
-Kaolinite
-Kettle
-Kimberlite
-Komatiite
-Landslide
-Levee
-Lignite
-Limestone
-Limonite
-Luster
-Madidite
-Magnetite
-Magnitude
-Malachite
-Mantle
-Marble
-Marcasite
-Melange
-Meme
-Mica
-Microcline
-Migmatite
-Mineral
-Mountain
-Mudstone
-Obsidian
-Olivine
-Ore
-Orpiment
-Orthoclase
-Outwash
-Oxbow Lake
-Oynx
-Pahoehoe
-Pebble
-Pegmatite
-Periclase
-Petrified Wood
-Phyllite
-Pitchblende
-Plate
-Pothole
-Puddingstone
-Pyrite
-Pyrolusite
-Quake
-Quarry
-Quartz
-Quartzite
-Realgar
-Reservoir
-Rhyolite
-Rock
-Rock Salt
-Rockfall
-Rutile
-Saltpeter
-Sand
-Sandstone
-Satinspar
-Schist
-Sediment
-Seismic
-Selenite
-Serpentine
-Shale
-Shore
-Siltstone
-Slag
-Slate
-Sphalerite
-Stack
-Stalactite
-Stalagmite
-Stibnite
-Stone
-Stress
-Subduction
-Sylvite
-Talc
-Tetrahedrite
-Tidal
-Trench
-Valley
-Volcano
-Xenolith
-Yardang
-Zone
diff --git a/tgui/packages/tgui/interfaces/ShipSelect.js b/tgui/packages/tgui/interfaces/ShipSelect.js
index b64016650650..11c48f96175e 100644
--- a/tgui/packages/tgui/interfaces/ShipSelect.js
+++ b/tgui/packages/tgui/interfaces/ShipSelect.js
@@ -189,10 +189,11 @@ export const ShipSelect = (props, context) => {