diff --git a/.github/labeler.yml b/.github/labeler.yml
index 7b3a03de7afd..2d05b3df0298 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -54,7 +54,7 @@
- any-glob-to-any-file: ['code/**', 'icons/**', 'sounds/**', '_maps/map_files/**', 'tgui/**']
- any-glob-to-any-file: [modular_ss220/**]
- base-branch: 'master'
- - head-branch: '^(?!merge-upstream$).*'
+ - head-branch: '^(?!merge[-_]upstream$).*'
':finnadie: НЕ МОДУЛЬНО':
- all:
@@ -62,12 +62,12 @@
- any-glob-to-any-file: ['code/**', 'icons/**', 'sounds/**', '_maps/map_files/**']
- all-globs-to-all-files: '!modular_ss220/**'
- base-branch: 'master'
- - head-branch: '^(?!merge-upstream$).*'
+ - head-branch: '^(?!merge[-_]upstream$).*'
':pray: Слияние с восходящим потоком':
- all:
- base-branch: 'master'
- - head-branch: 'merge-upstream'
+ - head-branch: 'merge[-_]upstream'
':pencil: Перевод':
- base-branch: 'translate'
diff --git a/.github/workflows/build_milla.yml b/.github/workflows/build_rust.yml
similarity index 86%
rename from .github/workflows/build_milla.yml
rename to .github/workflows/build_rust.yml
index ca269a33dda1..1292c93dcb5b 100644
--- a/.github/workflows/build_milla.yml
+++ b/.github/workflows/build_rust.yml
@@ -1,13 +1,13 @@
-name: Build MILLA
+name: Build Rust library
on:
issue_comment:
types: created
jobs:
- build-milla:
+ build-rust:
if: |
github.event.issue.pull_request &&
- (github.event.comment.body == '!build_milla') &&
+ (github.event.comment.body == '!build_rust') &&
((github.event.sender.id == github.event.issue.user.id) ||
(github.event.comment.author_association == 'COLLABORATOR') ||
(github.event.comment.author_association == 'MEMBER') ||
@@ -53,7 +53,7 @@ jobs:
ref: ${{ env.PR_BRANCH }}
token: ${{ env.GH_TOKEN }}
- - name: Build MILLA
+ - name: Build rustlibs
env:
BASE_BRANCH: ${{ github.event.repository.default_branch }}
BASE_REPOSITORY: ${{ github.repository }}
@@ -65,7 +65,7 @@ jobs:
git pull origin "$PR_BRANCH" --depth=$((ahead_by + 1))
git remote add upstream "https://github.com/$BASE_REPOSITORY.git"
git fetch upstream "$BASE_BRANCH" --depth=$((behind_by + 1))
- cd milla
+ cd rust
# Get dependencies.
rustup target add i686-unknown-linux-gnu
@@ -79,13 +79,13 @@ jobs:
cargo build --release --target i686-pc-windows-gnu
# Copy the built targets to their checked-in locations.
- cp target/i686-unknown-linux-gnu/release/libmilla.so ../tools/ci/libmilla_ci.so
- cp target/i686-pc-windows-gnu/release/milla.dll ../milla.dll
+ cp target/i686-unknown-linux-gnu/release/librustlibs.so ../tools/ci/librustlibs_ci.so
+ cp target/i686-pc-windows-gnu/release/rustlibs.dll ../rustlibs.dll
- git commit -a -m "Build MILLA" --allow-empty
+ git commit -a -m "Build Rust library" --allow-empty
git push origin
- name: Notify Failure
if: failure() && env.FAIL_NOTIFIED != 'true'
run: |
- gh pr comment ${{ github.event.issue.html_url }} -b 'Building MILLA failed, see the action run log for details: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
+ gh pr comment ${{ github.event.issue.html_url }} -b 'Building Rust library failed, see the action run log for details: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
diff --git a/.gitignore b/.gitignore
index 60ead497f509..819c884cb604 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,7 +73,7 @@ $RECYCLE.BIN
*.swp
# Rust output.
-/milla/target/*
+/rust/target/*
# mkdocs output.
site
diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql
index ed435e3be7f6..231681d8c312 100644
--- a/SQL/paradise_schema.sql
+++ b/SQL/paradise_schema.sql
@@ -250,7 +250,7 @@ CREATE TABLE `feedback` (
`datetime` datetime NOT NULL,
`round_id` int(8) NOT NULL,
`key_name` varchar(32) NOT NULL,
- `key_type` enum('text', 'amount', 'tally', 'nested tally', 'associative') NOT NULL,
+ `key_type` ENUM('text', 'amount', 'tally', 'nested tally', 'associative', 'ledger', 'nested ledger') NOT NULL,
`version` tinyint(3) UNSIGNED NOT NULL,
`json` LONGTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
PRIMARY KEY (`id`)
diff --git a/SQL/updates/59-60.sql b/SQL/updates/59-60.sql
new file mode 100644
index 000000000000..e826c7a0bff3
--- /dev/null
+++ b/SQL/updates/59-60.sql
@@ -0,0 +1,23 @@
+-- Migration: 59-60
+-- Author: warriorstar
+-- Introduced: PR# 26645
+
+-- This migration adds the 'ledger' and 'nested ledger' enum values to the
+-- `feedback` table in conjunction with making those feedback types available
+-- through SSblackbox.
+-- No data migration is required.
+
+ALTER TABLE
+ `feedback`
+MODIFY
+ COLUMN `key_type` ENUM(
+ 'text',
+ 'amount',
+ 'tally',
+ 'nested tally',
+ 'associative',
+ 'ledger',
+ 'nested ledger'
+ ) NOT NULL
+AFTER
+ `key_name`;
diff --git a/_maps/base_map.dm b/_maps/base_map.dm
index 18d8f64065bf..6eb7555959ff 100644
--- a/_maps/base_map.dm
+++ b/_maps/base_map.dm
@@ -1,5 +1,17 @@
-#include "map_files220\generic\centcomm.dmm" // SS220 EDIT - ORIGINAL: #include "map_files\generic\centcomm.dmm"
-#include "map_files220\generic\Admin_Zone.dmm" // SS220 ADDITION
+/**
+ * SS220 EDIT - START
+ * ORIGINAL: #include "map_files\generic\centcomm.dmm"
+ * Uncomment define bellow if you need faster init for testing.
+ */
+//#define ENABLE_TEST_CC
+
+#ifndef ENABLE_TEST_CC
+#include "map_files220\generic\centcomm.dmm"
+#include "map_files220\generic\Admin_Zone.dmm"
+#else
+#include "map_files220\generic\centcomm_test.dmm"
+#endif
+// SS220 EDIT - END
#define CC_TRANSITION_CONFIG DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC))
#ifdef CIMAP
#include "ci_map_testing.dm"
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm
index 18a3ce53eba2..83aa2d85df09 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm
@@ -723,13 +723,6 @@
/obj/item/stack/sheet/metal,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/althland_excavation)
-"jT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random_spawners/wall_rusted_maybe,
-/turf/simulated/wall/r_wall,
-/area/ruin/unpowered/althland_excavation)
"kh" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/mecha_wreckage/ripley,
@@ -786,7 +779,6 @@
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/althland_excavation)
"nw" = (
-/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/damageturf,
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
@@ -799,7 +791,7 @@
/area/ruin/unpowered/althland_excavation)
"oh" = (
/turf/simulated/mineral/volcanic/lava_land_surface,
-/area/lavaland/surface/outdoors)
+/area/lavaland/surface/outdoors/unexplored)
"or" = (
/obj/structure/railing/corner{
dir = 8
@@ -873,11 +865,9 @@
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
/area/ruin/unpowered/althland_excavation)
-"sp" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random_spawners/wall_rusted_maybe,
-/turf/simulated/wall/r_wall,
-/area/ruin/unpowered/althland_excavation)
+"sj" = (
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
"sA" = (
/obj/structure/railing,
/obj/effect/decal/cleanable/dirt,
@@ -1048,6 +1038,10 @@
nitrogen = 0
},
/area/ruin/unpowered/althland_excavation)
+"Ay" = (
+/obj/effect/mapping_helpers/no_lava,
+/turf/simulated/floor/chasm/straight_down/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
"AD" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -1221,6 +1215,10 @@
nitrogen = 0
},
/area/ruin/unpowered/althland_excavation)
+"Jn" = (
+/obj/effect/mapping_helpers/no_lava,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
"Jp" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/hidden,
@@ -1275,8 +1273,10 @@
},
/area/lavaland/surface/outdoors)
"Mm" = (
+/obj/structure/girder/reinforced,
+/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
+/area/lavaland/surface/outdoors/unexplored)
"MT" = (
/obj/structure/grille/broken,
/obj/effect/decal/cleanable/glass,
@@ -1579,23 +1579,23 @@ oh
oh
oh
oh
-Mm
-Mm
-Mm
-Mm
-Ei
-Ei
-Ei
-Ei
-Ei
-Ei
-Ei
-Ei
-Ei
-Ei
-Ei
-Mm
-Mm
+sj
+sj
+sj
+sj
+sj
+Jn
+Jn
+Jn
+Jn
+Jn
+Jn
+Jn
+Jn
+Jn
+Jn
+sj
+sj
oh
oh
oh
@@ -1606,13 +1606,13 @@ oh
oh
oh
oh
-Mm
-Mm
-Mm
-Mm
-Mm
-Mm
-Mm
+sj
+sj
+sj
+sj
+sj
+sj
+sj
TN
TN
TN
@@ -1622,13 +1622,13 @@ Du
TN
TN
TN
-Ei
-Ei
-Ei
-Ei
-Ei
-Ei
-Ei
+Jn
+Jn
+Jn
+Jn
+Jn
+Jn
+Jn
oh
oh
oh
@@ -1636,10 +1636,10 @@ oh
(3,1,1) = {"
oh
oh
-Mm
-Mm
-Mm
-Mm
+sj
+sj
+sj
+sj
TN
TN
TN
@@ -1658,18 +1658,18 @@ TN
TN
TN
TN
-Ei
-Ei
-Ei
-Ei
+Jn
+Jn
+Jn
+Jn
oh
oh
"}
(4,1,1) = {"
oh
-Mm
-Mm
-Mm
+sj
+sj
+sj
TN
TN
TN
@@ -1679,30 +1679,30 @@ yb
bO
nw
gh
-jT
+TN
Wt
RG
tj
-jT
+TN
Zy
-sp
+TN
aq
dp
Cs
TN
TN
TN
-Ei
-Ei
-Mm
-Mm
+Jn
+Jn
+sj
+sj
"}
(5,1,1) = {"
oh
-Mm
-Mm
+sj
+sj
+TN
TN
-sp
aU
Lt
am
@@ -1725,13 +1725,13 @@ je
Ei
TN
TN
-Ei
-Ei
-Mm
+Jn
+sj
+sj
"}
(6,1,1) = {"
-Mm
-Mm
+sj
+sj
TN
TN
Ri
@@ -1757,13 +1757,13 @@ TN
Ei
Ei
bm
-bm
-Ei
-Ei
+Mm
+sj
+sj
"}
(7,1,1) = {"
-Mm
-Mm
+sj
+sj
TN
PL
BZ
@@ -1789,12 +1789,12 @@ TN
Ei
Ei
Ei
-bm
-Ei
-Ei
+Mm
+sj
+sj
"}
(8,1,1) = {"
-Mm
+sj
TN
TN
pE
@@ -1821,14 +1821,14 @@ Ei
Ei
Ei
bm
-Ei
-Ei
-Ei
+Jn
+sj
+sj
"}
(9,1,1) = {"
-Mm
+sj
+TN
TN
-sp
bC
zw
TN
@@ -1853,12 +1853,12 @@ Ei
zp
XS
BW
-aB
-Ei
-Ei
+Ay
+sj
+sj
"}
(10,1,1) = {"
-Mm
+sj
TN
TN
TN
@@ -1885,12 +1885,12 @@ aC
sA
aB
aB
-Ei
-bm
-Ei
+Jn
+Mm
+Jn
"}
(11,1,1) = {"
-Mm
+sj
TN
ct
Pe
@@ -1917,12 +1917,12 @@ GE
aB
aB
Ei
-Ei
-bm
-Ei
+Jn
+Mm
+Jn
"}
(12,1,1) = {"
-Mm
+sj
TN
pC
yb
@@ -1951,10 +1951,10 @@ aB
Ei
Ei
TN
-Ei
+Jn
"}
(13,1,1) = {"
-Ei
+Jn
TN
TN
TN
@@ -1983,10 +1983,10 @@ Ei
Ei
Ei
TN
-Mm
+sj
"}
(14,1,1) = {"
-Ei
+Jn
TN
aU
PL
@@ -2015,10 +2015,10 @@ XS
Ei
Ei
TN
-Mm
+sj
"}
(15,1,1) = {"
-Ei
+Jn
TN
Yz
yb
@@ -2047,10 +2047,10 @@ Ei
Ei
Ei
TN
-Mm
+sj
"}
(16,1,1) = {"
-Ei
+Jn
TN
TN
TN
@@ -2079,10 +2079,10 @@ Ei
BW
aB
TN
-Mm
+sj
"}
(17,1,1) = {"
-Ei
+Jn
TN
Ei
Ei
@@ -2111,10 +2111,10 @@ mK
uG
BW
TN
-Mm
+sj
"}
(18,1,1) = {"
-Ei
+Jn
bm
Ei
BW
@@ -2143,10 +2143,10 @@ BW
LK
PM
TN
-Mm
+sj
"}
(19,1,1) = {"
-Ei
+Jn
bm
Ei
BW
@@ -2175,10 +2175,10 @@ aB
BW
KU
TN
-Mm
+sj
"}
(20,1,1) = {"
-Ei
+Jn
TN
Ei
bm
@@ -2207,10 +2207,10 @@ aB
aB
uG
TN
-Mm
+sj
"}
(21,1,1) = {"
-Ei
+Jn
TN
TN
TN
@@ -2239,10 +2239,10 @@ aB
aB
aB
TN
-Mm
+sj
"}
(22,1,1) = {"
-Ei
+Jn
TN
ao
ar
@@ -2271,10 +2271,10 @@ BW
TJ
BW
TN
-Mm
+sj
"}
(23,1,1) = {"
-Ei
+Jn
TN
at
bl
@@ -2303,10 +2303,10 @@ mh
mK
uG
TN
-Mm
+sj
"}
(24,1,1) = {"
-Ei
+Jn
TN
aG
aU
@@ -2335,10 +2335,10 @@ mh
mh
Gc
TN
-Mm
+sj
"}
(25,1,1) = {"
-Mm
+sj
TN
TN
bU
@@ -2367,11 +2367,11 @@ gg
bN
TN
TN
-Mm
+sj
"}
(26,1,1) = {"
-Mm
-Mm
+sj
+sj
TN
az
DS
@@ -2398,12 +2398,12 @@ jL
Nv
jS
TN
-Mm
-Mm
+sj
+sj
"}
(27,1,1) = {"
oh
-Mm
+sj
TN
TN
ap
@@ -2430,13 +2430,13 @@ bL
YE
TN
TN
-Mm
-Mm
+sj
+sj
"}
(28,1,1) = {"
oh
-Mm
-Mm
+sj
+sj
TN
TN
iA
@@ -2461,15 +2461,15 @@ kh
aE
TN
TN
-Mm
-Mm
+sj
+sj
oh
"}
(29,1,1) = {"
oh
-Mm
-Mm
-Mm
+sj
+sj
+sj
TN
TN
TN
@@ -2492,18 +2492,18 @@ TN
TN
TN
TN
-Mm
-Mm
+sj
+sj
oh
oh
"}
(30,1,1) = {"
oh
oh
-Mm
-Mm
-Mm
-Mm
+sj
+sj
+sj
+sj
TN
TN
TN
@@ -2522,9 +2522,9 @@ TN
TN
TN
TN
-Mm
-Mm
-Mm
+sj
+sj
+sj
oh
oh
oh
@@ -2533,14 +2533,14 @@ oh
oh
oh
oh
-Mm
-Mm
-Mm
-Mm
-Mm
-Mm
-Mm
-Mm
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+sj
TN
TN
TN
@@ -2550,11 +2550,11 @@ TN
TN
TN
TN
-Mm
-Mm
-Mm
-Mm
-Mm
+sj
+sj
+sj
+sj
+sj
oh
oh
oh
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm
index 32276f9dd3d9..bc2ac1d5611a 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm
@@ -115,6 +115,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/althland_processing)
+"cM" = (
+/obj/effect/mapping_helpers/no_lava,
+/turf/template_noop,
+/area/lavaland/surface/outdoors/unexplored)
"dh" = (
/obj/effect/mapping_helpers/no_lava,
/obj/structure/disposalpipe/segment/corner{
@@ -409,12 +413,6 @@
/obj/structure/ore_box,
/turf/simulated/floor/plasteel/lavaland_air,
/area/ruin/unpowered/althland_processing)
-"nX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/ore,
-/obj/effect/spawner/random_spawners/wall_rusted_maybe,
-/turf/simulated/wall/r_wall,
-/area/ruin/unpowered/althland_processing)
"oj" = (
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/althland_processing)
@@ -517,12 +515,6 @@
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating/lavaland_air,
/area/lavaland/surface/outdoors)
-"sv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random_spawners/wall_rusted_always,
-/turf/simulated/wall/r_wall,
-/area/ruin/unpowered/althland_processing)
"sB" = (
/obj/effect/mapping_helpers/no_lava,
/obj/structure/disposalpipe/trunk,
@@ -658,6 +650,9 @@
/obj/machinery/economy/vending/chinese,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/althland_processing)
+"yh" = (
+/turf/template_noop,
+/area/lavaland/surface/outdoors/unexplored)
"zd" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -759,11 +754,6 @@
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating/lavaland_air,
/area/lavaland/surface/outdoors)
-"AT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall/r_wall,
-/area/ruin/unpowered/althland_processing)
"BB" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/portable/pump,
@@ -785,11 +775,6 @@
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/althland_processing)
-"BO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random_spawners/wall_rusted_maybe,
-/turf/simulated/wall/r_wall,
-/area/ruin/unpowered/althland_processing)
"BV" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/damageturf,
@@ -1213,12 +1198,6 @@
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
-"QE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random_spawners/wall_rusted_maybe,
-/turf/simulated/wall/r_wall,
-/area/ruin/unpowered/althland_processing)
"RL" = (
/obj/item/stack/sheet/metal{
amount = 5
@@ -1471,26 +1450,26 @@ bV
bV
bV
bV
-bV
-bV
-bV
-bV
-bV
-bV
-bV
-bV
-bV
-bV
-bV
-bV
-bV
-bV
-bV
-bV
-bV
-bL
-bL
-bL
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
bL
bL
bL
@@ -1507,19 +1486,19 @@ bV
bV
ab
ab
-bV
-bV
-bV
-bV
-ab
-bV
-bV
-bV
-bV
-bV
-ab
-ab
+yh
+yh
+yh
+yh
ab
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
ab
GF
ab
@@ -1552,7 +1531,7 @@ ab
ab
bT
ab
-ab
+cb
ab
ab
ab
@@ -1726,7 +1705,7 @@ KZ
ab
ui
ui
-QE
+ui
Lg
ui
ab
@@ -1773,7 +1752,7 @@ jb
ab
ab
ui
-QE
+ui
af
BM
Hz
@@ -1811,7 +1790,7 @@ ab
ab
af
af
-AT
+Au
Wb
kR
fc
@@ -1871,7 +1850,7 @@ bT
JT
zZ
qn
-nX
+ui
ui
ui
VJ
@@ -1957,7 +1936,7 @@ bT
um
um
ui
-BO
+ui
zR
ui
bT
@@ -2016,7 +1995,7 @@ ui
iq
MO
eH
-BO
+ui
ab
ap
ab
@@ -2158,7 +2137,7 @@ ab
ab
ui
ui
-BO
+ui
ui
ui
ab
@@ -2308,7 +2287,7 @@ bT
ui
ui
nK
-sv
+um
lZ
ui
Yd
@@ -2596,7 +2575,7 @@ af
af
ui
ui
-BO
+ui
ho
ui
bT
@@ -2740,9 +2719,9 @@ ab
ab
ab
ab
-ab
-ab
-ab
+cM
+cM
+cM
ab
ab
bL
@@ -2776,9 +2755,9 @@ bV
bV
bV
bV
-ab
-ab
-ab
+cM
+cM
+cM
bV
bV
bV
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm
index 66be1d8d19b3..bff842e79ef3 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm
@@ -2,9 +2,6 @@
"a" = (
/turf/template_noop,
/area/template_noop)
-"b" = (
-/turf/simulated/mineral/random/volcanic,
-/area/lavaland/surface/outdoors)
"c" = (
/obj/effect/mapping_helpers/no_lava,
/obj/effect/mapping_helpers/no_lava,
@@ -170,7 +167,7 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
-"I" = (
+"J" = (
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
@@ -179,118 +176,64 @@
a
a
a
-b
-a
-b
-a
-b
-b
-b
-b
-a
-b
-a
+J
+d
+J
+J
+J
+J
+J
a
a
"}
(2,1,1) = {"
a
-a
-a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-a
-a
-"}
-(3,1,1) = {"
-a
-b
-b
-b
-b
-I
-d
-I
-I
-I
-I
-I
-b
-b
-b
-b
-"}
-(4,1,1) = {"
-b
-b
-b
-I
-I
-I
+J
+J
+J
k
o
-I
-I
+J
+J
c
-I
-I
-b
-b
+J
+J
a
"}
-(5,1,1) = {"
-a
-b
-I
-I
+(3,1,1) = {"
+J
+J
d
g
-I
+J
p
-I
+J
v
-I
-I
-I
-I
-b
-b
+J
+J
+J
+J
"}
-(6,1,1) = {"
-b
-b
-I
-I
-I
+(4,1,1) = {"
+J
+J
+J
h
l
e
s
j
-I
+J
d
e
-I
-b
-b
+J
"}
-(7,1,1) = {"
-a
-b
-I
-I
-I
-I
-I
+(5,1,1) = {"
+J
+J
+J
+J
+J
q
t
w
@@ -298,114 +241,60 @@ x
y
p
e
-b
-b
"}
-(8,1,1) = {"
-b
-b
-I
-I
+(6,1,1) = {"
+J
+J
e
i
m
j
u
e
-I
+J
f
d
y
-b
-b
"}
-(9,1,1) = {"
-b
-b
-I
-I
+(7,1,1) = {"
+J
+J
f
j
-I
+J
r
-I
+J
o
-I
-I
-I
-I
-b
-b
+J
+J
+J
+J
"}
-(10,1,1) = {"
+(8,1,1) = {"
a
-b
-b
-I
-I
-I
+J
+J
+J
k
o
-I
-I
-I
-I
-I
-b
-b
-a
-"}
-(11,1,1) = {"
-b
-b
-b
-b
-b
-I
-n
-I
-I
-I
-I
-I
-b
-b
-b
-b
-"}
-(12,1,1) = {"
-a
-a
-a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-a
+J
+J
+J
+J
+J
a
"}
-(13,1,1) = {"
-a
-a
-b
-a
-a
-a
-b
-b
-b
+(9,1,1) = {"
a
-b
a
a
-b
+J
+n
+J
+J
+J
+J
+J
a
a
"}
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm
index 4007379ec985..737bfdac6cca 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm
@@ -1,9 +1,11 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
+/obj/effect/mapping_helpers/no_lava,
/turf/template_noop,
/area/template_noop)
"b" = (
-/turf/simulated/mineral/random/volcanic,
+/obj/effect/mapping_helpers/no_lava,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"c" = (
/obj/structure/stone_tile/surrounding_tile{
@@ -26,9 +28,6 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
-"f" = (
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
"h" = (
/obj/structure/stone_tile/block/cracked{
dir = 8
@@ -181,247 +180,136 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
-"Q" = (
+"M" = (
/obj/effect/mapping_helpers/no_lava,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
+/obj/effect/mapping_helpers/no_lava,
+/turf/template_noop,
+/area/template_noop)
(1,1,1) = {"
-a
b
-a
b
b
b
b
-a
-a
b
b
b
b
-a
b
a
a
+a
"}
(2,1,1) = {"
b
+c
+h
+k
b
b
b
-b
-f
-b
-b
-b
-b
-b
+k
b
b
b
b
a
-a
"}
(3,1,1) = {"
-a
b
-Q
-Q
-Q
-Q
-Q
-Q
-Q
-Q
-Q
-Q
+d
+c
+l
b
-f
b
b
-a
-"}
-(4,1,1) = {"
-b
-b
-Q
-c
-h
-k
-Q
-Q
-Q
-k
-Q
-Q
-Q
-Q
-b
+v
b
b
-"}
-(5,1,1) = {"
b
b
-Q
-d
-c
-l
-Q
-Q
-Q
-v
-Q
-Q
-Q
-Q
-Q
b
-a
"}
-(6,1,1) = {"
-a
+(4,1,1) = {"
b
-Q
e
i
m
k
-Q
+b
t
w
-Q
-Q
-Q
-Q
-Q
+b
+b
+b
b
b
"}
-(7,1,1) = {"
+(5,1,1) = {"
a
b
b
-Q
-Q
G
o
r
q
w
-Q
-Q
-Q
-Q
-Q
+b
+b
+b
b
b
"}
-(8,1,1) = {"
+(6,1,1) = {"
+M
b
b
b
-Q
-Q
-Q
p
B
s
-Q
-Q
+b
+b
q
n
A
-Q
-b
b
"}
-(9,1,1) = {"
-a
+(7,1,1) = {"
+b
+b
b
-Q
-Q
-Q
c
q
s
q
k
x
-Q
+b
z
d
-Q
-b
b
"}
-(10,1,1) = {"
-b
+(8,1,1) = {"
b
-Q
G
j
n
j
-Q
+b
e
n
y
-Q
+b
n
y
-Q
b
-a
"}
-(11,1,1) = {"
-b
-b
-Q
-Q
-Q
-Q
-Q
-Q
-Q
-Q
-Q
-Q
-Q
-Q
-b
-b
-a
-"}
-(12,1,1) = {"
-a
-b
-Q
-Q
-Q
-Q
-Q
-Q
-Q
-Q
-Q
-Q
-f
-b
-b
-b
-b
-"}
-(13,1,1) = {"
-b
-b
+(9,1,1) = {"
b
b
b
-f
-f
b
b
b
@@ -433,9 +321,7 @@ b
b
a
"}
-(14,1,1) = {"
-a
-a
+(10,1,1) = {"
b
b
b
@@ -443,12 +329,10 @@ b
b
b
b
-a
b
b
-a
-a
b
a
a
+a
"}
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm
index 808acab4c180..fb1004fa52d5 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm
@@ -171,7 +171,7 @@
/obj/structure/stone_tile/center,
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
+/area/lavaland/surface/outdoors/unexplored)
"w" = (
/obj/structure/stone_tile/block{
dir = 8
@@ -187,25 +187,32 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"H" = (
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"L" = (
+/obj/effect/mapping_helpers/no_lava,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
"U" = (
/turf/simulated/mineral/random/volcanic,
-/area/template_noop)
+/area/lavaland/surface/outdoors/unexplored)
(1,1,1) = {"
a
a
a
a
-b
+U
a
a
a
-b
+U
a
-b
+U
a
-b
-b
+U
+U
a
a
a
@@ -215,22 +222,22 @@ a
"}
(2,1,1) = {"
a
-b
-b
-b
-b
-b
+U
+U
+U
+U
+U
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
a
a
a
@@ -238,29 +245,29 @@ a
(3,1,1) = {"
a
a
-b
-b
-b
-b
-b
+U
+U
+U
+U
+U
a
-b
-b
+U
+U
E
E
E
-b
-b
-b
-b
-b
+U
+U
+U
+U
+U
a
a
"}
(4,1,1) = {"
a
a
-b
+U
E
E
E
@@ -275,14 +282,14 @@ E
E
E
E
-b
+U
a
a
"}
(5,1,1) = {"
a
-b
-b
+U
+U
b
b
E
@@ -297,13 +304,13 @@ E
b
b
b
-b
-b
+U
+U
a
"}
(6,1,1) = {"
-b
-b
+U
+U
E
E
b
@@ -319,14 +326,14 @@ b
b
b
c
-b
-b
+U
+U
a
"}
(7,1,1) = {"
a
-b
-b
+U
+U
E
E
E
@@ -341,14 +348,14 @@ g
n
E
E
-b
-b
-b
+U
+U
+U
"}
(8,1,1) = {"
-b
-b
-b
+U
+U
+U
b
c
E
@@ -363,14 +370,14 @@ l
h
q
E
-E
-b
-b
+L
+U
+U
"}
(9,1,1) = {"
-b
-b
-b
+U
+U
+U
E
E
E
@@ -385,14 +392,14 @@ E
E
h
s
-E
-b
+L
+U
a
"}
(10,1,1) = {"
-b
-b
-c
+U
+U
+H
c
E
d
@@ -408,13 +415,13 @@ w
f
t
v
-b
-b
+U
+U
"}
(11,1,1) = {"
-b
-b
-b
+U
+U
+U
E
E
E
@@ -429,14 +436,14 @@ E
E
o
u
-E
-b
-b
+L
+U
+U
"}
(12,1,1) = {"
a
-b
-b
+U
+U
b
c
E
@@ -451,13 +458,13 @@ m
o
r
E
-E
-b
+L
+U
a
"}
(13,1,1) = {"
a
-b
+U
c
E
E
@@ -473,13 +480,13 @@ h
p
E
E
-c
-b
-b
+H
+U
+U
"}
(14,1,1) = {"
-b
-b
+U
+U
E
E
b
@@ -495,14 +502,14 @@ b
b
c
b
-b
-b
-b
+U
+U
+U
"}
(15,1,1) = {"
a
-b
-b
+U
+U
b
b
E
@@ -517,19 +524,19 @@ E
b
b
b
-b
-b
+U
+U
a
"}
(16,1,1) = {"
a
-b
-b
+U
+U
E
E
E
-b
-b
+U
+U
c
E
E
@@ -539,50 +546,50 @@ E
E
E
E
-b
+U
a
a
"}
(17,1,1) = {"
-b
-b
-b
-b
-b
-b
-b
-b
+U
+U
+U
+U
+U
+U
+U
+U
c
c
E
E
E
-b
-b
-b
-b
-b
+U
+U
+U
+U
+U
a
a
"}
(18,1,1) = {"
a
-b
+U
a
-b
-b
+U
+U
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
+U
+U
+U
+U
+U
+U
+U
+U
+U
a
-b
+U
a
a
a
@@ -591,15 +598,15 @@ a
a
a
a
-b
+U
a
a
a
-b
+U
a
U
-b
-b
+U
+U
a
a
a
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
index 5f76d0072f16..9fd6556f7bf3 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
@@ -5,9 +5,6 @@
"b" = (
/turf/simulated/floor/engine/cult/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
-"c" = (
-/turf/simulated/floor/lava/mapping_lava,
-/area/ruin/unpowered/misc_lavaruin)
"d" = (
/turf/simulated/wall/cult,
/area/ruin/unpowered/misc_lavaruin)
@@ -77,6 +74,9 @@
"s" = (
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/misc_lavaruin)
+"B" = (
+/turf/simulated/floor/lava/mapping_lava,
+/area/ruin/unpowered/misc_lavaruin)
(1,1,1) = {"
a
@@ -86,7 +86,7 @@ a
a
a
b
-c
+B
b
a
a
@@ -99,15 +99,15 @@ a
a
d
e
-c
+B
s
-c
+B
b
b
b
-c
+B
s
-c
+B
s
d
a
@@ -118,11 +118,11 @@ e
f
s
d
-c
-c
+B
+B
g
-c
-c
+B
+B
d
e
f
@@ -131,43 +131,43 @@ a
"}
(4,1,1) = {"
a
-c
+B
s
-c
-c
-c
-c
-b
-c
-c
-c
-c
+B
+B
+B
+B
+b
+B
+B
+B
+B
e
-c
+B
a
"}
(5,1,1) = {"
a
s
d
-c
-c
+B
+B
b
b
b
b
b
-c
-c
+B
+B
d
s
a
"}
(6,1,1) = {"
a
-c
-c
-c
+B
+B
+B
b
b
l
@@ -175,16 +175,16 @@ d
k
b
b
-c
-c
-c
+B
+B
+B
a
"}
(7,1,1) = {"
b
b
-c
-c
+B
+B
g
i
b
@@ -192,13 +192,13 @@ b
b
l
b
-c
-c
+B
+B
b
b
"}
(8,1,1) = {"
-c
+B
b
g
b
@@ -212,13 +212,13 @@ b
b
g
b
-c
+B
"}
(9,1,1) = {"
b
b
-c
-c
+B
+B
b
k
b
@@ -226,16 +226,16 @@ b
b
m
b
-c
-c
+B
+B
b
b
"}
(10,1,1) = {"
a
-c
-c
-c
+B
+B
+B
g
b
m
@@ -243,43 +243,43 @@ h
q
b
b
-c
-c
-c
+B
+B
+B
a
"}
(11,1,1) = {"
a
s
d
-c
-c
+B
+B
b
b
b
b
b
-c
-c
+B
+B
d
s
a
"}
(12,1,1) = {"
a
-c
+B
s
-c
-c
-c
-c
-b
-c
-c
-c
-c
+B
+B
+B
+B
+b
+B
+B
+B
+B
e
-c
+B
a
"}
(13,1,1) = {"
@@ -288,11 +288,11 @@ e
f
s
d
-c
-c
+B
+B
g
-c
-c
+B
+B
d
e
f
@@ -303,15 +303,15 @@ a
a
d
e
-c
+B
s
-c
+B
b
b
b
-c
+B
s
-c
+B
s
d
a
@@ -324,7 +324,7 @@ a
a
a
b
-c
+B
b
a
a
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm
index d8aca887b621..286acbd11182 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm
@@ -2,9 +2,6 @@
"a" = (
/turf/template_noop,
/area/template_noop)
-"b" = (
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/unexplored)
"c" = (
/obj/item/clockwork/alloy_shards/small,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
@@ -18,7 +15,7 @@
/obj/effect/mapping_helpers/no_lava,
/obj/item/stack/tile/brass,
/turf/simulated/floor/clockwork/lavaland_air,
-/area/lavaland/surface/outdoors/unexplored)
+/area/lavaland/surface/outdoors)
"f" = (
/turf/simulated/mineral/volcanic/lava_land_surface,
/area/lavaland/surface/outdoors/unexplored)
@@ -29,7 +26,7 @@
"h" = (
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/clockwork/lavaland_air,
-/area/lavaland/surface/outdoors/unexplored)
+/area/lavaland/surface/outdoors)
"i" = (
/obj/structure/grille/ratvar/broken,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
@@ -42,7 +39,7 @@
/obj/effect/mapping_helpers/no_lava,
/obj/item/clockwork/alloy_shards/small,
/turf/simulated/floor/clockwork/lavaland_air,
-/area/lavaland/surface/outdoors/unexplored)
+/area/lavaland/surface/outdoors)
"l" = (
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors/unexplored)
@@ -63,7 +60,7 @@
/obj/effect/mapping_helpers/no_lava,
/obj/item/clockwork/alloy_shards/medium,
/turf/simulated/floor/clockwork/lavaland_air,
-/area/lavaland/surface/outdoors/unexplored)
+/area/lavaland/surface/outdoors)
"r" = (
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
@@ -72,7 +69,7 @@
/obj/effect/mapping_helpers/no_lava,
/obj/item/clockwork/alloy_shards/large,
/turf/simulated/floor/clockwork/lavaland_air,
-/area/lavaland/surface/outdoors/unexplored)
+/area/lavaland/surface/outdoors)
"t" = (
/obj/item/stack/tile/brass,
/obj/effect/mapping_helpers/no_lava,
@@ -82,43 +79,43 @@
/obj/effect/mapping_helpers/no_lava,
/obj/structure/grille/ratvar,
/turf/simulated/floor/clockwork/lavaland_air,
-/area/lavaland/surface/outdoors/unexplored)
+/area/lavaland/surface/outdoors)
"w" = (
/obj/effect/mapping_helpers/no_lava,
/obj/structure/grille/ratvar/broken,
/turf/simulated/floor/clockwork/lavaland_air,
-/area/lavaland/surface/outdoors/unexplored)
+/area/lavaland/surface/outdoors)
"x" = (
/obj/effect/mapping_helpers/no_lava,
/obj/structure/clockwork/wall_gear,
/obj/item/stack/tile/brass,
/turf/simulated/floor/clockwork/lavaland_air,
-/area/lavaland/surface/outdoors/unexplored)
+/area/lavaland/surface/outdoors)
"y" = (
/obj/effect/mapping_helpers/no_lava,
/obj/item/clockwork/component/geis_capacitor/fallen_armor,
/turf/simulated/floor/clockwork/lavaland_air,
-/area/lavaland/surface/outdoors/unexplored)
+/area/lavaland/surface/outdoors)
"z" = (
/obj/effect/mapping_helpers/no_lava,
/obj/structure/clockwork/wall_gear,
/turf/simulated/floor/clockwork/lavaland_air,
-/area/lavaland/surface/outdoors/unexplored)
+/area/lavaland/surface/outdoors)
"A" = (
/obj/effect/mapping_helpers/no_lava,
/obj/item/clockwork/alloy_shards/clockgolem_remains,
/turf/simulated/floor/clockwork/lavaland_air,
-/area/lavaland/surface/outdoors/unexplored)
+/area/lavaland/surface/outdoors)
"B" = (
/obj/effect/mapping_helpers/no_lava,
/obj/item/clockwork/weapon/ratvarian_spear,
/turf/simulated/floor/clockwork/lavaland_air,
-/area/lavaland/surface/outdoors/unexplored)
+/area/lavaland/surface/outdoors)
"C" = (
/obj/effect/mapping_helpers/no_lava,
/obj/item/clockwork/alloy_shards/medium/gear_bit,
/turf/simulated/floor/clockwork/lavaland_air,
-/area/lavaland/surface/outdoors/unexplored)
+/area/lavaland/surface/outdoors)
"D" = (
/obj/structure/grille/ratvar,
/obj/effect/mapping_helpers/no_lava,
@@ -133,12 +130,15 @@
/obj/effect/mapping_helpers/no_lava,
/obj/structure/dead_ratvar,
/turf/simulated/floor/clockwork/lavaland_air,
-/area/lavaland/surface/outdoors/unexplored)
+/area/lavaland/surface/outdoors)
"G" = (
/obj/item/stack/tile/brass/fifty,
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/unexplored)
+"X" = (
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
(1,1,1) = {"
a
@@ -154,10 +154,10 @@ a
a
a
a
-b
+X
s
h
-b
+X
a
a
a
@@ -175,16 +175,16 @@ a
a
a
o
-b
+X
a
h
-b
-b
+X
+X
c
j
x
-b
-b
+X
+X
g
a
a
@@ -200,19 +200,19 @@ a
a
a
f
-b
+X
l
-b
+X
m
-b
+X
p
w
j
j
c
l
-b
-b
+X
+X
a
a
a
@@ -228,19 +228,19 @@ a
f
l
l
-b
-b
-b
+X
+X
+X
l
j
j
j
p
l
-b
+X
h
c
-b
+X
a
a
"}
@@ -250,7 +250,7 @@ a
a
a
a
-b
+X
l
l
p
@@ -261,12 +261,12 @@ l
l
j
l
-b
+X
l
l
D
h
-b
+X
a
a
"}
@@ -299,15 +299,15 @@ a
(7,1,1) = {"
a
a
-b
-b
-b
+X
+X
+X
l
l
l
l
h
-b
+X
l
l
l
@@ -319,7 +319,7 @@ l
c
f
f
-b
+X
a
"}
(8,1,1) = {"
@@ -328,54 +328,54 @@ h
h
g
c
-b
+X
l
l
l
l
n
h
-b
+X
l
l
-b
+X
l
l
l
l
f
-b
+X
a
a
"}
(9,1,1) = {"
a
-b
+X
c
-b
-b
+X
+X
l
l
l
l
t
h
-b
+X
h
w
p
-b
+X
g
l
l
-b
-b
-b
-b
+X
+X
+X
+X
a
"}
(10,1,1) = {"
-b
+X
h
l
l
@@ -383,15 +383,15 @@ l
l
l
l
-b
-b
+X
+X
p
r
F
-b
+X
h
A
-b
+X
l
l
l
@@ -410,20 +410,20 @@ l
l
l
l
-b
+X
h
k
h
h
h
-b
+X
l
l
l
l
l
l
-b
+X
a
"}
(12,1,1) = {"
@@ -434,20 +434,20 @@ j
h
l
l
-b
+X
l
l
-b
+X
h
h
h
c
l
l
-b
+X
l
l
-b
+X
h
o
a
@@ -455,14 +455,14 @@ a
(13,1,1) = {"
e
k
-b
+X
l
l
l
-b
+X
p
s
-b
+X
h
h
h
@@ -474,19 +474,19 @@ l
l
l
l
-b
-b
+X
+X
a
"}
(14,1,1) = {"
-b
-b
-b
+X
+X
+X
m
l
l
l
-b
+X
h
h
k
@@ -496,18 +496,18 @@ h
h
h
c
-b
+X
l
l
-b
-b
+X
+X
h
-b
+X
"}
(15,1,1) = {"
-b
-b
-b
+X
+X
+X
l
l
l
@@ -526,8 +526,8 @@ l
l
l
l
-b
-b
+X
+X
a
"}
(16,1,1) = {"
@@ -539,7 +539,7 @@ l
l
l
l
-b
+X
h
h
h
@@ -547,7 +547,7 @@ h
h
h
s
-b
+X
l
l
l
@@ -557,66 +557,66 @@ f
a
"}
(17,1,1) = {"
-b
-b
-b
+X
+X
+X
l
l
l
-b
+X
l
l
-b
+X
h
h
h
h
h
-b
+X
s
-b
+X
l
-b
+X
l
l
-b
+X
a
"}
(18,1,1) = {"
-b
+X
h
l
l
l
-b
-b
+X
+X
h
-b
+X
h
h
h
h
h
-b
+X
k
-b
+X
C
-b
+X
h
-b
-b
+X
+X
m
-b
+X
"}
(19,1,1) = {"
-b
-b
+X
+X
l
l
l
l
h
-b
+X
h
h
h
@@ -624,24 +624,24 @@ h
h
h
h
-b
+X
j
h
c
h
-b
+X
h
-b
-b
+X
+X
"}
(20,1,1) = {"
-b
+X
l
l
l
l
-b
-b
+X
+X
p
h
c
@@ -650,27 +650,27 @@ k
h
h
o
-b
+X
l
l
l
-b
+X
E
-b
+X
G
o
"}
(21,1,1) = {"
g
-b
+X
l
l
l
l
l
-b
+X
h
-b
+X
h
h
h
@@ -684,26 +684,26 @@ l
l
j
j
-b
+X
"}
(22,1,1) = {"
c
c
-b
+X
l
l
-b
+X
h
h
t
-b
+X
h
h
h
h
h
m
-b
+X
l
l
l
@@ -713,11 +713,11 @@ j
j
"}
(23,1,1) = {"
-b
+X
h
m
n
-b
+X
h
l
o
@@ -726,23 +726,23 @@ u
r
p
h
-b
+X
h
-b
+X
l
l
l
-b
-b
+X
+X
w
-b
-b
+X
+X
"}
(24,1,1) = {"
a
a
-b
-b
+X
+X
l
l
l
@@ -761,7 +761,7 @@ l
c
l
l
-b
+X
a
"}
(25,1,1) = {"
@@ -775,9 +775,9 @@ l
j
l
l
-b
+X
h
-b
+X
x
h
l
@@ -795,7 +795,7 @@ a
a
a
c
-b
+X
l
l
l
@@ -804,14 +804,14 @@ l
l
g
l
-b
+X
h
l
l
l
c
m
-b
+X
a
a
a
@@ -820,9 +820,9 @@ a
a
a
a
-b
+X
h
-b
+X
l
l
l
@@ -836,7 +836,7 @@ l
l
l
l
-b
+X
a
a
a
@@ -848,9 +848,9 @@ a
a
a
c
-b
+X
l
-b
+X
l
l
l
@@ -859,7 +859,7 @@ l
l
l
l
-b
+X
l
f
a
@@ -873,11 +873,11 @@ a
a
a
a
-b
-b
+X
+X
f
c
-b
+X
l
c
l
@@ -887,7 +887,7 @@ l
c
o
l
-b
+X
a
a
a
@@ -902,16 +902,16 @@ a
a
g
c
-b
+X
l
l
-b
+X
m
l
-b
+X
l
f
-b
+X
a
a
a
@@ -928,11 +928,11 @@ a
a
a
a
-b
+X
l
-b
+X
a
-b
+X
l
c
f
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_elite_tumor.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_elite_tumor.dmm
index 62721ec4f3da..f8c1633f7779 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_elite_tumor.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_elite_tumor.dmm
@@ -26,107 +26,67 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
-"V" = (
-/obj/effect/mapping_helpers/no_lava,
-/turf/template_noop,
-/area/template_noop)
(1,1,1) = {"
a
a
+u
a
a
a
-a
-a
-a
-a
+u
"}
(2,1,1) = {"
a
-V
-V
-V
-V
-V
-V
-V
-a
-"}
-(3,1,1) = {"
-a
-V
u
E
u
u
u
-V
a
"}
-(4,1,1) = {"
-a
-V
+(3,1,1) = {"
+u
u
u
u
u
q
-V
-a
+u
"}
-(5,1,1) = {"
-a
-V
+(4,1,1) = {"
+u
u
u
k
u
u
-V
a
"}
-(6,1,1) = {"
+(5,1,1) = {"
a
-V
u
M
u
u
u
-V
-a
+u
"}
-(7,1,1) = {"
+(6,1,1) = {"
+a
a
-V
-u
-u
u
+a
u
u
-V
-a
-"}
-(8,1,1) = {"
-a
-V
-V
-V
-V
-V
-V
-V
a
"}
-(9,1,1) = {"
-a
-a
-a
-a
-a
+(7,1,1) = {"
a
+u
a
+u
+u
a
a
"}
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm
index c0c70a88b393..340e908d7496 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm
@@ -2,9 +2,6 @@
"a" = (
/turf/simulated/mineral/volcanic/lava_land_surface,
/area/lavaland/surface/outdoors)
-"b" = (
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
"c" = (
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
@@ -71,6 +68,9 @@
},
/turf/simulated/floor/plasteel/freezer,
/area/ruin/powered/gluttony)
+"u" = (
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
"v" = (
/obj/machinery/light/small,
/turf/simulated/floor/plasteel/freezer,
@@ -101,19 +101,19 @@
a
a
a
-b
-b
+u
+u
a
a
-b
+u
a
-b
-b
-b
-b
-b
-b
-b
+u
+u
+u
+u
+u
+u
+u
a
a
a
@@ -123,54 +123,54 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
a
a
a
a
"}
(3,1,1) = {"
-b
+u
a
a
a
-b
-b
-b
+u
+u
+u
c
c
c
-b
+u
c
c
c
-b
-b
+u
+u
a
a
a
a
"}
(4,1,1) = {"
-b
+u
a
a
a
-b
-b
-b
+u
+u
+u
c
R
R
@@ -178,7 +178,7 @@ S
R
R
c
-b
+u
a
a
a
@@ -186,13 +186,13 @@ a
a
"}
(5,1,1) = {"
-b
-b
+u
+u
a
a
a
-b
-b
+u
+u
c
R
h
@@ -200,7 +200,7 @@ i
o
R
c
-b
+u
a
a
a
@@ -213,8 +213,8 @@ a
a
a
a
-b
-b
+u
+u
c
R
i
@@ -222,21 +222,21 @@ i
v
R
c
-b
-b
-b
-b
-b
+u
+u
+u
+u
+u
a
"}
(7,1,1) = {"
a
-b
-b
-b
-b
-b
-b
+u
+u
+u
+u
+u
+u
c
R
i
@@ -244,16 +244,16 @@ l
i
R
c
-b
-b
-b
-b
-b
+u
+u
+u
+u
+u
a
"}
(8,1,1) = {"
a
-b
+u
c
c
c
@@ -271,11 +271,11 @@ c
c
c
c
-b
+u
"}
(9,1,1) = {"
-b
-b
+u
+u
c
R
R
@@ -293,11 +293,11 @@ R
R
R
c
-b
+u
"}
(10,1,1) = {"
a
-b
+u
c
R
e
@@ -315,11 +315,11 @@ l
i
R
c
-b
+u
"}
(11,1,1) = {"
a
-b
+u
c
R
f
@@ -336,12 +336,12 @@ i
i
i
S
-b
-b
+u
+u
"}
(12,1,1) = {"
a
-b
+u
c
R
e
@@ -359,11 +359,11 @@ i
q
R
c
-b
+u
"}
(13,1,1) = {"
a
-b
+u
c
R
R
@@ -381,11 +381,11 @@ R
R
R
c
-b
+u
"}
(14,1,1) = {"
a
-b
+u
c
c
c
@@ -403,16 +403,16 @@ c
c
c
c
-b
+u
"}
(15,1,1) = {"
a
-b
-b
-b
-b
-b
-b
+u
+u
+u
+u
+u
+u
c
R
i
@@ -420,21 +420,21 @@ g
i
R
c
-b
-b
-b
-b
-b
-b
+u
+u
+u
+u
+u
+u
"}
(16,1,1) = {"
-b
-b
-b
+u
+u
+u
a
-b
-b
-b
+u
+u
+u
c
R
j
@@ -442,21 +442,21 @@ i
v
R
c
-b
-b
-b
+u
+u
+u
a
a
a
"}
(17,1,1) = {"
-b
-b
-b
+u
+u
+u
a
-b
-b
-b
+u
+u
+u
c
R
i
@@ -464,9 +464,9 @@ n
i
R
c
-b
-b
-b
+u
+u
+u
a
a
a
@@ -476,9 +476,9 @@ a
a
a
a
-b
-b
-b
+u
+u
+u
c
R
R
@@ -486,9 +486,9 @@ S
R
R
c
-b
-b
-b
+u
+u
+u
a
a
a
@@ -504,12 +504,12 @@ a
c
c
c
-b
+u
c
c
c
-b
-b
+u
+u
a
a
a
@@ -523,16 +523,16 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
+u
+u
+u
+u
+u
+u
+u
a
a
-b
+u
a
a
a
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
index 33d456c77ea2..4ecc08bc9cf8 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
@@ -67,11 +67,6 @@
/obj/machinery/mineral/equipment_vendor/golem,
/turf/simulated/floor/mineral/titanium/purple,
/area/shuttle/freegolem)
-"r" = (
-/obj/machinery/door/airlock/titanium,
-/obj/structure/fans/tiny,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
"s" = (
/obj/machinery/light{
dir = 8
@@ -258,6 +253,11 @@
},
/turf/simulated/floor/plating/lavaland_air,
/area/shuttle/freegolem)
+"W" = (
+/obj/machinery/door/airlock/titanium,
+/obj/structure/fans/tiny,
+/turf/simulated/floor/mineral/titanium/purple,
+/area/shuttle/freegolem)
(1,1,1) = {"
a
@@ -301,12 +301,12 @@ a
a
b
b
-r
+W
b
x
D
b
-r
+W
b
b
a
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
index 3c73fa6c9021..cc4a29fd3ea9 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
@@ -9,14 +9,9 @@
/turf/simulated/wall/mineral/iron,
/area/ruin/powered)
"d" = (
-/obj/item/clothing/head/helmet/space/syndicate/orange,
/obj/item/clothing/mask/breath,
/turf/simulated/floor/plating,
/area/ruin/powered)
-"e" = (
-/obj/item/clothing/suit/space/syndicate/orange,
-/turf/simulated/floor/plating,
-/area/ruin/powered)
"g" = (
/turf/simulated/floor/plating/asteroid{
name = "dirt"
@@ -172,7 +167,7 @@
/obj/effect/baseturf_helper,
/turf/simulated/floor/plating,
/area/ruin/powered)
-"P" = (
+"Q" = (
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
@@ -180,83 +175,14 @@
/obj/item/flashlight/lantern,
/turf/simulated/floor/plating,
/area/ruin/powered)
+"Z" = (
+/turf/template_noop,
+/area/template_noop)
(1,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-P
-P
-P
-a
-a
-a
-a
-a
-"}
-(2,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-P
-P
-s
-a
-a
-a
-"}
-(3,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-P
-P
-P
-s
-a
-a
-"}
-(4,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-P
-P
-P
-s
-a
-"}
-(5,1,1) = {"
-a
-a
-a
+Z
+Z
+Z
a
a
b
@@ -267,13 +193,13 @@ t
t
t
t
-P
-P
+Q
+Q
a
"}
-(6,1,1) = {"
-a
-a
+(2,1,1) = {"
+Z
+Z
a
a
b
@@ -285,11 +211,11 @@ v
x
B
t
-P
-P
-s
+Q
+Q
+Q
"}
-(7,1,1) = {"
+(3,1,1) = {"
a
a
a
@@ -303,11 +229,11 @@ w
y
y
D
-P
-P
+Q
+Q
a
"}
-(8,1,1) = {"
+(4,1,1) = {"
a
b
b
@@ -321,11 +247,11 @@ o
z
C
t
-P
-P
+Q
+Q
a
"}
-(9,1,1) = {"
+(5,1,1) = {"
b
b
g
@@ -339,11 +265,11 @@ o
t
t
t
-P
+Q
s
a
"}
-(10,1,1) = {"
+(6,1,1) = {"
b
d
g
@@ -357,13 +283,13 @@ o
A
b
a
-P
-P
+Q
+Q
s
"}
-(11,1,1) = {"
+(7,1,1) = {"
c
-e
+o
h
g
l
@@ -376,10 +302,10 @@ c
b
a
a
-P
+Q
s
"}
-(12,1,1) = {"
+(8,1,1) = {"
b
b
o
@@ -397,7 +323,7 @@ E
H
E
"}
-(13,1,1) = {"
+(9,1,1) = {"
a
b
b
@@ -408,19 +334,14 @@ a
a
a
a
-a
-a
+Z
+Z
a
F
I
F
"}
-(14,1,1) = {"
-a
-a
-a
-a
-a
+(10,1,1) = {"
a
a
a
@@ -428,44 +349,49 @@ a
a
a
a
+Z
+Z
+Z
+Z
+Z
a
F
I
F
"}
-(15,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+(11,1,1) = {"
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
a
F
J
G
"}
-(16,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+(12,1,1) = {"
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+a
+Q
+Q
+Q
"}
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm
index 2eba0969e53a..cab297ad35b9 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm
@@ -2,9 +2,6 @@
"a" = (
/turf/simulated/wall/indestructible/hierophant,
/area/ruin/unpowered/hierophant)
-"b" = (
-/turf/simulated/floor/indestructible/hierophant,
-/area/ruin/unpowered/hierophant)
"c" = (
/obj/effect/light_emitter{
light_power = 5;
@@ -30,15 +27,18 @@
/obj/effect/baseturf_helper/lava/mapping_lava,
/turf/simulated/floor/indestructible/hierophant/two,
/area/ruin/unpowered/hierophant)
+"r" = (
+/turf/simulated/floor/indestructible/hierophant,
+/area/ruin/unpowered/hierophant)
(1,1,1) = {"
a
a
a
-b
-b
-b
-b
+r
+r
+r
+r
a
a
a
@@ -48,146 +48,146 @@ a
a
a
a
-b
-b
-b
-b
+r
+r
+r
+r
a
a
a
"}
(2,1,1) = {"
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-c
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+c
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
a
"}
(3,1,1) = {"
a
-b
-b
-b
+r
+r
+r
c
c
-b
-b
-b
+r
+r
+r
a
-b
-b
-b
+r
+r
+r
a
-b
-b
-b
+r
+r
+r
c
c
-b
-b
-b
+r
+r
+r
a
"}
(4,1,1) = {"
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
"}
(5,1,1) = {"
-b
-b
+r
+r
c
-b
+r
a
a
-b
+r
c
-b
-b
-b
+r
+r
+r
c
-b
-b
-b
+r
+r
+r
c
-b
+r
a
a
-b
+r
c
-b
-b
+r
+r
"}
(6,1,1) = {"
-b
-b
+r
+r
c
-b
+r
a
a
-b
+r
c
-b
-b
-b
+r
+r
+r
c
-b
-b
-b
+r
+r
+r
c
-b
+r
a
a
-b
+r
c
-b
-b
+r
+r
"}
(7,1,1) = {"
-b
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
+r
e
e
e
@@ -199,18 +199,18 @@ e
e
e
e
-b
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
+r
"}
(8,1,1) = {"
a
-b
-b
-b
+r
+r
+r
c
c
e
@@ -226,18 +226,18 @@ e
e
c
c
-b
-b
-b
+r
+r
+r
a
"}
(9,1,1) = {"
a
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
e
e
e
@@ -249,20 +249,20 @@ e
e
e
e
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
a
"}
(10,1,1) = {"
a
-b
+r
a
-b
-b
-b
+r
+r
+r
e
a
e
@@ -274,20 +274,20 @@ e
e
a
e
-b
-b
-b
+r
+r
+r
a
-b
+r
a
"}
(11,1,1) = {"
a
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
e
e
e
@@ -299,18 +299,18 @@ e
e
e
e
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
a
"}
(12,1,1) = {"
a
c
-b
-b
+r
+r
c
c
e
@@ -326,18 +326,18 @@ e
e
c
c
-b
-b
+r
+r
c
a
"}
(13,1,1) = {"
a
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
e
e
e
@@ -349,20 +349,20 @@ e
e
e
e
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
a
"}
(14,1,1) = {"
a
-b
+r
a
-b
-b
-b
+r
+r
+r
e
a
e
@@ -374,20 +374,20 @@ e
e
a
e
-b
-b
-b
+r
+r
+r
a
-b
+r
a
"}
(15,1,1) = {"
a
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
e
e
e
@@ -399,18 +399,18 @@ e
e
e
e
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
a
"}
(16,1,1) = {"
a
-b
-b
-b
+r
+r
+r
c
c
e
@@ -426,18 +426,18 @@ e
e
c
c
-b
-b
-b
+r
+r
+r
a
"}
(17,1,1) = {"
-b
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
+r
e
e
e
@@ -449,146 +449,146 @@ e
e
e
e
-b
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
+r
"}
(18,1,1) = {"
-b
-b
+r
+r
c
-b
+r
a
a
-b
+r
c
-b
-b
-b
+r
+r
+r
c
-b
-b
-b
+r
+r
+r
c
-b
+r
a
a
-b
+r
c
-b
-b
+r
+r
"}
(19,1,1) = {"
-b
-b
+r
+r
c
-b
+r
a
a
-b
+r
c
-b
-b
-b
+r
+r
+r
c
-b
-b
-b
+r
+r
+r
c
-b
+r
a
a
-b
+r
c
-b
-b
+r
+r
"}
(20,1,1) = {"
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
"}
(21,1,1) = {"
a
-b
-b
-b
+r
+r
+r
c
c
-b
-b
-b
+r
+r
+r
a
-b
-b
-b
+r
+r
+r
a
-b
-b
-b
+r
+r
+r
c
c
-b
-b
-b
+r
+r
+r
a
"}
(22,1,1) = {"
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-c
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+c
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
a
"}
(23,1,1) = {"
a
a
a
-b
-b
-b
-b
+r
+r
+r
+r
a
a
a
@@ -598,10 +598,10 @@ a
a
a
a
-b
-b
-b
-b
+r
+r
+r
+r
a
a
a
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
index e21f413c620f..95a68100f271 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
@@ -2,9 +2,6 @@
"a" = (
/turf/template_noop,
/area/template_noop)
-"b" = (
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
"c" = (
/obj/structure/lattice,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
@@ -217,74 +214,77 @@
"Q" = (
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/powered/pizza_party)
+"Y" = (
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
(1,1,1) = {"
a
a
-b
-b
+Y
+Y
a
a
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
a
a
a
a
"}
(2,1,1) = {"
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
-b
-b
-b
-b
+Y
+Y
+Y
+Y
a
a
"}
(3,1,1) = {"
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
c
c
e
e
c
c
-b
-b
-b
+Y
+Y
+Y
a
"}
(4,1,1) = {"
-b
-b
-b
-b
+Y
+Y
+Y
+Y
d
-b
+Y
c
c
e
@@ -294,17 +294,17 @@ e
Q
e
d
-b
-b
+Y
+Y
a
"}
(5,1,1) = {"
a
-b
-b
-b
+Y
+Y
+Y
d
-b
+Y
m
e
w
@@ -314,15 +314,15 @@ h
h
e
d
-b
-b
-b
+Y
+Y
+Y
"}
(6,1,1) = {"
a
-b
-b
-b
+Y
+Y
+Y
d
f
n
@@ -333,16 +333,16 @@ e
M
e
c
-b
-b
-b
-b
+Y
+Y
+Y
+Y
"}
(7,1,1) = {"
-b
-b
-b
-b
+Y
+Y
+Y
+Y
d
g
o
@@ -352,17 +352,17 @@ C
J
h
d
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
"}
(8,1,1) = {"
-b
-b
-b
-b
+Y
+Y
+Y
+Y
e
h
p
@@ -372,16 +372,16 @@ D
K
M
d
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
"}
(9,1,1) = {"
-b
-b
-b
+Y
+Y
+Y
c
e
i
@@ -392,16 +392,16 @@ E
h
h
c
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
"}
(10,1,1) = {"
-b
-b
-b
+Y
+Y
+Y
c
e
j
@@ -412,17 +412,17 @@ F
q
N
c
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
"}
(11,1,1) = {"
-b
-b
-b
-b
+Y
+Y
+Y
+Y
e
e
h
@@ -432,17 +432,17 @@ G
q
h
c
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
"}
(12,1,1) = {"
-b
-b
-b
-b
+Y
+Y
+Y
+Y
d
k
h
@@ -452,17 +452,17 @@ H
h
O
d
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
"}
(13,1,1) = {"
-b
-b
-b
-b
+Y
+Y
+Y
+Y
d
k
h
@@ -472,17 +472,17 @@ s
o
n
d
-b
-b
-b
-b
+Y
+Y
+Y
+Y
a
"}
(14,1,1) = {"
-b
-b
-b
-b
+Y
+Y
+Y
+Y
d
l
i
@@ -492,17 +492,17 @@ I
L
P
d
-b
-b
-b
-b
+Y
+Y
+Y
+Y
a
"}
(15,1,1) = {"
-b
-b
-b
-b
+Y
+Y
+Y
+Y
d
d
e
@@ -512,48 +512,48 @@ e
e
d
d
-b
-b
-b
-b
+Y
+Y
+Y
+Y
a
"}
(16,1,1) = {"
a
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
c
v
-b
+Y
c
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
a
"}
(17,1,1) = {"
a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
a
a
a
@@ -563,14 +563,14 @@ a
a
a
a
-b
-b
-b
-b
-b
-b
-b
-b
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
a
a
a
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pride.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pride.dmm
index 754614d2091e..849fa32764a7 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pride.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pride.dmm
@@ -1,7 +1,4 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
"b" = (
/turf/simulated/mineral/volcanic/lava_land_surface,
/area/lavaland/surface/outdoors)
@@ -75,6 +72,9 @@
/obj/structure/mirror/magic/pride,
/turf/simulated/wall/mineral/diamond,
/area/ruin/powered/pride)
+"P" = (
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
"Y" = (
/obj/machinery/door/airlock/diamond,
/obj/structure/fans/tiny/invisible,
@@ -82,30 +82,30 @@
/area/ruin/powered/pride)
(1,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+P
+P
+P
+P
+P
+P
+P
+P
+P
+P
+P
+P
+P
+P
+P
+P
+P
+P
+P
+P
"}
(2,1,1) = {"
-a
-a
+P
+P
c
c
c
@@ -123,7 +123,7 @@ c
c
c
c
-a
+P
"}
(3,1,1) = {"
b
@@ -145,7 +145,7 @@ G
G
G
c
-a
+P
"}
(4,1,1) = {"
c
@@ -167,7 +167,7 @@ e
e
G
c
-a
+P
"}
(5,1,1) = {"
c
@@ -188,8 +188,8 @@ g
g
r
G
-a
-a
+P
+P
"}
(6,1,1) = {"
c
@@ -210,8 +210,8 @@ g
g
g
Y
-a
-a
+P
+P
"}
(7,1,1) = {"
c
@@ -233,7 +233,7 @@ g
r
G
c
-a
+P
"}
(8,1,1) = {"
c
@@ -255,7 +255,7 @@ f
f
G
c
-a
+P
"}
(9,1,1) = {"
b
@@ -277,7 +277,7 @@ G
G
G
c
-a
+P
"}
(10,1,1) = {"
b
@@ -299,5 +299,5 @@ c
c
c
c
-a
+P
"}
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_puzzle.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_puzzle.dmm
index 75b4c619445b..a00f000ad969 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_puzzle.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_puzzle.dmm
@@ -1,7 +1,4 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/turf/template_noop,
-/area/lavaland/surface/outdoors)
"b" = (
/obj/effect/sliding_puzzle/lavaland,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
@@ -9,39 +6,42 @@
"c" = (
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"n" = (
+/turf/template_noop,
+/area/lavaland/surface/outdoors)
(1,1,1) = {"
-a
-a
-a
-a
-a
+n
+n
+n
+n
+n
"}
(2,1,1) = {"
-a
+n
c
c
c
-a
+n
"}
(3,1,1) = {"
-a
+n
c
b
c
-a
+n
"}
(4,1,1) = {"
-a
+n
c
c
c
-a
+n
"}
(5,1,1) = {"
-a
-a
-a
-a
-a
+n
+n
+n
+n
+n
"}
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
index 1840bd959f46..1ba79151f953 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
@@ -1,4 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/turf/simulated/mineral/volcanic/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
"ag" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -486,84 +489,84 @@ QX
QX
QX
yZ
-BC
-BC
-BC
-BC
-BC
-BC
-BC
-BC
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
QX
-BC
+aa
QX
-BC
-BC
-BC
-BC
-BC
-BC
+aa
+aa
+aa
+aa
+aa
+aa
QX
QX
QX
"}
(2,1,1) = {"
QX
-BC
-yZ
-yZ
-yZ
-BC
-BC
-BC
-BC
-BC
-BC
-BC
-BC
-BC
-BC
-BC
-BC
-BC
+aa
+yZ
+yZ
+yZ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
QX
-BC
-BC
-BC
-BC
-BC
+aa
+aa
+aa
+aa
+aa
"}
(3,1,1) = {"
QX
-BC
-BC
+aa
+aa
yZ
yZ
-BC
+aa
yZ
yZ
yZ
-BC
+aa
yZ
yZ
yZ
yZ
-BC
-BC
-BC
-BC
-BC
-BC
-BC
-BC
-BC
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
QX
"}
(4,1,1) = {"
-BC
-BC
-BC
-BC
+aa
+aa
+aa
+aa
yZ
BC
yZ
@@ -579,16 +582,16 @@ yZ
yZ
yZ
yZ
-BC
+aa
yZ
-BC
-BC
-BC
+aa
+aa
+aa
"}
(5,1,1) = {"
-BC
+aa
QX
-BC
+aa
yZ
yZ
yZ
@@ -608,13 +611,13 @@ yZ
yZ
yZ
yZ
-BC
-BC
+aa
+aa
"}
(6,1,1) = {"
-BC
-BC
-BC
+aa
+aa
+aa
yZ
yZ
no
@@ -633,14 +636,14 @@ no
no
yZ
yZ
-BC
-BC
-BC
+aa
+aa
+aa
"}
(7,1,1) = {"
-BC
-BC
-BC
+aa
+aa
+aa
yZ
no
no
@@ -659,13 +662,13 @@ no
no
no
yZ
-BC
-BC
-BC
+aa
+aa
+aa
"}
(8,1,1) = {"
-BC
-BC
+aa
+aa
yZ
yZ
no
@@ -685,13 +688,13 @@ vt
AG
no
yZ
-BC
-BC
-BC
+aa
+aa
+aa
"}
(9,1,1) = {"
-BC
-BC
+aa
+aa
yZ
yZ
no
@@ -712,13 +715,13 @@ AG
no
yZ
yZ
-BC
+aa
QX
"}
(10,1,1) = {"
QX
-BC
-BC
+aa
+aa
yZ
no
Pg
@@ -743,8 +746,8 @@ yZ
"}
(11,1,1) = {"
QX
-BC
-BC
+aa
+aa
yZ
no
Pg
@@ -765,12 +768,12 @@ no
yZ
yZ
yZ
-BC
+aa
"}
(12,1,1) = {"
QX
-BC
-BC
+aa
+aa
yZ
no
no
@@ -790,12 +793,12 @@ no
no
yZ
yZ
-BC
-BC
+aa
+aa
"}
(13,1,1) = {"
-BC
-BC
+aa
+aa
yZ
yZ
Nj
@@ -815,14 +818,14 @@ no
no
Nj
yZ
-BC
-BC
-BC
+aa
+aa
+aa
"}
(14,1,1) = {"
-BC
-BC
-BC
+aa
+aa
+aa
yZ
yZ
no
@@ -841,15 +844,15 @@ Nj
no
yZ
yZ
-BC
-BC
-BC
+aa
+aa
+aa
"}
(15,1,1) = {"
-BC
-BC
-BC
-BC
+aa
+aa
+aa
+aa
yZ
al
yc
@@ -868,12 +871,12 @@ ja
yZ
yZ
yZ
-BC
-BC
+aa
+aa
"}
(16,1,1) = {"
-BC
-BC
+aa
+aa
yZ
yZ
yZ
@@ -893,14 +896,14 @@ no
no
yZ
yZ
-BC
-BC
+aa
+aa
QX
"}
(17,1,1) = {"
QX
-BC
-BC
+aa
+aa
yZ
no
no
@@ -920,12 +923,12 @@ no
no
yZ
yZ
-BC
-BC
+aa
+aa
"}
(18,1,1) = {"
-BC
-BC
+aa
+aa
yZ
yZ
no
@@ -947,11 +950,11 @@ no
yZ
yZ
yZ
-BC
+aa
"}
(19,1,1) = {"
-BC
-BC
+aa
+aa
yZ
yZ
no
@@ -972,11 +975,11 @@ iV
no
yZ
yZ
-BC
-BC
+aa
+aa
"}
(20,1,1) = {"
-BC
+aa
yZ
yZ
yZ
@@ -998,8 +1001,8 @@ ga
no
yZ
yZ
-BC
-BC
+aa
+aa
"}
(21,1,1) = {"
yZ
@@ -1025,12 +1028,12 @@ no
yZ
yZ
yZ
-BC
+aa
"}
(22,1,1) = {"
QX
yZ
-BC
+aa
yZ
no
MB
@@ -1050,12 +1053,12 @@ uO
no
yZ
yZ
-BC
-BC
+aa
+aa
"}
(23,1,1) = {"
-BC
-BC
+aa
+aa
yZ
yZ
no
@@ -1077,11 +1080,11 @@ no
yZ
yZ
yZ
-BC
+aa
"}
(24,1,1) = {"
QX
-BC
+aa
yZ
yZ
no
@@ -1102,12 +1105,12 @@ no
no
yZ
yZ
-BC
+aa
QX
"}
(25,1,1) = {"
-BC
-BC
+aa
+aa
yZ
yZ
Nj
@@ -1128,13 +1131,13 @@ no
Nj
yZ
yZ
-BC
-BC
+aa
+aa
"}
(26,1,1) = {"
-BC
-BC
-BC
+aa
+aa
+aa
yZ
yZ
no
@@ -1155,13 +1158,13 @@ yZ
yZ
yZ
yZ
-BC
+aa
"}
(27,1,1) = {"
-BC
-BC
-BC
-BC
+aa
+aa
+aa
+aa
yZ
al
yc
@@ -1179,14 +1182,14 @@ yc
ja
yZ
yZ
-BC
-BC
-BC
+aa
+aa
+aa
"}
(28,1,1) = {"
-BC
+aa
QX
-BC
+aa
yZ
yZ
yZ
@@ -1205,14 +1208,14 @@ yZ
yZ
yZ
yZ
-BC
-BC
+aa
+aa
QX
"}
(29,1,1) = {"
-BC
-BC
-BC
+aa
+aa
+aa
BC
BC
yZ
@@ -1231,14 +1234,14 @@ yZ
yZ
BC
yZ
-BC
-BC
-BC
+aa
+aa
+aa
"}
(30,1,1) = {"
QX
QX
-BC
+aa
BC
BC
yZ
@@ -1257,14 +1260,14 @@ yZ
yZ
yZ
BC
-BC
-BC
-BC
+aa
+aa
+aa
"}
(31,1,1) = {"
QX
-BC
-BC
+aa
+aa
BC
BC
yZ
@@ -1283,12 +1286,12 @@ BC
BC
yZ
BC
-BC
+aa
QX
-BC
+aa
"}
(32,1,1) = {"
-BC
+aa
QX
QX
BC
@@ -1309,13 +1312,13 @@ yZ
BC
BC
QX
-BC
-BC
+aa
+aa
QX
"}
(33,1,1) = {"
QX
-BC
+aa
BC
BC
BC
@@ -1335,9 +1338,9 @@ BC
BC
BC
BC
-BC
-BC
-BC
+aa
+aa
+aa
"}
(34,1,1) = {"
QX
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm
index ff9271dfe3d8..0f0b47cb8109 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm
@@ -41,10 +41,6 @@
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
-"j" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
"k" = (
/obj/machinery/sleeper/survival_pod,
/turf/simulated/floor/pod/dark,
@@ -129,6 +125,10 @@
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"L" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
(1,1,1) = {"
a
@@ -218,8 +218,8 @@ d
d
d
y
-j
-j
+L
+L
"}
(8,1,1) = {"
a
@@ -229,8 +229,8 @@ b
i
b
i
-j
-j
+L
+L
b
b
"}
@@ -239,7 +239,7 @@ a
a
b
b
-j
+L
n
s
b
@@ -254,7 +254,7 @@ a
a
a
o
-j
+L
b
a
a
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_sec_shuttle.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_sec_shuttle.dmm
index fbdf10f74a1c..6eddc1288d95 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_sec_shuttle.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_sec_shuttle.dmm
@@ -9,10 +9,10 @@
/turf/simulated/floor/plating/airless,
/area/ruin/space/sec_shuttle)
"c" = (
+/obj/effect/mapping_helpers/airlock/access/all/centcomm/specops,
/obj/machinery/door/airlock/external{
id_tag = "s_docking_airlock";
- name = "Shuttle Hatch";
- req_access_txt = "109"
+ name = "Shuttle Hatch"
},
/turf/simulated/floor/plasteel/airless{
icon_state = "dark"
@@ -176,10 +176,10 @@
},
/area/ruin/space/sec_shuttle)
"T" = (
+/obj/effect/mapping_helpers/airlock/access/all/centcomm/specops,
/obj/machinery/door/airlock/external{
id_tag = "s_docking_airlock";
- name = "Shuttle Hatch";
- req_access_txt = "109"
+ name = "Shuttle Hatch"
},
/turf/simulated/floor/plating/airless,
/area/ruin/space/sec_shuttle)
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm b/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm
index 0685cdb39eb4..dc0aad02f007 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm
@@ -141,7 +141,7 @@
/turf/simulated/floor/plating/burnt/airless,
/area/space)
"U" = (
-/obj/effect/spawner/random_barrier/wall_probably,
+/obj/effect/spawner/random/barrier/wall_probably,
/turf/space,
/area/space)
"V" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
index 3ac6de203148..848637b6e12e 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -275,9 +275,8 @@
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"aR" = (
-/obj/machinery/door/airlock/highsecurity{
- req_access_txt = "512"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/highsecurity,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -771,9 +770,8 @@
},
/area/ruin/space/deepstorage)
"co" = (
-/obj/machinery/door/airlock/hatch{
- req_access_txt = "512"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/hatch,
/obj/structure/barricade/wooden/crude{
layer = 4
},
@@ -1029,9 +1027,8 @@
},
/area/ruin/space/deepstorage)
"eq" = (
-/obj/machinery/door/airlock/maintenance_hatch{
- req_access_txt = "512"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/maintenance_hatch,
/turf/simulated/floor/plating,
/area/ruin/space/deepstorage)
"es" = (
@@ -1284,6 +1281,7 @@
/area/ruin/space/deepstorage)
"gq" = (
/obj/structure/rack,
+/obj/effect/spawner/lootdrop/bluespace_tap/cultural,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "vault"
@@ -1439,8 +1437,8 @@
/turf/simulated/floor/plating,
/area/ruin/space/deepstorage)
"hp" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/hatch{
- req_access_txt = "512";
name = "Guard Wing"
},
/obj/structure/barricade/wooden/crude{
@@ -1691,8 +1689,8 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/deepstorage)
"jj" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/highsecurity{
- req_access_txt = "512";
name = "Guard Store Room"
},
/obj/effect/decal/cleanable/dirt,
@@ -1855,9 +1853,9 @@
/area/ruin/space/deepstorage)
"jT" = (
/obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/vault{
- locked = 1;
- req_access_txt = "512"
+ locked = 1
},
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
@@ -2169,9 +2167,8 @@
/obj/structure/barricade/wooden/crude{
layer = 4
},
-/obj/machinery/door/airlock/centcom{
- req_access_txt = "512"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/centcom,
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"mf" = (
@@ -2664,9 +2661,11 @@
},
/area/ruin/space/deepstorage)
"pk" = (
-/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt,
-/obj/item/salvage/ruin/russian,
+/obj/item/salvage/ruin/soviet,
+/obj/structure/rack,
+/obj/item/stack/spacecash/c500,
+/obj/effect/spawner/lootdrop/bluespace_tap/cultural,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
@@ -2675,9 +2674,8 @@
"ps" = (
/obj/structure/rack,
/obj/effect/turf_decal/delivery/hollow,
-/obj/item/grenade/confetti,
-/obj/item/grenade/confetti,
-/obj/item/grenade/confetti,
+/obj/item/stack/spacecash/c500,
+/obj/effect/spawner/lootdrop/bluespace_tap/organic,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
@@ -2688,8 +2686,8 @@
/turf/simulated/floor/plating/asteroid/basalt/airless,
/area/ruin/space/unpowered)
"pz" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/command/glass{
- req_access_txt = "512";
name = "Floor Administrator's Office"
},
/obj/effect/mapping_helpers/airlock/polarized{
@@ -2741,9 +2739,8 @@
/obj/structure/barricade/wooden/crude{
layer = 4
},
-/obj/machinery/door/airlock/hatch{
- req_access_txt = "512"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/hatch,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "podfloor"
@@ -2973,9 +2970,8 @@
/area/ruin/space/deepstorage)
"rK" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/hatch{
- req_access_txt = "512"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/hatch,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "podfloor"
@@ -3532,7 +3528,7 @@
},
/area/ruin/space/deepstorage)
"vo" = (
-/obj/item/salvage/ruin/russian,
+/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -3775,9 +3771,8 @@
/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/deepstorage)
"wH" = (
-/obj/machinery/door/airlock/hatch{
- req_access_txt = "512"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/hatch,
/obj/machinery/door/poddoor/shutters/preopen{
dir = 2;
id_tag = "DS_Quartermaster"
@@ -3857,8 +3852,8 @@
},
/area/ruin/space/deepstorage)
"xC" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/highsecurity{
- req_access_txt = "512";
name = "Interrogation Room"
},
/turf/simulated/floor/plasteel{
@@ -3940,7 +3935,11 @@
/area/ruin/space/deepstorage)
"ye" = (
/obj/structure/table/reinforced,
-/obj/item/salvage/ruin/russian,
+/obj/item/salvage/ruin/soviet,
+/obj/structure/rack,
+/obj/item/grenade/confetti,
+/obj/item/grenade/confetti,
+/obj/item/grenade/confetti,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "vault"
@@ -4105,9 +4104,9 @@
/turf/simulated/floor/mineral/titanium,
/area/ruin/space/deepstorage)
"zh" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/highsecurity{
- name = "Incinerator";
- req_access_txt = "512"
+ name = "Incinerator"
},
/turf/simulated/floor/plasteel{
icon_state = "cult"
@@ -4166,9 +4165,9 @@
/turf/simulated/floor/plating,
/area/ruin/space/deepstorage)
"zy" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/vault{
- locked = 1;
- req_access_txt = "512"
+ locked = 1
},
/obj/structure/fans/tiny,
/turf/simulated/floor/catwalk,
@@ -4189,9 +4188,8 @@
/obj/structure/barricade/wooden/crude{
layer = 4
},
-/obj/machinery/door/airlock/hatch{
- req_access_txt = "512"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/hatch,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -4318,9 +4316,9 @@
/area/ruin/space/deepstorage)
"As" = (
/obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/vault{
- name = "Auxiliary Power Room";
- req_access_txt = "512"
+ name = "Auxiliary Power Room"
},
/obj/machinery/door/poddoor/multi_tile/impassable{
id_tag = "DS_Engineering"
@@ -4353,8 +4351,8 @@
},
/area/ruin/space/deepstorage)
"AA" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/highsecurity{
- req_access_txt = "512";
name = "Evidence Storage"
},
/turf/simulated/floor/plasteel{
@@ -4673,10 +4671,10 @@
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"Cn" = (
-/obj/structure/safe,
/obj/effect/turf_decal/delivery/hollow,
-/obj/item/stack/spacecash/c500,
-/obj/effect/spawner/random/deepstorage_award,
+/obj/structure/rack,
+/obj/effect/spawner/random/deepstorage_reward,
+/obj/effect/spawner/random/deepstorage_reward,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
@@ -4812,7 +4810,7 @@
/obj/structure/railing{
dir = 8
},
-/obj/item/salvage/ruin/russian,
+/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -5367,9 +5365,8 @@
},
/area/ruin/space/deepstorage)
"Hx" = (
-/obj/machinery/door/airlock/hatch{
- req_access_txt = "512"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/hatch,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -5482,8 +5479,8 @@
/area/ruin/space/deepstorage)
"IR" = (
/obj/effect/turf_decal/delivery/hollow,
-/obj/structure/safe,
-/obj/item/stack/spacecash/c500,
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/bluespace_tap/organic,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "vault"
@@ -6016,6 +6013,7 @@
/obj/structure/rack,
/obj/item/paper/researchnotes,
/obj/effect/turf_decal/delivery/hollow,
+/obj/effect/spawner/random/deepstorage_reward/main,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "vault"
@@ -6184,7 +6182,7 @@
/area/ruin/space/unpowered)
"Og" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/salvage/ruin/russian,
+/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plasteel,
/area/ruin/space/deepstorage)
"Oh" = (
@@ -6895,9 +6893,8 @@
},
/area/ruin/space/deepstorage)
"To" = (
-/obj/machinery/door/airlock/centcom{
- req_access_txt = "512"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/centcom,
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"Tq" = (
@@ -6923,9 +6920,8 @@
},
/area/ruin/space/deepstorage)
"TK" = (
-/obj/machinery/door/airlock/highsecurity{
- req_access_txt = "512"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/highsecurity,
/obj/machinery/door/poddoor/multi_tile/impassable{
id_tag = "DS_Storage"
},
@@ -7001,9 +6997,8 @@
/obj/structure/barricade/wooden/crude{
layer = 4
},
-/obj/machinery/door/airlock/highsecurity{
- req_access_txt = "512"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/highsecurity,
/obj/machinery/door/poddoor/multi_tile/impassable{
id_tag = "DS_Storage"
},
@@ -7685,7 +7680,7 @@
/area/ruin/space/deepstorage)
"Yk" = (
/obj/structure/table/reinforced,
-/obj/item/salvage/ruin/nanotrasen,
+/obj/item/paper/researchnotes,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "vault"
@@ -7918,9 +7913,8 @@
/turf/simulated/floor/engine/airless,
/area/ruin/space/unpowered)
"ZW" = (
-/obj/machinery/door/airlock/hatch{
- req_access_txt = "512"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
+/obj/machinery/door/airlock/hatch,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "podfloor"
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
index bd9a9b981788..a2980f93f610 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
@@ -167,7 +167,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"xs" = (
-/obj/effect/decal/cleanable/fungus,
+/obj/effect/spawner/random/fungus/frequent,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"xQ" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm
index 717a32bcac86..95caec8d8c88 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm
@@ -310,11 +310,11 @@
"aQ" = (
/obj/structure/rack,
/obj/item/clothing/suit/space/syndicate/orange{
- desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
+ desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Security Suit"
},
/obj/item/clothing/head/helmet/space/syndicate/orange{
- desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
+ desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Security Helmet"
},
/obj/item/clothing/mask/breath,
@@ -367,7 +367,7 @@
pixel_y = 28
},
/obj/machinery/economy/vending/cigarette/free{
- slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
+ slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -512,7 +512,7 @@
/area/ruin/space/djstation)
"bp" = (
/obj/structure/chair/office/light,
-/mob/living/simple_animal/hostile/russian/ranged/mosin,
+/mob/living/simple_animal/hostile/soviet/ranged/mosin,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/djstation)
"bq" = (
@@ -583,7 +583,7 @@
pixel_y = 17
},
/obj/item/phone{
- desc = "An old Russian phone. The dial tone is still humming.";
+ desc = "An old Soviet phone. The dial tone is still humming.";
name = "spin-dial phone";
pixel_x = 1;
pixel_y = 1
@@ -797,11 +797,11 @@
/area/ruin/space/djstation)
"yr" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/salvage/ruin/russian,
+/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plating,
/area/ruin/space/djstation)
"Zp" = (
-/obj/item/salvage/ruin/russian,
+/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plating,
/area/ruin/space/djstation)
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
index 091de72050ef..87472fd1364e 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
@@ -63,9 +63,9 @@
/turf/simulated/floor/plating/airless,
/area/ruin/space/syndicate_listening_station/asteroid)
"kE" = (
+/obj/effect/mapping_helpers/airlock/access/all/syndicate,
/obj/machinery/door/airlock/external{
- id_tag = "sst_away";
- req_access_txt = "150"
+ id_tag = "sst_away"
},
/obj/structure/cable{
d1 = 4;
@@ -242,9 +242,9 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/syndicate_listening_station)
"zb" = (
+/obj/effect/mapping_helpers/airlock/access/all/syndicate,
/obj/machinery/door/airlock/external{
- id_tag = "sst_away";
- req_access_txt = "150"
+ id_tag = "sst_away"
},
/obj/structure/fans/tiny,
/obj/effect/decal/cleanable/dirt,
@@ -472,9 +472,9 @@
/turf/simulated/floor/mineral/silver,
/area/ruin/space/syndicate_listening_station)
"Ow" = (
+/obj/effect/mapping_helpers/airlock/access/all/syndicate,
/obj/machinery/door/airlock/external{
- id_tag = "sst_away";
- req_access_txt = "150"
+ id_tag = "sst_away"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -513,9 +513,9 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/syndicate_listening_station)
"TS" = (
+/obj/effect/mapping_helpers/airlock/access/all/syndicate,
/obj/machinery/door/airlock/external{
- id_tag = "sst_away";
- req_access_txt = "150"
+ id_tag = "sst_away"
},
/obj/structure/cable{
d1 = 4;
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
index 24116f28c9cb..4c3d28f03fbc 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
@@ -290,8 +290,8 @@
/turf/simulated/wall,
/area/ruin/space/moonbase19)
"aN" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/medical/glass{
- req_access_txt = "271";
name = "Storage Room"
},
/turf/simulated/floor/plasteel,
@@ -390,16 +390,15 @@
/obj/machinery/door/poddoor/impassable{
id_tag = "awaymlock"
},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/medical/glass{
- req_access_txt = "271";
name = "Medical Ward"
},
/turf/simulated/floor/catwalk,
/area/ruin/space/moonbase19)
"ba" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/multi_tile/glass,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -846,9 +845,8 @@
},
/area/ruin/space/moonbase19)
"cx" = (
-/obj/machinery/door/airlock/security/glass{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/security/glass,
/obj/structure/barricade/wooden/crude{
layer = 4
},
@@ -909,9 +907,8 @@
layer = 4
},
/obj/machinery/atmospherics/pipe/simple/visible/universal,
-/obj/machinery/door/airlock/maintenance_hatch{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/maintenance_hatch,
/turf/simulated/floor/plating,
/area/ruin/space/moonbase19)
"cI" = (
@@ -1198,8 +1195,8 @@
/obj/machinery/door/poddoor/impassable{
id_tag = "awaycontlockdown"
},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/highsecurity{
- req_access_txt = "271";
name = "Specimen Containtment Zone"
},
/turf/simulated/floor/catwalk,
@@ -1394,8 +1391,8 @@
/obj/machinery/door/poddoor/impassable{
id_tag = "awaymlock"
},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/centcom{
- req_access_txt = "271";
name = "Medical Ward"
},
/turf/simulated/floor/catwalk,
@@ -1574,9 +1571,8 @@
/obj/structure/barricade/wooden/crude{
layer = 4
},
-/obj/machinery/door/airlock/external{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/external,
/turf/simulated/floor/catwalk,
/area/ruin/space/moonbase19)
"eZ" = (
@@ -1672,9 +1668,8 @@
},
/area/ruin/space/moonbase19)
"fn" = (
-/obj/machinery/door/airlock/centcom{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/centcom,
/turf/simulated/floor/plasteel,
/area/ruin/space/moonbase19)
"fp" = (
@@ -1819,8 +1814,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/cleanable/dirt,
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/centcom{
- req_access_txt = "271";
name = "Cafeteria"
},
/turf/simulated/floor/catwalk,
@@ -2934,8 +2929,8 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/engineering/glass{
- req_access_txt = "271";
name = "Workshop"
},
/turf/simulated/floor/catwalk,
@@ -3335,8 +3330,8 @@
/obj/machinery/door/poddoor/impassable{
id_tag = "awayscilock"
},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/centcom{
- req_access_txt = "271";
name = "Research Division"
},
/turf/simulated/floor/catwalk,
@@ -3548,9 +3543,8 @@
/turf/simulated/floor/engine,
/area/ruin/space/moonbase19)
"kW" = (
-/obj/machinery/door/airlock/centcom{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/centcom,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "caution"
@@ -3628,9 +3622,8 @@
},
/area/ruin/space/moonbase19)
"lq" = (
-/obj/machinery/door/airlock{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -4181,8 +4174,8 @@
/turf/simulated/floor/carpet,
/area/ruin/space/moonbase19)
"nx" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/centcom{
- req_access_txt = "271";
name = "Engineering Division"
},
/turf/simulated/floor/plasteel,
@@ -4813,8 +4806,8 @@
/obj/machinery/door/poddoor/impassable{
id_tag = "awayscilock"
},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/centcom{
- req_access_txt = "271";
name = "Research Division"
},
/turf/simulated/floor/catwalk,
@@ -4968,8 +4961,8 @@
},
/area/ruin/space/moonbase19)
"qx" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/centcom{
- req_access_txt = "271";
name = "Cafeteria"
},
/turf/simulated/floor/catwalk,
@@ -5354,8 +5347,8 @@
},
/area/ruin/space/moonbase19)
"rV" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock{
- req_access_txt = "271";
name = "Dorms"
},
/turf/simulated/floor/plasteel{
@@ -5379,9 +5372,8 @@
},
/area/ruin/space/moonbase19)
"rZ" = (
-/obj/machinery/door/airlock/maintenance_hatch{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/maintenance_hatch,
/turf/simulated/floor/plating,
/area/ruin/space/moonbase19)
"sa" = (
@@ -5531,10 +5523,6 @@
},
/turf/simulated/floor/engine,
/area/ruin/space/moonbase19)
-"sy" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall/r_wall,
-/area/ruin/space/moonbase19)
"sF" = (
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall/indestructible/riveted,
@@ -7074,7 +7062,7 @@
/area/ruin/space/moonbase19)
"zV" = (
/obj/machinery/economy/vending/medical{
- req_access_txt = "271"
+ req_access = list(271)
},
/turf/simulated/floor/plasteel{
icon_state = "whitecorner";
@@ -7099,8 +7087,8 @@
},
/area/ruin/space/moonbase19)
"Af" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/command/glass{
- req_access_txt = "271";
name = "Senior Researcher's Office"
},
/obj/effect/mapping_helpers/airlock/polarized{
@@ -7491,7 +7479,7 @@
/obj/structure/table/reinforced,
/obj/machinery/door/window/reinforced/normal{
dir = 4;
- req_access_txt = "271"
+ req_access = list(271)
},
/obj/machinery/door/poddoor/shutters/preopen{
id_tag = "awayscilock2"
@@ -7516,9 +7504,8 @@
/obj/machinery/door/poddoor/impassable{
id_tag = "awayscilock"
},
-/obj/machinery/door/airlock/maintenance_hatch{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/maintenance_hatch,
/turf/simulated/floor/plating,
/area/ruin/space/moonbase19)
"BK" = (
@@ -7527,8 +7514,8 @@
/turf/simulated/floor/catwalk,
/area/ruin/space/moonbase19)
"BO" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/engineering/glass{
- req_access_txt = "271";
name = "Engineering Division"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -7606,8 +7593,8 @@
/obj/machinery/door/poddoor/impassable{
id_tag = "awaycontlockdown"
},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/highsecurity{
- req_access_txt = "271";
name = "Specimen Containtment Zone"
},
/turf/simulated/floor/catwalk,
@@ -7621,9 +7608,8 @@
},
/area/ruin/space/moonbase19)
"Ct" = (
-/obj/machinery/door/airlock/highsecurity{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/highsecurity,
/obj/machinery/door/poddoor/preopen{
id_tag = "awayscilock1"
},
@@ -7645,8 +7631,8 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/centcom{
- req_access_txt = "271";
name = "Engineering Division"
},
/turf/simulated/floor/plasteel,
@@ -7882,9 +7868,8 @@
},
/area/ruin/space/moonbase19)
"Dt" = (
-/obj/machinery/door/airlock/medical/glass{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/medical/glass,
/obj/effect/decal/cleanable/blood/tracks/mapped,
/turf/simulated/floor/plasteel{
icon_state = "darkfull";
@@ -8496,8 +8481,8 @@
},
/area/ruin/space/moonbase19)
"Gk" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/medical/glass{
- req_access_txt = "271";
name = "Operation Room"
},
/turf/simulated/floor/plasteel{
@@ -8845,8 +8830,8 @@
/turf/simulated/floor/engine,
/area/ruin/space/moonbase19)
"HO" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/highsecurity{
- req_access_txt = "271";
name = "Chamber #1"
},
/obj/effect/turf_decal/delivery,
@@ -9070,8 +9055,8 @@
/area/ruin/space/moonbase19)
"IU" = (
/obj/effect/turf_decal/delivery,
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/highsecurity{
- req_access_txt = "271";
name = "Chamber #2"
},
/turf/simulated/floor/plasteel{
@@ -9197,9 +9182,8 @@
},
/area/ruin/space/moonbase19)
"JE" = (
-/obj/machinery/door/airlock/external{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/external,
/turf/simulated/floor/catwalk,
/area/ruin/space/moonbase19)
"JG" = (
@@ -9839,9 +9823,8 @@
},
/area/ruin/space/moonbase19)
"Mx" = (
-/obj/machinery/door/airlock/maintenance_hatch{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/maintenance_hatch,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/ruin/space/moonbase19)
@@ -10578,8 +10561,8 @@
},
/area/ruin/space/moonbase19)
"PF" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/security{
- req_access_txt = "271";
name = "Security Checkpoint"
},
/turf/simulated/floor/plasteel{
@@ -10888,8 +10871,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/centcom{
- req_access_txt = "271";
name = "Cafeteria"
},
/turf/simulated/floor/catwalk,
@@ -10979,9 +10962,8 @@
},
/area/ruin/space/moonbase19)
"Rg" = (
-/obj/machinery/door/airlock/freezer{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/freezer,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor";
temperature = 273.15
@@ -11060,9 +11042,8 @@
/turf/simulated/floor/engine,
/area/ruin/space/moonbase19)
"RD" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/multi_tile/glass,
/obj/structure/barricade/wooden/crude{
layer = 4
},
@@ -11299,9 +11280,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/airlock/centcom{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/centcom,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "caution"
@@ -11365,8 +11345,8 @@
},
/area/ruin/space/moonbase19)
"Ti" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/command/glass{
- req_access_txt = "271";
name = "Senior Researcher's Office"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -11591,8 +11571,8 @@
"Ue" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock{
- req_access_txt = "271";
name = "Dorms"
},
/turf/simulated/floor/plasteel{
@@ -11695,9 +11675,8 @@
/obj/effect/decal/cleanable/blood/tracks/mapped{
dir = 8
},
-/obj/machinery/door/airlock/maintenance_hatch{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/maintenance_hatch,
/turf/simulated/floor/plating,
/area/ruin/space/moonbase19)
"UA" = (
@@ -12043,9 +12022,8 @@
/turf/simulated/floor/plating,
/area/ruin/space/moonbase19)
"We" = (
-/obj/machinery/door/airlock/maintenance_hatch{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/maintenance_hatch,
/obj/machinery/door/poddoor/impassable{
id_tag = "awayscilock"
},
@@ -12153,9 +12131,9 @@
},
/area/ruin/space/moonbase19)
"WG" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/vault{
- locked = 1;
- req_access_txt = "271"
+ locked = 1
},
/turf/simulated/floor/catwalk,
/area/ruin/space/moonbase19)
@@ -12557,8 +12535,8 @@
/area/ruin/space/moonbase19)
"Yj" = (
/obj/effect/decal/cleanable/dirt,
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/engineering/glass{
- req_access_txt = "271";
name = "Engineering Division"
},
/turf/simulated/floor/plasteel,
@@ -12643,8 +12621,8 @@
id_tag = "awaymlock"
},
/obj/effect/decal/cleanable/dirt,
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/centcom{
- req_access_txt = "271";
name = "Medical Ward"
},
/turf/simulated/floor/catwalk,
@@ -12688,8 +12666,8 @@
},
/area/ruin/space/moonbase19)
"YM" = (
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
/obj/machinery/door/airlock/engineering/glass{
- req_access_txt = "271";
name = "Workshop"
},
/turf/simulated/floor/catwalk,
@@ -12948,9 +12926,8 @@
/turf/simulated/floor/engine,
/area/ruin/space/moonbase19)
"ZP" = (
-/obj/machinery/door/airlock/medical/glass{
- req_access_txt = "271"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19,
+/obj/machinery/door/airlock/medical/glass,
/obj/structure/barricade/wooden{
layer = 4
},
@@ -14703,7 +14680,7 @@ Wd
rL
mh
Mv
-sy
+ag
tX
tX
Dd
@@ -16017,7 +15994,7 @@ OZ
VR
af
bP
-sy
+ag
af
tX
tX
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
index 9dbdd2061f27..98f13edcf853 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
@@ -1960,9 +1960,9 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/theta,
/obj/machinery/door/airlock/external{
- name = "Engineering External Access";
- req_one_access_txt = "301"
+ name = "Engineering External Access"
},
/turf/simulated/floor/plating,
/area/ruin/ancientstation/engi)
@@ -3013,9 +3013,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/door/airlock/maintenance_hatch{
- req_one_access_txt = "301"
- },
+/obj/effect/mapping_helpers/airlock/access/all/ruins/theta,
+/obj/machinery/door/airlock/maintenance_hatch,
/turf/simulated/floor/plating,
/area/ruin/ancientstation/thetacorridor)
"hF" = (
@@ -3090,9 +3089,9 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/effect/mapping_helpers/airlock/access/all/ruins/theta,
/obj/machinery/door/airlock/external{
- name = "Engineering External Access";
- req_one_access_txt = "301"
+ name = "Engineering External Access"
},
/turf/simulated/floor/plating/airless,
/area/ruin/ancientstation/engi)
@@ -3792,9 +3791,9 @@
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
+/obj/effect/mapping_helpers/airlock/access/all/ruins/theta,
/obj/machinery/door/airlock/highsecurity{
- name = "Prototype Laboratory";
- req_access_txt = "301"
+ name = "Prototype Laboratory"
},
/turf/simulated/floor/plasteel{
icon_state = "whitehall"
@@ -3803,9 +3802,9 @@
"jv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/cleanable/dirt,
+/obj/effect/mapping_helpers/airlock/access/all/ruins/theta,
/obj/machinery/door/airlock/highsecurity{
- name = "Prototype Laboratory";
- req_access_txt = "301"
+ name = "Prototype Laboratory"
},
/turf/simulated/floor/plasteel{
icon_state = "whitehall"
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
index 592d9f2455ac..3131e93a9a5c 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
@@ -1244,7 +1244,7 @@
/obj/structure/safe/floor,
/obj/item/tank/internals/oxygen/red,
/obj/item/clothing/mask/gas/syndicate,
-/obj/item/mod/control/pre_equipped/traitor,
+/obj/item/mod/control/pre_equipped/mining/asteroid,
/obj/item/reagent_containers/drinks/bottle/rum,
/obj/item/reagent_containers/drinks/bottle/rum,
/obj/item/folder/syndicate/blue,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm
index 8e0bd98ae0e6..ee7e03df5065 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm
@@ -241,8 +241,7 @@
id = "syndicatedruglab";
name = "Syndicate Drug Lab Hangar";
pixel_x = 24;
- pixel_y = 4;
- req_access_txt = null
+ pixel_y = 4
},
/turf/simulated/floor/plating,
/area/ruin/space/syndicate_druglab)
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
index 29702b1da153..54445ed5d046 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
@@ -78,8 +78,8 @@
name = "Vault Bolt Control";
normaldoorcontrol = 1;
pixel_x = 24;
- req_access_txt = "150";
- specialfunctions = 4
+ specialfunctions = 4;
+ req_access = list(150)
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -1082,7 +1082,7 @@
id = "SSBrestricted";
name = "Shutters Control";
pixel_x = -24;
- req_access_txt = "151"
+ req_access = list(151)
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -1274,8 +1274,7 @@
"gW" = (
/obj/machinery/door/window/classic/reversed{
name = "Animal Storage";
- req_access_txt = "150";
- req_one_access_txt = "150"
+ req_access = list(150)
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -1553,7 +1552,7 @@
id = "SSBrestricted";
name = "Shutters Control";
pixel_x = 24;
- req_access_txt = "151"
+ req_access = list(151)
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -1581,7 +1580,7 @@
/area/ruin/unpowered/syndicate_space_base/toxtest)
"iB" = (
/obj/structure/closet/crate/secure/gear{
- req_access_txt = "150"
+ req_access = list(150)
},
/obj/item/clothing/suit/space/syndicate,
/obj/item/clothing/suit/space/syndicate,
@@ -1728,7 +1727,7 @@
/area/ruin/unpowered/syndicate_space_base/arrivals)
"je" = (
/obj/structure/closet/crate/secure/gear{
- req_access_txt = "150"
+ req_access = list(150)
},
/obj/item/clothing/suit/space/syndicate,
/obj/item/clothing/suit/space/syndicate,
@@ -4979,7 +4978,7 @@
dir = 4;
network = list("SyndicateTestLab","SyndicateToxinsTest","SyndicateCaves","SyndicateInterior");
name = "syndicate security camera console";
- req_access_txt = "150"
+ req_access = list(150)
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -5290,7 +5289,7 @@
/area/ruin/unpowered/syndicate_space_base/atmos)
"Ed" = (
/obj/structure/closet/crate/secure/gear{
- req_access_txt = "150"
+ req_access = list(150)
},
/obj/machinery/light{
dir = 1
@@ -5332,8 +5331,7 @@
"Ei" = (
/obj/machinery/door/window/classic/reversed{
name = "Animal Storage";
- req_access_txt = "150";
- req_one_access_txt = "150"
+ req_access = list(150)
},
/mob/living/simple_animal/chicken{
faction = list("neutral","syndicate")
@@ -5456,10 +5454,10 @@
},
/area/ruin/unpowered/syndicate_space_base/genetics)
"ES" = (
+/obj/effect/mapping_helpers/airlock/access/all/syndicate,
/obj/machinery/door/airlock/vault{
id_tag = "syndie_lavaland_vault";
- locked = 1;
- req_access_txt = "150"
+ locked = 1
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -6140,7 +6138,7 @@
/area/ruin/unpowered/syndicate_space_base/main)
"Iz" = (
/obj/structure/closet/crate/secure/gear{
- req_access_txt = "150"
+ req_access = list(150)
},
/obj/machinery/light,
/obj/item/clothing/gloves/combat,
@@ -6396,7 +6394,7 @@
pixel_y = -24;
name = "Caves Turret Control Panel";
control_area = "Syndicate Space Base Cave";
- req_access_txt = "150"
+ req_access = list(150)
},
/obj/structure/chair{
dir = 8
@@ -7028,8 +7026,7 @@
/area/ruin/unpowered/syndicate_space_base/toxlaunch)
"NT" = (
/obj/structure/closet/secure_closet/medical1{
- req_access = null;
- req_access_txt = "150"
+ req_access = list(150)
},
/obj/structure/window/reinforced{
dir = 1
@@ -7692,7 +7689,7 @@
/area/ruin/unpowered/syndicate_space_base/engineering)
"Sv" = (
/obj/structure/closet/crate/secure/weapon{
- req_access_txt = "150"
+ req_access = list(150)
},
/obj/item/ammo_box/magazine/m10mm/hp,
/obj/item/ammo_box/magazine/m10mm/hp,
@@ -7793,7 +7790,7 @@
/area/ruin/unpowered/syndicate_space_base/storage)
"SN" = (
/obj/structure/closet/crate/secure/weapon{
- req_access_txt = "150"
+ req_access = list(150)
},
/obj/item/ammo_box/magazine/m10mm/hp,
/obj/item/ammo_box/magazine/m10mm/hp,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
index e31219ca97e7..26c6e5586f9f 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
@@ -628,7 +628,7 @@
},
/area/ruin/space/syndicakefactory)
"wW" = (
-/obj/machinery/suit_storage_unit/syndicate,
+/obj/machinery/suit_storage_unit/mining,
/turf/simulated/floor/engine,
/area/ruin/space/syndicakefactory)
"xy" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
index 25369e690d57..ce4becef7b45 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
@@ -147,14 +147,12 @@
on = 1
},
/obj/effect/spawner/random/syndicate/loot/common,
-/obj/structure/closet/secure_closet/syndicate/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/syndicate_depot/core)
"aB" = (
/obj/effect/spawner/random/syndicate/loot/common,
-/obj/structure/closet/secure_closet/syndicate/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -345,7 +343,6 @@
/area/syndicate_depot/core)
"bc" = (
/obj/effect/spawner/random/syndicate/loot/rare,
-/obj/structure/closet/secure_closet/syndicate/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -371,7 +368,6 @@
on = 1
},
/obj/effect/spawner/random/syndicate/loot/rare,
-/obj/structure/closet/secure_closet/syndicate/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -418,7 +414,6 @@
dir = 8
},
/obj/effect/spawner/random/syndicate/loot/common,
-/obj/structure/closet/secure_closet/syndicate/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -428,7 +423,6 @@
dir = 4
},
/obj/effect/spawner/random/syndicate/loot/common,
-/obj/structure/closet/secure_closet/syndicate/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -448,17 +442,17 @@
},
/area/syndicate_depot/core)
"bq" = (
+/obj/effect/mapping_helpers/airlock/access/all/syndicate,
/obj/machinery/door/airlock/external{
- id_tag = "sst_away";
- req_access_txt = "150"
+ id_tag = "sst_away"
},
/obj/structure/fans/tiny,
/turf/simulated/floor/plating,
/area/syndicate_depot/core)
"br" = (
+/obj/effect/mapping_helpers/airlock/access/all/syndicate,
/obj/machinery/door/airlock/external{
- id_tag = "sst_away";
- req_access_txt = "150"
+ id_tag = "sst_away"
},
/obj/structure/fans/tiny,
/turf/simulated/floor/plating,
@@ -539,7 +533,6 @@
/area/syndicate_depot/core)
"bE" = (
/obj/effect/spawner/random/syndicate/loot/officer,
-/obj/structure/closet/secure_closet/syndicate/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -568,16 +561,15 @@
name = "Sealed Doors";
protected = 0
},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate,
/obj/machinery/door/airlock/external{
- id_tag = "sst_away";
- req_access_txt = "150"
+ id_tag = "sst_away"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/syndicate_depot/outer)
"bJ" = (
-/obj/structure/closet/secure_closet/syndicate/depot,
/obj/effect/spawner/random/syndicate/trapped_documents,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -655,8 +647,7 @@
/obj/machinery/turretid/syndicate{
name = "external turret controls";
pixel_x = -32;
- req_access = null;
- req_access_txt = "150"
+ req_access = list(150)
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -800,7 +791,6 @@
/area/syndicate_depot/core)
"cm" = (
/obj/effect/spawner/random/syndicate/loot/armory,
-/obj/structure/closet/secure_closet/syndicate/depot/armory,
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -812,14 +802,12 @@
on = 1
},
/obj/effect/spawner/random/syndicate/loot/armory,
-/obj/structure/closet/secure_closet/syndicate/depot/armory,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/syndicate_depot/core)
"co" = (
/obj/effect/spawner/random/syndicate/loot/armory,
-/obj/structure/closet/secure_closet/syndicate/depot/armory,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -1129,7 +1117,6 @@
dir = 8
},
/obj/effect/spawner/random/syndicate/loot/rare,
-/obj/structure/closet/secure_closet/syndicate/depot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -1173,12 +1160,6 @@
},
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/outer)
-"dg" = (
-/obj/item/gps/ruin{
- gpstag = "ERR#UNKWN"
- },
-/turf/simulated/wall/mineral/plastitanium/nodiagonal,
-/area/syndicate_depot/core)
"Te" = (
/turf/simulated/mineral/random/high_chance,
/area/syndicate_depot/outer)
@@ -1913,7 +1894,7 @@ aj
aj
ao
ad
-dg
+at
aL
aD
aZ
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm b/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm
index 513e8ff077b4..dd84c082cba3 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm
@@ -16,7 +16,7 @@
"an" = (
/mob/living/simple_animal/hostile/malf_drone,
/turf/space,
-/area/space)
+/area/space/no_teleport)
"ao" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'LETHAL TURRETS'. Enter at your own risk!";
@@ -38,7 +38,7 @@
/obj/structure/lattice,
/obj/structure/grille/broken,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"aN" = (
/obj/machinery/light/small{
dir = 8
@@ -117,7 +117,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"ca" = (
/obj/structure/cable{
d1 = 1;
@@ -157,9 +157,7 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- req_access_txt = "0"
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/tele)
"cJ" = (
@@ -174,7 +172,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"dn" = (
/obj/machinery/computer/nonfunctional{
dir = 4
@@ -195,7 +193,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"dv" = (
/obj/machinery/atmospherics/unary/vent_pump{
dir = 8;
@@ -304,7 +302,7 @@
},
/obj/structure/lattice,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"fc" = (
/obj/machinery/constructable_frame/machine_frame,
/turf/simulated/floor/bluegrid{
@@ -332,7 +330,7 @@
},
/obj/structure/window/reinforced,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"fv" = (
/obj/structure/window/reinforced{
dir = 4
@@ -353,7 +351,7 @@
},
/obj/structure/lattice,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"gi" = (
/obj/item/radio/intercom{
pixel_y = 25
@@ -391,9 +389,9 @@
pixel_x = 0
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"gv" = (
-/obj/effect/spawner/random_spawners/fungus_maybe,
+/obj/effect/spawner/random/fungus/maybe,
/turf/simulated/wall/r_wall,
/area/ruin/space/telecomms/computer)
"gG" = (
@@ -417,13 +415,11 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms,
/obj/machinery/door/airlock/hatch{
- name = "Telecoms Satellite";
- req_access_txt = "61"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- req_access_txt = "0"
+ name = "Telecoms Satellite"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/tele)
@@ -446,7 +442,7 @@
},
/obj/structure/window/reinforced,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"hU" = (
/obj/machinery/computer/teleporter,
/obj/effect/turf_decal/delivery,
@@ -458,7 +454,7 @@
/area/ruin/space/telecomms/computer)
"ik" = (
/turf/simulated/wall/r_wall,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"il" = (
/turf/simulated/floor/bluegrid{
icon_state = "dark";
@@ -474,7 +470,7 @@
/area/ruin/space/telecomms/computer)
"iD" = (
/turf/simulated/wall/indestructible/riveted,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"iE" = (
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/tele)
@@ -512,9 +508,9 @@
/turf/simulated/floor/catwalk/airless,
/area/ruin/space/telecomms/powercontrol)
"ky" = (
+/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms,
/obj/machinery/door/airlock/hatch{
- name = "Telecoms Power Control";
- req_access_txt = "61"
+ name = "Telecoms Power Control"
},
/obj/structure/cable{
d1 = 4;
@@ -577,7 +573,7 @@
pixel_x = 0
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"li" = (
/obj/machinery/power/solar,
/obj/structure/cable{
@@ -587,7 +583,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"lo" = (
/obj/structure/window/reinforced{
dir = 1
@@ -649,7 +645,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"mb" = (
/obj/structure/cable{
d1 = 1;
@@ -684,7 +680,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"mD" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/bluespace_tap/organic,
@@ -695,7 +691,7 @@
dir = 4
},
/turf/simulated/floor/plating/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"mN" = (
/obj/structure/table,
/obj/effect/spawner/random/maintenance,
@@ -710,7 +706,7 @@
},
/obj/structure/grille,
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"mZ" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Core Access";
@@ -814,7 +810,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms)
"ob" = (
-/obj/effect/spawner/random_spawners/fungus_maybe,
+/obj/effect/spawner/random/fungus/maybe,
/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/telecomms/computer)
"oe" = (
@@ -829,7 +825,7 @@
icon_state = "1-8"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"ou" = (
/obj/structure/cable{
d1 = 2;
@@ -874,7 +870,7 @@
},
/obj/structure/lattice,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"oG" = (
/obj/structure/cable{
icon_state = "0-4";
@@ -903,7 +899,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"pa" = (
/obj/machinery/computer/borgupload,
/turf/simulated/floor/bluegrid{
@@ -938,7 +934,7 @@
/obj/structure/grille/broken,
/mob/living/simple_animal/hostile/malf_drone,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"pU" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -948,7 +944,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"pV" = (
/obj/item/paper/monitorkey,
/turf/simulated/floor/plasteel,
@@ -988,7 +984,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/computer)
"qD" = (
-/obj/effect/spawner/random_spawners/fungus_maybe,
+/obj/effect/spawner/random/fungus/maybe,
/turf/simulated/wall/r_wall,
/area/ruin/space/telecomms/powercontrol)
"qE" = (
@@ -1038,7 +1034,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"rd" = (
/obj/item/pen/gray,
/turf/simulated/floor/plasteel,
@@ -1050,7 +1046,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"rL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -1079,7 +1075,7 @@
icon_state = "1-8"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"sq" = (
/obj/structure/window/reinforced{
dir = 8
@@ -1143,7 +1139,7 @@
dir = 1
},
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"to" = (
/obj/machinery/porta_turret/ai_turret/disable{
check_synth = 1;
@@ -1433,7 +1429,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/computer)
"wX" = (
-/obj/effect/spawner/random_spawners/fungus_maybe,
+/obj/effect/spawner/random/fungus/maybe,
/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/telecomms)
"wY" = (
@@ -1458,7 +1454,7 @@
pixel_x = 0
},
/turf/simulated/floor/plating/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"xj" = (
/obj/structure/window/reinforced{
dir = 8
@@ -1498,9 +1494,9 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/computer)
"xL" = (
+/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms,
/obj/machinery/door/airlock/hatch{
- name = "Telecoms Lounge";
- req_access_txt = "61"
+ name = "Telecoms Lounge"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
@@ -1518,9 +1514,9 @@
/turf/simulated/floor/plating,
/area/ruin/space/telecomms)
"yl" = (
+/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms,
/obj/machinery/door/airlock/maintenance_hatch{
- name = "Telecoms Storage";
- req_access_txt = "61"
+ name = "Telecoms Storage"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -1533,7 +1529,7 @@
"yo" = (
/obj/structure/lattice,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"yq" = (
/obj/structure/cable{
d1 = 1;
@@ -1576,9 +1572,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms,
/obj/machinery/door/airlock/hatch{
- name = "Telecoms East Wing";
- req_access_txt = "61"
+ name = "Telecoms East Wing"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -1587,9 +1583,9 @@
},
/area/ruin/space/telecomms/foyer)
"yG" = (
-/obj/effect/spawner/random_spawners/fungus_maybe,
+/obj/effect/spawner/random/fungus/maybe,
/turf/simulated/wall/r_wall,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"yJ" = (
/obj/structure/cable{
d1 = 2;
@@ -1635,7 +1631,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"za" = (
/obj/structure/closet/crate,
/obj/item/clothing/glasses/night,
@@ -1645,7 +1641,7 @@
/obj/structure/lattice,
/obj/effect/abstract/cheese_trap,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"zq" = (
/obj/structure/barricade/sandbags,
/turf/simulated/floor/plasteel,
@@ -1658,14 +1654,6 @@
},
/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/telecomms/chamber)
-"zM" = (
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'SERVER ROOM'.";
- name = "SERVER ROOM";
- pixel_y = 0
- },
-/turf/simulated/wall/r_wall,
-/area/ruin/space/telecomms/chamber)
"zY" = (
/obj/structure/bed,
/obj/item/bedsheet/green,
@@ -1678,9 +1666,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- req_access_txt = "0"
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/telecomms_trap_tank,
/obj/effect/abstract/cheese_trap,
/turf/simulated/floor/catwalk,
@@ -1725,7 +1711,7 @@
/turf/simulated/floor/catwalk,
/area/ruin/space/telecomms/powercontrol)
"Aj" = (
-/obj/effect/spawner/random_barrier/obstruction,
+/obj/effect/spawner/random/barrier/obstruction,
/turf/simulated/floor/engine,
/area/ruin/space/telecomms/computer)
"Ay" = (
@@ -1738,7 +1724,7 @@
},
/obj/structure/lattice,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Az" = (
/obj/structure/lattice,
/obj/structure/cable{
@@ -1749,7 +1735,7 @@
},
/obj/structure/grille,
/turf/simulated/floor/plating/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"AJ" = (
/obj/structure/cable{
d1 = 2;
@@ -1770,9 +1756,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- req_access_txt = "0"
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/abstract/bot_trap,
/turf/simulated/floor/catwalk,
/area/ruin/space/telecomms)
@@ -1832,7 +1816,7 @@
},
/obj/structure/lattice,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"BW" = (
/obj/machinery/atmospherics/unary/tank/air{
dir = 8
@@ -1885,7 +1869,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"CG" = (
/obj/machinery/power/grounding_rod,
/turf/simulated/floor/plasteel{
@@ -1919,7 +1903,7 @@
/area/ruin/space/telecomms/powercontrol)
"CU" = (
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Dd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -1965,7 +1949,7 @@
/obj/structure/lattice,
/obj/structure/grille,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"DT" = (
/obj/structure/window/reinforced{
dir = 8
@@ -1990,14 +1974,14 @@
/area/ruin/space/telecomms/tele)
"Ed" = (
/turf/space,
-/area/space)
+/area/space/no_teleport)
"EF" = (
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/lattice,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"EK" = (
/obj/structure/window/reinforced{
dir = 4
@@ -2005,7 +1989,7 @@
/obj/structure/lattice,
/obj/effect/abstract/cheese_trap,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"EM" = (
/turf/simulated/floor/bluegrid{
name = "Mainframe Base";
@@ -2017,7 +2001,7 @@
"EO" = (
/obj/structure/window/reinforced,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"EQ" = (
/obj/structure/window/reinforced,
/obj/structure/lattice,
@@ -2033,7 +2017,7 @@
},
/obj/machinery/power/tracker,
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Ff" = (
/obj/machinery/light{
dir = 8
@@ -2096,13 +2080,13 @@
},
/obj/structure/grille,
/turf/simulated/floor/plating/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Gd" = (
/obj/structure/window/reinforced{
dir = 4
},
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Gf" = (
/obj/machinery/light{
dir = 4
@@ -2121,7 +2105,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Gt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -2152,7 +2136,7 @@
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"GH" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -2162,7 +2146,7 @@
icon_state = "1-8"
},
/turf/simulated/floor/plating/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"GQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -2193,7 +2177,7 @@
dir = 8
},
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Hr" = (
/turf/simulated/wall/r_wall,
/area/ruin/space/telecomms/computer)
@@ -2214,7 +2198,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Hu" = (
/obj/structure/window/reinforced,
/turf/simulated/floor/catwalk,
@@ -2237,7 +2221,7 @@
pixel_x = 0
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"HK" = (
/obj/structure/cable{
d1 = 1;
@@ -2296,25 +2280,23 @@
pixel_x = 0
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"IE" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- req_access_txt = "0"
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/tele)
"IL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms,
/obj/machinery/door/airlock/hatch{
- name = "Telecoms West Wing";
- req_access_txt = "61"
+ name = "Telecoms West Wing"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -2339,9 +2321,9 @@
icon_state = "1-2"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Jb" = (
-/obj/effect/spawner/random_spawners/fungus_maybe,
+/obj/effect/spawner/random/fungus/maybe,
/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/telecomms/foyer)
"Jm" = (
@@ -2391,9 +2373,7 @@
/area/ruin/space/telecomms/computer)
"JQ" = (
/obj/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- req_access_txt = "0"
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/window/reinforced{
dir = 8
},
@@ -2436,7 +2416,7 @@
icon_state = "1-4"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Ky" = (
/obj/machinery/computer/nonfunctional,
/obj/effect/spawner/random_spawners/cobweb_left_rare,
@@ -2451,7 +2431,7 @@
dir = 1
},
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"KQ" = (
/obj/structure/cable{
d1 = 4;
@@ -2482,9 +2462,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- req_access_txt = "0"
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/window/reinforced{
dir = 8
},
@@ -2492,7 +2470,7 @@
/area/ruin/space/telecomms)
"Lp" = (
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Lq" = (
/obj/structure/cable{
d1 = 1;
@@ -2538,7 +2516,7 @@
level = 1
},
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Ml" = (
/obj/structure/cable,
/obj/machinery/power/terminal{
@@ -2558,7 +2536,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"ME" = (
/obj/machinery/light/small{
dir = 1
@@ -2653,7 +2631,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Od" = (
/obj/structure/window/reinforced{
dir = 4
@@ -2674,14 +2652,14 @@
icon_state = "1-2"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"On" = (
/obj/structure/lattice,
/obj/structure/window/reinforced{
dir = 8
},
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"OS" = (
/obj/structure/cable{
d1 = 1;
@@ -2741,9 +2719,9 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms,
/obj/machinery/door/airlock/hatch{
- name = "Telecoms Satellite";
- req_access_txt = "61"
+ name = "Telecoms Satellite"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/preopen{
@@ -2757,7 +2735,7 @@
dir = 8
},
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Qa" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'LETHAL TURRETS'. Enter at your own risk!";
@@ -2821,7 +2799,7 @@
},
/obj/structure/lattice,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"QP" = (
/obj/structure/lattice,
/obj/structure/window/reinforced{
@@ -2829,7 +2807,7 @@
},
/obj/effect/abstract/cheese_trap,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"QR" = (
/obj/structure/cable{
d1 = 2;
@@ -2847,25 +2825,13 @@
temperature = 80
},
/area/ruin/space/telecomms/chamber)
-"QY" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- req_access_txt = "0"
- },
-/turf/simulated/floor/catwalk,
-/area/ruin/space/telecomms)
"QZ" = (
/obj/machinery/power/solar,
/obj/structure/cable,
/turf/simulated/floor/plasteel/airless{
icon_state = "solarpanel"
},
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Ra" = (
/obj/structure/window/reinforced{
dir = 4
@@ -2875,7 +2841,7 @@
dir = 6
},
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Rh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -2916,7 +2882,7 @@
},
/obj/structure/lattice,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"RB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
@@ -2988,7 +2954,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/plating/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"SA" = (
/turf/simulated/wall/r_wall,
/area/ruin/space/telecomms/powercontrol)
@@ -3004,16 +2970,13 @@
dir = 8
},
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Ta" = (
/obj/structure/chair/office/dark{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/computer)
-"To" = (
-/turf/simulated/wall/r_wall,
-/area/ruin/space/telecomms/chamber)
"Tw" = (
/obj/machinery/computer/telescience{
dir = 4
@@ -3045,7 +3008,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"TT" = (
/obj/machinery/doppler_array,
/turf/simulated/floor/plasteel{
@@ -3067,7 +3030,7 @@
"TY" = (
/obj/structure/lattice,
/turf/space,
-/area/space)
+/area/space/no_teleport)
"Uw" = (
/obj/structure/cable{
d1 = 4;
@@ -3097,9 +3060,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- req_access_txt = "0"
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/foyer)
"UF" = (
@@ -3112,7 +3073,7 @@
},
/obj/structure/lattice,
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Vb" = (
/obj/structure/sign/nosmoking_2{
pixel_x = 32;
@@ -3136,7 +3097,7 @@
},
/obj/structure/grille,
/turf/simulated/floor/catwalk/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Vm" = (
/obj/machinery/light/small,
/obj/machinery/light_switch{
@@ -3149,13 +3110,13 @@
dir = 4
},
/turf/simulated/wall/r_wall,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Vp" = (
/obj/structure/window/reinforced{
dir = 4
},
/turf/space,
-/area/space)
+/area/space/no_teleport)
"VB" = (
/obj/effect/decal/cleanable/blood/old,
/turf/simulated/floor/plasteel,
@@ -3180,7 +3141,7 @@
dir = 1
},
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"Wp" = (
/obj/machinery/teleport/station,
/obj/effect/turf_decal/delivery,
@@ -3247,7 +3208,7 @@
dir = 1
},
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"XB" = (
/obj/structure/environmental_storytelling_holopad/core_room,
/turf/simulated/floor/bluegrid{
@@ -3259,7 +3220,7 @@
},
/area/ruin/space/telecomms/chamber)
"XJ" = (
-/obj/effect/spawner/random_spawners/fungus_maybe,
+/obj/effect/spawner/random/fungus/maybe,
/turf/simulated/wall/r_wall,
/area/ruin/space/telecomms/tele)
"XP" = (
@@ -3288,11 +3249,11 @@
icon_state = "2-4"
},
/turf/simulated/floor/plating/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"YC" = (
/obj/structure/grille,
/turf/simulated/floor/plating/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"YF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/abstract/bot_trap,
@@ -3316,14 +3277,14 @@
dir = 8
},
/turf/simulated/floor/plating/airless,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"YQ" = (
/obj/structure/lattice,
/obj/structure/window/reinforced{
dir = 4
},
/turf/space,
-/area/space/nearstation)
+/area/space/nearstation/no_teleport)
"YW" = (
/obj/structure/cable{
d2 = 2;
@@ -6860,7 +6821,7 @@ UD
oB
BQ
Zb
-QY
+nL
ML
ML
AX
@@ -7958,7 +7919,7 @@ ux
Ad
tF
iy
-To
+Zu
mZ
FA
EM
@@ -8050,7 +8011,7 @@ ux
ux
ux
ux
-To
+Zu
ME
Zj
EM
@@ -8142,9 +8103,9 @@ pE
sv
ia
kl
-To
-To
-zM
+Zu
+Zu
+FA
EM
il
dn
@@ -8518,12 +8479,12 @@ nL
vd
Od
xj
-QY
-QY
-QY
-QY
-QY
-QY
+nL
+nL
+nL
+nL
+nL
+nL
vU
Xf
Ed
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
index 9bf3f4e78423..5265570fb7dd 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
@@ -260,7 +260,7 @@
"aL" = (
/obj/structure/table/reinforced,
/obj/item/phone{
- desc = "An old Russian phone. The dial tone is still humming.";
+ desc = "An old Soviet phone. The dial tone is still humming.";
name = "spin-dial phone"
},
/turf/simulated/floor/plasteel{
@@ -272,7 +272,7 @@
/obj/structure/chair/comfy/red{
dir = 1
},
-/mob/living/simple_animal/hostile/russian/ranged/mosin,
+/mob/living/simple_animal/hostile/soviet/ranged/mosin,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/bridge)
"aN" = (
@@ -317,7 +317,7 @@
/area/ruin/space/derelict/bridge)
"aS" = (
/obj/machinery/economy/vending/cigarette/free{
- slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
+ slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
},
/turf/simulated/floor/plasteel{
dir = 9;
@@ -351,11 +351,11 @@
"aX" = (
/obj/structure/closet/cabinet,
/obj/item/clothing/suit/space/syndicate/blue{
- desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
+ desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Command Suit"
},
/obj/item/clothing/head/helmet/space/syndicate/blue{
- desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
+ desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Command Helmet"
},
/turf/simulated/floor/wood,
@@ -725,7 +725,7 @@
/area/ruin/space/derelict/arrival)
"bU" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/salvage/ruin/russian,
+/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
@@ -880,7 +880,7 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"cp" = (
-/obj/item/salvage/ruin/russian,
+/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
@@ -953,11 +953,11 @@
"cz" = (
/obj/structure/rack,
/obj/item/clothing/suit/space/syndicate/orange{
- desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
+ desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Security Suit"
},
/obj/item/clothing/head/helmet/space/syndicate/orange{
- desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
+ desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Security Helmet"
},
/turf/simulated/floor/plasteel{
@@ -1264,10 +1264,6 @@
icon_state = "blue"
},
/area/ruin/space/derelict/crew_quarters)
-"dl" = (
-/obj/effect/decal/cleanable/fungus,
-/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal,
-/area/ruin/space/derelict/crew_quarters)
"dm" = (
/obj/machinery/computer/security,
/obj/effect/decal/cleanable/dirt,
@@ -1418,7 +1414,7 @@
/obj/item/pen,
/obj/structure/window/reinforced,
/obj/machinery/newscaster{
- desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Russian station.";
+ desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station.";
layer = 3.3;
name = "custom placement";
pixel_x = 27
@@ -1839,21 +1835,14 @@
/area/ruin/space/derelict/crew_quarters)
"eH" = (
/obj/machinery/newscaster{
- desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Russian station.";
+ desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station.";
layer = 3.3;
name = "custom placement";
pixel_x = 30
},
-/obj/item/trash/spentcasing{
- icon_state = "762-casing"
- },
+/obj/item/trash/spentcasing/bullet/medium,
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
-"eI" = (
-/obj/structure/sign/securearea,
-/obj/effect/decal/cleanable/blood/splatter,
-/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal,
-/area/ruin/space/derelict/arrival)
"eJ" = (
/obj/machinery/door/poddoor/impassable{
id_tag = "ruslocksec";
@@ -2010,9 +1999,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/derelict/hallway/primary)
"fb" = (
-/obj/item/trash/spentcasing{
- icon_state = "s-casing"
- },
+/obj/item/trash/spentcasing/bullet,
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
"fc" = (
@@ -2247,14 +2234,12 @@
},
/area/ruin/space/derelict/arrival)
"fB" = (
-/obj/item/trash/spentcasing{
- icon_state = "762-casing"
- },
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
+/obj/item/trash/spentcasing/bullet/medium,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"fC" = (
@@ -2266,12 +2251,12 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"fD" = (
-/obj/item/trash/spentcasing,
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
+/obj/item/trash/spentcasing/shotgun,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"fE" = (
@@ -2282,7 +2267,7 @@
desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
name = "Human remains"
},
-/mob/living/simple_animal/hostile/russian/ranged/mosin,
+/mob/living/simple_animal/hostile/soviet/ranged/mosin,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"fF" = (
@@ -2393,20 +2378,18 @@
name = "suspicious button"
},
/obj/machinery/economy/vending/cigarette/free{
- slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
+ slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
},
/obj/effect/landmark/damageturf,
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
"fU" = (
-/obj/item/trash/spentcasing,
+/obj/item/trash/spentcasing/shotgun,
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
"fV" = (
/obj/structure/chair/stool/bar,
-/obj/item/trash/spentcasing{
- icon_state = "762-casing"
- },
+/obj/item/trash/spentcasing/bullet/medium,
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
"fW" = (
@@ -2486,10 +2469,6 @@
icon_state = "purple"
},
/area/ruin/space/derelict/hallway/primary)
-"ge" = (
-/obj/effect/decal/cleanable/fungus,
-/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal,
-/area/ruin/space/derelict/hallway/primary)
"gf" = (
/obj/structure/chair/wood{
dir = 4
@@ -2576,7 +2555,7 @@
},
/area/ruin/space/derelict/arrival)
"gr" = (
-/obj/item/trash/spentcasing,
+/obj/item/trash/spentcasing/shotgun,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"gs" = (
@@ -2702,7 +2681,7 @@
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
"gH" = (
-/obj/item/trash/spentcasing,
+/obj/item/trash/spentcasing/shotgun,
/turf/simulated/floor/plasteel/grimy,
/area/ruin/space/derelict/crew_quarters)
"gI" = (
@@ -2714,10 +2693,6 @@
/obj/item/reagent_containers/drinks/bottle/kahlua,
/turf/simulated/floor/plasteel/grimy,
/area/ruin/space/derelict/crew_quarters)
-"gJ" = (
-/obj/effect/decal/cleanable/fungus,
-/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal,
-/area/ruin/space/derelict/arrival)
"gK" = (
/obj/structure/chair{
dir = 4
@@ -2732,9 +2707,7 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"gM" = (
-/obj/item/trash/spentcasing{
- icon_state = "762-casing"
- },
+/obj/item/trash/spentcasing/bullet/medium,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"gN" = (
@@ -3049,7 +3022,7 @@
/area/ruin/space/derelict/hallway/primary)
"hC" = (
/obj/structure/chair/stool,
-/mob/living/simple_animal/hostile/russian,
+/mob/living/simple_animal/hostile/soviet,
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/hallway/primary)
"hD" = (
@@ -3123,7 +3096,7 @@
"hM" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/economy/vending/cigarette/free{
- slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
+ slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -3229,7 +3202,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/item/trash/spentcasing,
+/obj/item/trash/spentcasing/shotgun,
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/arrival)
"ia" = (
@@ -3299,11 +3272,11 @@
"ik" = (
/obj/structure/rack,
/obj/item/clothing/head/helmet/space/syndicate/black/engie{
- desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
+ desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Engineering Helmet"
},
/obj/item/clothing/suit/space/syndicate/black/engie{
- desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
+ desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Engineering Suit"
},
/turf/simulated/floor/plasteel{
@@ -3327,9 +3300,7 @@
},
/area/ruin/space/derelict/crew_quarters)
"in" = (
-/obj/item/trash/spentcasing{
- icon_state = "s-casing"
- },
+/obj/item/trash/spentcasing/bullet,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "chapel"
@@ -3374,9 +3345,7 @@
/area/ruin/space/derelict/arrival)
"ix" = (
/obj/effect/decal/cleanable/blood/splatter,
-/obj/item/trash/spentcasing{
- icon_state = "s-casing"
- },
+/obj/item/trash/spentcasing/bullet,
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/arrival)
"iy" = (
@@ -3477,7 +3446,7 @@
},
/area/ruin/space/derelict/crew_quarters)
"iL" = (
-/obj/item/trash/spentcasing,
+/obj/item/trash/spentcasing/shotgun,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/crew_quarters)
"iM" = (
@@ -3656,7 +3625,7 @@
/area/ruin/space/derelict/arrival)
"jj" = (
/obj/item/paper/djstation{
- info = "Fuck. Fuckfuckfuck. I knew this mission was a mistake, that idiot Thomas got himself killed by some angry Russian security bot in the armoury, and the Lt. ran into the annex like a moron and got himself trapped. Now I'm just sitting on my god damn hands because this shuttle won't bloody move. Stupid USSP piece of shit docking arm must be jammed and I don't have the kit to go out and fix it.
Who the hell attacks a space station without EVA gear anyways? It's not like you can just bloody well waltz out into space with a hot coffee and shrug it off.";
+ info = "Fuck. Fuckfuckfuck. I knew this mission was a mistake, that idiot Thomas got himself killed by some angry commie security bot in the armoury, and the Lt. ran into the annex like a moron and got himself trapped. Now I'm just sitting on my god damn hands because this shuttle won't bloody move. Stupid USSP piece of shit docking arm must be jammed and I don't have the kit to go out and fix it.
"
/mob/living/simple_animal/hostile/guardian/adjustHealth(amount, updating_health = TRUE) //The spirit is invincible, but passes on damage/healing to the summoner
var/damage = amount * damage_transfer
diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm
index 0b84b06ab5d2..4a7f8b1ac5ba 100644
--- a/code/game/gamemodes/miniantags/morph/morph.dm
+++ b/code/game/gamemodes/miniantags/morph/morph.dm
@@ -306,10 +306,10 @@
var/list/messages = list()
messages.Add("You are a morph. ")
messages.Add("You hunger for living beings and desire to procreate. Achieve this goal by ambushing unsuspecting pray using your abilities.")
- messages.Add("As an abomination created primarily with changeling cells you may take the form of anything nearby by using your Mimic ability.")
+ messages.Add("As an abomination created primarily with changeling cells you may take the form of anything nearby by using your Mimic ability.")
messages.Add("The transformation will not go unnoticed for bystanding observers.")
- messages.Add("While morphed, you move slower and do less damage. In addition, anyone within three tiles will note an uncanny wrongness if examining you.")
- messages.Add("From this form you can however Prepare an Ambush using your ability.")
+ messages.Add("While morphed, you move slower and do less damage. In addition, anyone within three tiles will note an uncanny wrongness if examining you.")
+ messages.Add("From this form you can however Prepare an Ambush using your ability.")
messages.Add("This will allow you to deal a lot of damage the first hit. And if they touch you then even more.")
messages.Add("Finally, you can attack any item or dead creature to consume it - creatures will restore 1/3 of your max health and will add to your stored food while eating items will reduce your stored food.")
messages.Add("For more information, check the wiki page: ([GLOB.configuration.url.wiki_url]/index.php/Morph)")
diff --git a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
index e05efa0c74a5..904a3f5b6dec 100644
--- a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
+++ b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
@@ -36,7 +36,6 @@
maxHealth = 50
health = 50
speed = -0.5
- flying = TRUE
mob_size = MOB_SIZE_TINY
density = FALSE
del_on_death = TRUE
@@ -53,6 +52,7 @@
// this makes the demon able to speak through holopads, due to the overriden say, PD cannot speak normally regardless
universal_speak = TRUE
loot = list(/obj/item/organ/internal/heart/demon/pulse)
+ initial_traits = list(TRAIT_FLYING)
/// List of sounds that is picked from when the demon speaks.
var/list/speech_sounds = list("sound/voice/pdvoice1.ogg", "sound/voice/pdvoice2.ogg", "sound/voice/pdvoice3.ogg")
diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm
index aba2c7714438..904cc49d3b05 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant.dm
@@ -31,11 +31,11 @@
status_flags = 0
wander = FALSE
density = FALSE
- flying = TRUE
move_resist = INFINITY
mob_size = MOB_SIZE_TINY
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ initial_traits = list(TRAIT_FLYING)
/// The revenant's idle icon
var/icon_idle = "revenant_idle"
@@ -84,11 +84,11 @@
revealed = FALSE
incorporeal_move = INCORPOREAL_MOVE_HOLY_BLOCK
invisibility = INVISIBILITY_REVENANT
- to_chat(src, "You are once more concealed.")
+ to_chat(src, "You are once more concealed.")
if(unstun_time && world.time >= unstun_time)
unstun_time = 0
notransform = FALSE
- to_chat(src, "You can move again!")
+ to_chat(src, "You can move again!")
update_spooky_icon()
/mob/living/simple_animal/revenant/ex_act(severity)
diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
index 9f033e7a9976..b170895fd6f3 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
@@ -73,7 +73,7 @@
if(30 to 70)
to_chat(src, "[target] will yield an average amount of essence.")
if(70 to 90)
- to_chat(src, "Such a feast! [target] will yield much essence to you.")
+ to_chat(src, "Such a feast! [target] will yield much essence to you.")
if(90 to INFINITY)
to_chat(src, "Ah, the perfect soul. [target] will yield massive amounts of essence to you.")
if(do_after(src, 20, 0, target = target)) //how about now
@@ -95,7 +95,7 @@
if(essence_drained > 90)
essence_regen_cap += 25
perfectsouls += 1
- to_chat(src, "The perfection of [target]'s soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap].")
+ to_chat(src, "The perfection of [target]'s soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap].")
to_chat(src, "[target]'s soul has been considerably weakened and will yield no more essence for the time being.")
target.visible_message("[target] slumps onto the ground.", \
"Violets lights, dancing in your vision, getting clo--")
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index ad06167f1164..b1397465f3ac 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -617,7 +617,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
explanation_text = "Free Objective."
/datum/objective/steal/proc/select_target()
- var/list/possible_items_all = GLOB.potential_theft_objectives + "custom"
+ var/list/possible_items_all = GLOB.potential_theft_objectives + "custom" + "random"
var/new_target = input("Select target:", "Objective target", null) as null|anything in possible_items_all
if(!new_target)
return
@@ -636,13 +636,19 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
target_theft_objective.name = theft_objective_name
steal_target = target_theft_objective
explanation_text = "Steal [theft_objective_name]."
- else
- steal_target = new new_target
- update_explanation_text()
- if(steal_target.special_equipment)
- give_kit(steal_target.special_equipment)
+ return steal_target
+ else if(new_target == "random")
+ return TRUE
+
+ steal_target = new new_target
+ update_explanation_text()
+ if(steal_target.special_equipment) // We have to do it with a callback because mind/Topic creates the objective without an owner
+ addtimer(CALLBACK(src, PROC_REF(hand_out_equipment)), 5 SECONDS, TIMER_DELETE_ME)
return steal_target
+/datum/objective/steal/proc/hand_out_equipment()
+ give_kit(steal_target?.special_equipment)
+
/datum/objective/steal/update_explanation_text()
explanation_text = "Steal [steal_target.name]. One was last seen in [get_location()]. "
if(length(steal_target.protected_jobs) && steal_target.job_possession)
@@ -679,7 +685,6 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
var/mob/living/carbon/human/kit_receiver = kit_receiver_mind.current
if(!kit_receiver)
continue
-
var/where = kit_receiver.equip_in_one_of_slots(item_to_give, slots)
if(!where)
continue
diff --git a/code/game/gamemodes/vampire/vampire_chan.dm b/code/game/gamemodes/vampire/vampire_chan.dm
index f5c750d64108..adc3b78f762b 100644
--- a/code/game/gamemodes/vampire/vampire_chan.dm
+++ b/code/game/gamemodes/vampire/vampire_chan.dm
@@ -8,7 +8,7 @@
required_enemies = 1
recommended_enemies = 3
secondary_enemies_scaling = 0.025
- vampire_penalty = 0.6 // Cut out 40% of the vampires since we'll replace some with changelings
+ vampire_penalty = 0.4 // Cut out 40% of the vampires since we'll replace some with changelings
/// A list of all soon-to-be changelings
var/list/datum/mind/pre_changelings = list()
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 08f8b073b7a9..1546afc8c116 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -168,12 +168,12 @@
/obj/item/scrying
name = "scrying orb"
- desc = "An incandescent orb of otherworldly energy, staring into it gives you vision beyond mortal means."
+ desc = "An incandescent orb of otherworldly energy, staring into it gives you vision beyond mortal means. Also works well as a throwing weapon."
icon = 'icons/obj/wizard.dmi'
icon_state ="scrying_orb"
throw_speed = 7
throw_range = 15
- throwforce = 15
+ throwforce = 25
damtype = BURN
force = 15
hitsound = 'sound/items/welder2.ogg'
@@ -183,6 +183,7 @@
/obj/item/scrying/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
+ AddComponent(/datum/component/boomerang, throw_range, TRUE)
/obj/item/scrying/Destroy()
STOP_PROCESSING(SSobj, src)
@@ -237,6 +238,17 @@
user.remove_atom_colour(ADMIN_COLOUR_PRIORITY, COLOR_BLUE)
REMOVE_TRAIT(user, SCRYING, SCRYING_ORB)
+/obj/item/scrying/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+ . = ..()
+ if(!ishuman(hit_atom) || !throwingdatum || iswizard(hit_atom))
+ return
+ var/mob/living/carbon/human/crushee = hit_atom
+ var/zone = ran_zone(throwingdatum.target_zone) // Base 80% to hit the zone you're aiming for
+ var/obj/item/organ/external/hit_limb = crushee.get_organ(zone)
+ if(hit_limb)
+ hit_limb.fracture()
+
+
/////////////////////Multiverse Blade////////////////////
GLOBAL_LIST_EMPTY(multiverse)
diff --git a/code/game/gamemodes/wizard/magic_tarot.dm b/code/game/gamemodes/wizard/magic_tarot.dm
index 1bf82da346d1..992ddf86336d 100644
--- a/code/game/gamemodes/wizard/magic_tarot.dm
+++ b/code/game/gamemodes/wizard/magic_tarot.dm
@@ -475,10 +475,10 @@
card_icon = "the_hanged_man"
/datum/tarot/the_hanged_man/activate(mob/living/target)
- if(target.flying)
+ if(HAS_TRAIT(target, TRAIT_FLYING))
return
- target.flying = TRUE
- addtimer(VARSET_CALLBACK(target, flying, FALSE), 60 SECONDS)
+ ADD_TRAIT(target, TRAIT_FLYING, "tarot")
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(callback_remove_trait), target, TRAIT_FLYING, "tarot"), 60 SECONDS)
/datum/tarot/death
name = "XIII - Death"
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index c698751b4655..3dce596278e8 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -424,7 +424,7 @@
/datum/spellbook_entry/item/scryingorb
name = "Scrying Orb"
- desc = "An incandescent orb of crackling energy, using it will allow you to ghost while alive, allowing you to spy upon the station with ease. In addition, buying it will permanently grant you x-ray vision."
+ desc = "An incandescent orb of crackling energy, using it will allow you to ghost while alive, allowing you to spy upon the station with ease. In addition, buying it will permanently grant you x-ray vision. It will also work as an excellent throwing weapon, and will return to your hand after throwing."
item_path = /obj/item/scrying
category = "Artefacts"
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index 21d50f46bab3..19cd1be96291 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -15,26 +15,6 @@
else
return check_access_list(acc)
-/obj/proc/generate_req_lists()
- //These generations have been moved out of /obj/New() because they were slowing down the creation of objects that never even used the access system.
- if(!req_access)
- req_access = list()
- if(req_access_txt)
- var/list/req_access_str = splittext(req_access_txt, ";")
- for(var/x in req_access_str)
- var/n = text2num(x)
- if(n)
- req_access += n
-
- if(!req_one_access)
- req_one_access = list()
- if(req_one_access_txt)
- var/list/req_one_access_str = splittext(req_one_access_txt,";")
- for(var/x in req_one_access_str)
- var/n = text2num(x)
- if(n)
- req_one_access += n
-
/obj/proc/check_access(obj/item/I)
var/list/L
if(I)
@@ -44,8 +24,6 @@
return check_access_list(L)
/obj/proc/check_access_list(list/L)
- generate_req_lists()
-
if(!L)
return 0
if(!istype(L, /list))
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index 7ea202bf802e..3a896dcb5c12 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -48,7 +48,7 @@
id = /obj/item/card/id/quartermaster
l_hand = /obj/item/clipboard
l_pocket = /obj/item/mail_scanner
- pda = /obj/item/pda/quartermaster
+ pda = /obj/item/pda/heads/qm
backpack_contents = list(
/obj/item/melee/classic_baton/telescopic = 1
)
@@ -473,7 +473,7 @@
if(visualsOnly)
return
- qdel(H.GetComponent(/datum/component/footstep))
+ H.DeleteComponent(/datum/component/footstep)
/datum/outfit/job/mime/on_mind_initialize(mob/living/carbon/human/H)
. = ..()
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 96c54e3e9474..ffcdfdad7d17 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -416,6 +416,8 @@
new_item.materials[MAT_GLASS] /= coeff
new_item.pixel_y = rand(-5, 5)
new_item.pixel_x = rand(-5, 5)
+ if(is_station_level(z))
+ SSblackbox.record_feedback("tally", "station_autolathe_production", 1, "[D.type]")
SStgui.update_uis(src)
desc = initial(desc)
diff --git a/code/game/machinery/clonepod.dm b/code/game/machinery/clonepod.dm
index 3113a14f56dc..9dbbc05c9840 100644
--- a/code/game/machinery/clonepod.dm
+++ b/code/game/machinery/clonepod.dm
@@ -245,7 +245,7 @@
create_clone()
return
- if(clone.cloneloss >= 25)
+ if(clone.getCloneLoss() >= 25)
clone.adjustCloneLoss(-2)
return
@@ -373,7 +373,7 @@
reset_cloning()
return TRUE
- if(!clone.cloneloss)
+ if(!clone.getCloneLoss())
clone.forceMove(loc)
var/datum/mind/patient_mind = locateUID(patient_data.mindUID)
patient_mind.transfer_to(clone)
diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm
index 93435e09ba4a..ae795b6b92e8 100644
--- a/code/game/machinery/computer/atmos_alert.dm
+++ b/code/game/machinery/computer/atmos_alert.dm
@@ -7,33 +7,33 @@
light_color = LIGHT_COLOR_CYAN
// List of alarms and their state in areas. This is sent to TGUI
var/list/alarm_cache
+ var/parent_area_type
/obj/machinery/computer/atmos_alert/Initialize(mapload)
. = ..()
alarm_cache = list()
alarm_cache["minor"] = list()
alarm_cache["priority"] = list()
+ var/area/machine_area = get_area(src)
+ parent_area_type = machine_area.get_top_parent_type()
/obj/machinery/computer/atmos_alert/process()
// This is relatively cheap because the areas list is pretty small
- for(var/area/A as anything in GLOB.all_areas)
- if(!A.master_air_alarm)
- continue // No alarm
- if(A.master_air_alarm.z != z)
- continue // Not on our z-level
- if(!A.master_air_alarm.report_danger_level)
+ for(var/obj/machinery/alarm/air_alarm as anything in GLOB.air_alarms)
+ if(!((get_area(air_alarm)).type in typesof(parent_area_type)) || air_alarm.z != z)
+ continue // Not an area we monitor, or outside our z-level
+ if(!air_alarm.report_danger_level)
continue
-
- switch(A.atmosalm)
+ switch(air_alarm.alarm_area.atmosalm)
if(ATMOS_ALARM_DANGER)
- alarm_cache["priority"] |= A.name
- alarm_cache["minor"] -= A.name
+ alarm_cache["priority"] |= air_alarm.alarm_area.name
+ alarm_cache["minor"] -= air_alarm.alarm_area.name
if(ATMOS_ALARM_WARNING)
- alarm_cache["priority"] -= A.name
- alarm_cache["minor"] |= A.name
+ alarm_cache["priority"] -= air_alarm.alarm_area.name
+ alarm_cache["minor"] |= air_alarm.alarm_area.name
else
- alarm_cache["priority"] -= A.name
- alarm_cache["minor"] -= A.name
+ alarm_cache["priority"] -= air_alarm.alarm_area.name
+ alarm_cache["minor"] -= air_alarm.alarm_area.name
update_icon()
diff --git a/code/game/machinery/computer/atmos_controllers.dm b/code/game/machinery/computer/atmos_controllers.dm
index cb1d2638e43f..9e005b49b460 100644
--- a/code/game/machinery/computer/atmos_controllers.dm
+++ b/code/game/machinery/computer/atmos_controllers.dm
@@ -506,10 +506,15 @@ GLOBAL_LIST_EMPTY(gas_sensors)
circuit = /obj/item/circuitboard/atmoscontrol
req_access = list(ACCESS_ATMOSPHERICS)
var/datum/ui_module/atmos_control/atmos_control
+ var/parent_area_type
/obj/machinery/computer/atmoscontrol/Initialize(mapload)
. = ..()
atmos_control = new(src)
+ var/area/machine_area = get_area(src)
+ parent_area_type = machine_area.get_top_parent_type()
+ atmos_control.parent_area_type = parent_area_type
+ atmos_control.z_level = z
/obj/machinery/computer/atmoscontrol/Destroy()
QDEL_NULL(atmos_control)
@@ -529,6 +534,7 @@ GLOBAL_LIST_EMPTY(gas_sensors)
/obj/machinery/computer/atmoscontrol/ui_interact(mob/user, datum/tgui/ui = null)
atmos_control.ui_interact(user, ui)
+
#undef SENSOR_PRESSURE
#undef SENSOR_TEMPERATURE
#undef SENSOR_O2
diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm
index bc7f2429707c..b53aeb6d3b7c 100644
--- a/code/game/machinery/computer/camera_console.dm
+++ b/code/game/machinery/computer/camera_console.dm
@@ -302,9 +302,17 @@
icon_keyboard = "power_key"
icon_screen = "engie_cams"
light_color = "#FAC54B"
- network = list("Power Alarms","Atmosphere Alarms","Fire Alarms")
+ network = list()
circuit = /obj/item/circuitboard/camera/engineering
+/obj/machinery/computer/security/engineering/Initialize()
+ . = ..()
+ network = list()
+ var/area/console_area = get_area(src)
+ network += console_area.fire_cam_network
+ network += console_area.power_cam_network
+ network += console_area.atmos_cam_network
+
/obj/machinery/computer/security/telescreen/engine
name = "engine monitor"
desc = "A telescreen that connects to the engine's camera network.";
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index f647b5e241b8..0f3b2aee844f 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -719,7 +719,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
modify.access = list()
return
if("grant_all")
- modify.access = get_all_accesses()
+ modify.access |= get_all_accesses()
return
// JOB SLOT MANAGEMENT functions
diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm
index 70eca5d39826..5075852969d7 100644
--- a/code/game/machinery/computer/station_alert.dm
+++ b/code/game/machinery/computer/station_alert.dm
@@ -7,12 +7,19 @@
light_color = LIGHT_COLOR_CYAN
circuit = /obj/item/circuitboard/stationalert_engineering
var/list/alarms_listend_for = list("Fire", "Atmosphere", "Power")
+ var/parent_area_type
+ var/list/areas = list()
/obj/machinery/computer/station_alert/Initialize(mapload)
. = ..()
RegisterSignal(GLOB.alarm_manager, COMSIG_TRIGGERED_ALARM, PROC_REF(alarm_triggered))
RegisterSignal(GLOB.alarm_manager, COMSIG_CANCELLED_ALARM, PROC_REF(alarm_cancelled))
+ var/area/machine_area = get_area(src)
+ parent_area_type = machine_area.get_top_parent_type()
+ if(parent_area_type)
+ areas = typesof(parent_area_type)
+
/obj/machinery/computer/station_alert/attack_ai(mob/user)
add_fingerprint(user)
@@ -46,7 +53,7 @@
for(var/area in GLOB.alarm_manager.alarms[class])
for(var/thing in GLOB.alarm_manager.alarms[class][area][3])
var/atom/A = locateUID(thing)
- if(atoms_share_level(A, src))
+ if(A && ((get_area(A)).type in areas) && A.z == z)
data["alarms"][class] += area
return data
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 52e49c98f03c..f9fc2b92e7be 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -625,11 +625,13 @@ to destroy them and players will be able to make replacements.
build_path = /obj/machinery/chem_dispenser
board_type = "machine"
origin_tech = "materials=4;programming=4;plasmatech=4;biotech=3"
- req_components = list( /obj/item/stock_parts/matter_bin = 2,
- /obj/item/stock_parts/capacitor = 1,
- /obj/item/stock_parts/manipulator = 1,
- /obj/item/stack/sheet/glass = 1,
- /obj/item/stock_parts/cell = 1)
+ req_components = list(
+ /obj/item/stock_parts/matter_bin = 2,
+ /obj/item/stock_parts/capacitor = 1,
+ /obj/item/stock_parts/manipulator = 1,
+ /obj/item/stack/sheet/glass = 1,
+ /obj/item/stock_parts/cell = 1
+ )
/obj/item/circuitboard/chem_master
board_name = "ChemMaster 3000"
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 3ed9620e54dc..c2481554cda1 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1541,8 +1541,7 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays)
DA.polarized_glass = polarized_glass
DA.state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
DA.created_name = name
- DA.update_name()
- DA.update_icon()
+ DA.update_appearance(UPDATE_NAME|UPDATE_ICON)
if(!disassembled)
if(DA)
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index 828fbb9001f6..9a2a29a93f90 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -197,8 +197,7 @@
DA = new /obj/structure/door_assembly(loc)
if(glass)
DA.glass = TRUE
- DA.update_icon()
- DA.update_name()
+ DA.update_appearance(UPDATE_NAME|UPDATE_ICON)
qdel(src)
/obj/machinery/door/airlock/plasma/attackby(obj/item/C, mob/user, params)
@@ -367,11 +366,11 @@
/obj/machinery/door/airlock/hatch/syndicate
name = "syndicate hatch"
- req_access_txt = "150"
+ req_access = list(ACCESS_SYNDICATE)
/obj/machinery/door/airlock/hatch/syndicate/command
name = "Command Center"
- req_access_txt = "153"
+ req_access = list(ACCESS_SYNDICATE_COMMAND)
explosion_block = 2
normal_integrity = 1000
security_level = 6
@@ -398,7 +397,7 @@
/obj/machinery/door/airlock/hatch/syndicate/vault
name = "syndicate vault hatch"
- req_access_txt = "151"
+ req_access = list(ACCESS_SYNDICATE)
icon = 'icons/obj/doors/airlocks/vault/vault.dmi'
overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_vault
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 071811f3137a..1c1451bb5669 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -610,6 +610,6 @@
blockage.max_integrity += 25
foam_level++
blockage.icon_state = "foamed_[foam_level]"
- blockage.update_icon_state()
+ blockage.update_icon(UPDATE_ICON_STATE)
#undef MAX_FOAM_LEVEL
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 46c30b82a1a4..20abc3eaf814 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -13,6 +13,8 @@
active_power_consumption = 300 //when active, this turret takes up constant 300 Equipment power
power_channel = PW_CHANNEL_EQUIPMENT //drains power from the EQUIPMENT channel
armor = list(melee = 50, bullet = 30, laser = 30, energy = 30, bomb = 30, rad = 0, fire = 90, acid = 90)
+ ///this will be visible when above doors/firelocks/blastdoors to prevent cheese
+ layer = ABOVE_OBJ_LAYER
var/raised = FALSE //if the turret cover is "open" and the turret is raised
var/raising= FALSE //if the turret is currently opening or closing its cover
var/health = 80 //the turret's health
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 109c1f92d60a..633683cc3fda 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -12,7 +12,7 @@
active_power_consumption = 200
pass_flags = PASSTABLE
- var/list/allowed_devices = list(/obj/item/gun/energy, /obj/item/melee/baton, /obj/item/rcs, /obj/item/bodyanalyzer, /obj/item/handheld_chem_dispenser, /obj/item/clothing/suit/armor/reactive)
+ var/list/allowed_devices = list(/obj/item/gun/energy, /obj/item/melee/baton, /obj/item/rcs, /obj/item/bodyanalyzer, /obj/item/handheld_chem_dispenser, /obj/item/clothing/suit/armor/reactive, /obj/item/wormhole_jaunter/wormhole_weaver)
var/recharge_coeff = 1
var/obj/item/charging = null // The item that is being charged
@@ -203,6 +203,10 @@
var/obj/item/clothing/suit/armor/reactive/A = I
return A.cell
+ if(istype(I, /obj/item/wormhole_jaunter/wormhole_weaver))
+ var/obj/item/wormhole_jaunter/wormhole_weaver/W = I
+ return W.wcell
+
return null
/obj/machinery/recharger/proc/check_cell_needs_recharging(obj/item/stock_parts/cell/C)
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index e1690fa8d3ca..d07d7a946c6f 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -147,7 +147,7 @@
R.cell.charge = min(R.cell.charge + recharge_speed, R.cell.maxcharge)
else if(ishuman(occupant))
var/mob/living/carbon/human/H = occupant
- if(H.get_int_organ(/obj/item/organ/internal/cell))
+ if(ismachineperson(H))
if(H.nutrition < NUTRITION_LEVEL_FULL - 1)
H.set_nutrition(min(H.nutrition + recharge_speed_nutrition, NUTRITION_LEVEL_FULL - 1))
if(repairs)
@@ -206,7 +206,7 @@
if(occupant)
to_chat(H, "The cell is already occupied!")
return
- if(ismodcontrol(H.back) || H.get_int_organ(/obj/item/organ/internal/cell))
+ if(ismodcontrol(H.back) || ismachineperson(H))
can_accept_user = TRUE
if(!can_accept_user)
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 18cc38eac8b7..f31a573e270e 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -383,7 +383,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
/obj/machinery/requests_console/proc/print_label(tag_name, tag_index)
var/obj/item/shippingPackage/sp = new /obj/item/shippingPackage(get_turf(src))
sp.sortTag = tag_index
- sp.update_desc()
+ sp.update_appearance(UPDATE_DESC)
print_cooldown = world.time + 600 //1 minute cooldown before you can print another label, but you can still configure the next one during this time
/obj/machinery/requests_console/proc/view_messages()
diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm
index dda3f5cef56b..c9e42b3434ec 100644
--- a/code/game/machinery/slotmachine.dm
+++ b/code/game/machinery/slotmachine.dm
@@ -165,7 +165,7 @@
// No cheesing with buckling ourselves, this spinning is too fast for seatbelts
if(user.buckled)
- user.buckled.unbuckle_mob(user, force = TRUE)
+ user.unbuckle(force = TRUE)
// Check if the machine and the user are still next to each other
if(!do_after(user, delay = 1.2 SECONDS, target = src, use_default_checks = FALSE))
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 6a3d980797d9..d726a0c00a0b 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -372,7 +372,7 @@
*
**/
/obj/machinery/suit_storage_unit/proc/store_item(obj/item/I, mob/user)
- if((istype(I, /obj/item/clothing/suit)|| istype(I, /obj/item/mod/control)) && !suit)
+ if((istype(I, /obj/item/clothing/suit) || istype(I, /obj/item/mod/control) || istype(I, /obj/item/storage/backpack)) && !suit)
if(try_store_item(I, user))
suit = I
return TRUE
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 3baacc328778..2517b3a3749a 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -214,6 +214,8 @@
continue
if(!is_teleport_allowed(T.z) && !R.cc_beacon)
continue
+ if(R.wormhole_weaver)
+ continue
if(R.syndicate && !emagged)
continue
var/tmpname = T.loc.name
diff --git a/code/game/machinery/vendors/contraband_vendors.dm b/code/game/machinery/vendors/contraband_vendors.dm
index 10992d51c29c..6b9d4d3542a2 100644
--- a/code/game/machinery/vendors/contraband_vendors.dm
+++ b/code/game/machinery/vendors/contraband_vendors.dm
@@ -13,7 +13,7 @@
"Don't you want some?",
"Ping!")
- req_access_txt = "150"
+ req_access = list(ACCESS_SYNDICATE)
products = list(/obj/item/stack/medical/bruise_pack = 2,
/obj/item/stack/medical/ointment = 2,
/obj/item/reagent_containers/syringe/charcoal = 4,
@@ -107,7 +107,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/economy/vending/wallmed/syndicate, 32
desc = "An overwhelming amount of ancient patriotism washes over you just by looking at the machine."
icon_state = "liberationstation"
icon_lightmask = "liberationstation"
- req_access_txt = "1"
+ req_access = list(ACCESS_SECURITY)
slogan_list = list("Liberation Station: Your one-stop shop for all things second amendment!",
"Be a patriot today, pick up a gun!",
"Quality weapons for cheap prices!",
diff --git a/code/game/machinery/vendors/departmental_vendors.dm b/code/game/machinery/vendors/departmental_vendors.dm
index 069f677f5b4c..63d9b65e5d1f 100644
--- a/code/game/machinery/vendors/departmental_vendors.dm
+++ b/code/game/machinery/vendors/departmental_vendors.dm
@@ -5,7 +5,7 @@
icon_deny = "engivend_deny"
icon_panel = "generic"
category = VENDOR_TYPE_DEPARTMENTAL
- req_one_access_txt = "11;24" // Engineers and atmos techs can use this
+ req_one_access = list(ACCESS_ENGINE_EQUIP, ACCESS_ATMOSPHERICS)
products = list(/obj/item/clothing/glasses/meson/engine = 2,
/obj/item/clothing/glasses/meson/engine/tray = 4,
/obj/item/multitool = 4,
@@ -28,7 +28,7 @@
icon_state = "engi"
icon_deny = "engi_deny"
category = VENDOR_TYPE_DEPARTMENTAL
- req_access_txt = "11"
+ req_access = list(ACCESS_ENGINE_EQUIP)
products = list(/obj/item/clothing/under/rank/engineering/chief_engineer = 4,
/obj/item/clothing/under/rank/engineering/engineer = 40,
/obj/item/clothing/shoes/workboots = 4,
@@ -62,7 +62,7 @@
icon_deny = "robotics_deny"
category = VENDOR_TYPE_DEPARTMENTAL
icon_lightmask = "robotics"
- req_access_txt = "29"
+ req_access = list(ACCESS_ROBOTICS)
products = list(/obj/item/clothing/suit/storage/labcoat = 4,
/obj/item/clothing/under/rank/rnd/roboticist = 4,
/obj/item/stack/cable_coil = 4, /obj/item/flash = 4,
@@ -208,6 +208,7 @@
/obj/item/seeds/orange = 3,
/obj/item/seeds/peanuts = 3,
/obj/item/seeds/pineapple = 3,
+ /obj/item/seeds/plum = 3,
/obj/item/seeds/poppy = 3,
/obj/item/seeds/potato = 3,
/obj/item/seeds/pumpkin = 3,
@@ -252,7 +253,7 @@
"Don't you want some?",
"Ping!")
- req_access_txt = "5"
+ req_access = list(ACCESS_MEDICAL)
category = VENDOR_TYPE_DEPARTMENTAL
products = list(/obj/item/reagent_containers/hypospray/autoinjector/epinephrine = 4,
/obj/item/stack/medical/bruise_pack/advanced = 2,
@@ -330,7 +331,7 @@
icon_deny = "sec_deny"
icon_panel = "wide_vendor"
category = VENDOR_TYPE_DEPARTMENTAL
- req_access_txt = "1"
+ req_access = list(ACCESS_SECURITY)
products = list(/obj/item/restraints/handcuffs = 8,
/obj/item/restraints/handcuffs/cable/zipties = 8,
/obj/item/grenade/flashbang = 4,
diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm
index 4627b13a0d9d..f60dc1aaee1f 100644
--- a/code/game/machinery/vendors/generic_vendors.dm
+++ b/code/game/machinery/vendors/generic_vendors.dm
@@ -249,7 +249,6 @@
"Dont carry your size? How about you shave off some pounds you fat lazy- *BZZT*")
products = list(/obj/item/clothing/under/color/black = 10,
- /obj/item/clothing/under/dress/blackskirt = 10,
/obj/item/clothing/under/color/grey = 10,
/obj/item/clothing/under/color/white = 10,
/obj/item/clothing/under/color/darkred = 10,
@@ -269,11 +268,34 @@
/obj/item/clothing/under/color/purple = 10,
/obj/item/clothing/under/color/lightpurple = 10,
/obj/item/clothing/under/color/pink = 10,
+ /obj/item/clothing/under/dress/blackskirt = 10,
+ /obj/item/clothing/under/color/jumpskirt/black = 10,
+ /obj/item/clothing/under/color/jumpskirt/grey = 10,
+ /obj/item/clothing/under/color/jumpskirt/white = 10,
+ /obj/item/clothing/under/color/jumpskirt/darkred = 10,
+ /obj/item/clothing/under/color/jumpskirt/red = 10,
+ /obj/item/clothing/under/color/jumpskirt/lightred = 10,
+ /obj/item/clothing/under/color/jumpskirt/brown = 10,
+ /obj/item/clothing/under/color/jumpskirt/orange = 10,
+ /obj/item/clothing/under/color/jumpskirt/lightbrown = 10,
+ /obj/item/clothing/under/color/jumpskirt/yellow = 10,
+ /obj/item/clothing/under/color/jumpskirt/yellowgreen = 10,
+ /obj/item/clothing/under/color/jumpskirt/lightgreen = 10,
+ /obj/item/clothing/under/color/jumpskirt/green = 10,
+ /obj/item/clothing/under/color/jumpskirt/aqua = 10,
+ /obj/item/clothing/under/color/jumpskirt/darkblue = 10,
+ /obj/item/clothing/under/color/jumpskirt/blue = 10,
+ /obj/item/clothing/under/color/jumpskirt/lightblue = 10,
+ /obj/item/clothing/under/color/jumpskirt/purple = 10,
+ /obj/item/clothing/under/color/jumpskirt/lightpurple = 10,
+ /obj/item/clothing/under/color/jumpskirt/pink = 10,
+ /obj/item/clothing/under/color/jumpskirt/rainbow = 1,
/obj/item/clothing/under/color/rainbow = 1)
contraband = list(/obj/item/clothing/under/syndicate/tacticool = 5,
/obj/item/clothing/under/syndicate/greyman = 5,
- /obj/item/clothing/under/color/orange/prison = 5)
+ /obj/item/clothing/under/color/orange/prison = 10,
+ /obj/item/clothing/under/color/jumpskirt/orange/prison = 10)
prices = list(/obj/item/clothing/under/color/black = 30,
/obj/item/clothing/under/dress/blackskirt = 30,
@@ -297,8 +319,30 @@
/obj/item/clothing/under/color/lightpurple = 50,
/obj/item/clothing/under/color/pink = 50,
/obj/item/clothing/under/color/rainbow = 100,
+ /obj/item/clothing/under/color/jumpskirt/black = 30,
+ /obj/item/clothing/under/color/jumpskirt/grey = 30,
+ /obj/item/clothing/under/color/jumpskirt/white = 50,
+ /obj/item/clothing/under/color/jumpskirt/darkred = 50,
+ /obj/item/clothing/under/color/jumpskirt/red = 50,
+ /obj/item/clothing/under/color/jumpskirt/lightred = 50,
+ /obj/item/clothing/under/color/jumpskirt/brown = 30,
+ /obj/item/clothing/under/color/jumpskirt/orange = 50,
+ /obj/item/clothing/under/color/jumpskirt/lightbrown = 30,
+ /obj/item/clothing/under/color/jumpskirt/yellow = 50,
+ /obj/item/clothing/under/color/jumpskirt/yellowgreen = 50,
+ /obj/item/clothing/under/color/jumpskirt/lightgreen = 50,
+ /obj/item/clothing/under/color/jumpskirt/green = 50,
+ /obj/item/clothing/under/color/jumpskirt/aqua = 50,
+ /obj/item/clothing/under/color/jumpskirt/darkblue = 50,
+ /obj/item/clothing/under/color/jumpskirt/blue = 50,
+ /obj/item/clothing/under/color/jumpskirt/lightblue = 30,
+ /obj/item/clothing/under/color/jumpskirt/purple = 50,
+ /obj/item/clothing/under/color/jumpskirt/lightpurple = 50,
+ /obj/item/clothing/under/color/jumpskirt/pink = 50,
+ /obj/item/clothing/under/color/jumpskirt/rainbow = 100,
/obj/item/clothing/under/syndicate/tacticool = 75,
/obj/item/clothing/under/syndicate/greyman = 75,
+ /obj/item/clothing/under/color/jumpskirt/orange/prison = 75,
/obj/item/clothing/under/color/orange/prison = 75)
refill_canister = /obj/item/vending_refill/suitdispenser
diff --git a/code/game/machinery/vendors/vending.dm b/code/game/machinery/vendors/vending.dm
index 00d957ab8107..76090845a8f5 100644
--- a/code/game/machinery/vendors/vending.dm
+++ b/code/game/machinery/vendors/vending.dm
@@ -64,7 +64,6 @@
// List of vending_product items available.
var/list/product_records = list()
var/list/hidden_records = list()
- var/list/imagelist = list()
/// Unimplemented list of ads that are meant to show up somewhere, but don't.
var/list/ads_list = list()
@@ -160,10 +159,6 @@
if(build_inv) //non-constructable vending machine
build_inventory(products, product_records)
build_inventory(contraband, hidden_records)
- for(var/datum/data/vending_product/R in (product_records + hidden_records))
- var/obj/item/I = R.product_path
- var/pp = replacetext(replacetext("[R.product_path]", "/obj/item/", ""), "/", "-")
- imagelist[pp] = "[icon2base64(icon(initial(I.icon), initial(I.icon_state), SOUTH, 1))]"
if(LAZYLEN(slogan_list))
// So not all machines speak at the exact same time.
@@ -645,10 +640,12 @@
data["product_records"] = list()
var/i = 1
for(var/datum/data/vending_product/R in product_records)
+ var/obj/item = R.product_path
var/list/data_pr = list(
- path = replacetext(replacetext("[R.product_path]", "/obj/item/", ""), "/", "-"),
name = R.name,
- price = (R.product_path in prices) ? prices[R.product_path] : 0,
+ price = (item in prices) ? prices[item] : 0,
+ icon = item.icon,
+ icon_state = item.icon_state,
max_amount = R.max_amount,
is_hidden = FALSE,
inum = i++
@@ -656,17 +653,18 @@
data["product_records"] += list(data_pr)
data["hidden_records"] = list()
for(var/datum/data/vending_product/R in hidden_records)
+ var/obj/item = R.product_path
var/list/data_hr = list(
- path = replacetext(replacetext("[R.product_path]", "/obj/item/", ""), "/", "-"),
name = R.name,
- price = (R.product_path in prices) ? prices[R.product_path] : 0,
+ price = (item in prices) ? prices[item] : 0,
+ icon = item.icon,
+ icon_state = item.icon_state,
max_amount = R.max_amount,
is_hidden = TRUE,
inum = i++,
premium = TRUE
)
data["hidden_records"] += list(data_hr)
- data["imagelist"] = imagelist
return data
/obj/machinery/economy/vending/ui_act(action, params, datum/tgui/ui)
diff --git a/code/game/mecha/equipment/tools/janitor_tools.dm b/code/game/mecha/equipment/tools/janitor_tools.dm
new file mode 100644
index 000000000000..fa045b8fc0cf
--- /dev/null
+++ b/code/game/mecha/equipment/tools/janitor_tools.dm
@@ -0,0 +1,302 @@
+// Mecha mop, light replacer, mecha spray, garbage bag
+
+/obj/item/mecha_parts/mecha_equipment/janitor
+
+/obj/item/mecha_parts/mecha_equipment/janitor/can_attach(obj/mecha/nkarrdem/M)
+ if(..() && istype(M))
+ return TRUE
+
+// Mop
+//! How many seconds before the mopping sound triggers again
+#define MOP_SOUND_CD 2 SECONDS
+
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_mop
+ name = "\improper WLLY mega mop"
+ desc = "An upsized advanced mop, designed for use in exosuits."
+ icon_state = "mecha_mop"
+ equip_cooldown = 1.5 SECONDS
+ energy_drain = 1
+ range = MECHA_MELEE | MECHA_RANGED
+ /// When the mopping sound was last played.
+ COOLDOWN_DECLARE(mop_sound_cooldown)
+ /// How fast does this mop?
+ var/mop_speed = 2 SECONDS
+ /// Toggle for refilling itself
+ var/refill_enabled = TRUE
+ /// Rate per process() tick mop refills itself
+ var/refill_rate = 5
+ /// Power use per process to refill reagents
+ var/refill_cost = 10
+ /// What reagent to refill with
+ var/refill_reagent = "water"
+
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_mop/Initialize(mapload)
+ . = ..()
+ create_reagents(1000)
+ reagents.add_reagent("water", 1000)
+ START_PROCESSING(SSobj, src)
+
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_mop/emag_act(mob/user)
+ . = ..()
+ emagged = TRUE
+ to_chat(user, "You short out the automatic watering system on [src].")
+ reagents.clear_reagents()
+ refill_reagent = "lube"
+ refill_cost = 50
+
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_mop/action(atom/target)
+ if(get_dist(chassis, target) > 2)
+ return
+ if(istype(target, /obj/structure/reagent_dispensers/watertank) && get_dist(chassis,target) <= 1)
+ var/obj/structure/reagent_dispensers/watertank/WT = target
+ WT.reagents.trans_to(src, 1000)
+ occupant_message("Mop refilled.")
+ playsound(chassis, 'sound/effects/refill.ogg', 50, TRUE, -6)
+ return
+ if(reagents.total_volume > 0)
+ if(COOLDOWN_FINISHED(src, mop_sound_cooldown))
+ playsound(loc, pick('sound/weapons/mopping1.ogg', 'sound/weapons/mopping2.ogg'), 30, TRUE, -1)
+ COOLDOWN_START(src, mop_sound_cooldown, MOP_SOUND_CD)
+ // 3x3 mopping area
+ var/turf/target_turf = get_turf(target)
+ if(!istype(target_turf) || iswallturf(target_turf))
+ return
+ chassis.occupant.visible_message("[chassis] begins to mop \the [target_turf] with \the [src].", "You begin to mop \the [target_turf] with \the [src].")
+ if(do_after(chassis.occupant, mop_speed, target = target, allow_moving = 0))
+ for(var/turf/current_target_turf in view(1, target))
+ current_target_turf.cleaning_act(chassis.occupant, src, mop_speed, "mop", ".", skip_do_after = TRUE)
+ chassis.occupant_message("You mop \the [target].")
+
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_mop/post_clean(atom/target, mob/user)
+ var/turf/T = get_turf(target)
+ if(issimulatedturf(T))
+ reagents.reaction(T, REAGENT_TOUCH, 10) // 10 is the multiplier for the reaction effect. 10 is needed to properly wet a floor.
+ reagents.remove_any(1) // reaction() doesn't use up the reagents
+
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_mop/can_clean()
+ return reagents.has_reagent("water", 1) || reagents.has_reagent("cleaner", 1) || reagents.has_reagent("holywater", 1)
+
+// Auto-regeneration of water. Takes energy.
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_mop/process()
+ if(reagents.total_volume < 1000)
+ reagents.add_reagent(refill_reagent, refill_rate)
+ chassis.use_power(refill_cost)
+ update_equip_info()
+
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_mop/get_equip_info()
+ var/output = ..()
+ if(output)
+ return "[output] \[Refill [refill_enabled? "Enabled" : "Disabled"]\] \[[reagents.total_volume]\]"
+
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_mop/Topic(href, href_list)
+ ..()
+ var/datum/topic_input/afilter = new (href, href_list)
+ if(afilter.get("toggle_mode"))
+ refill_enabled = !refill_enabled
+ if(refill_enabled)
+ START_PROCESSING(SSobj, src)
+ else
+ STOP_PROCESSING(SSobj, src)
+ update_equip_info()
+
+#undef MOP_SOUND_CD
+
+// Light Replacer
+/obj/item/mecha_parts/mecha_equipment/janitor/light_replacer
+ name = "\improper NT-12 illuminator"
+ desc = "A modified light replacer fit for an exosuit that zaps lights into place."
+ icon_state = "mecha_light_replacer"
+ equip_cooldown = 1.5 SECONDS
+ energy_drain = 100
+ range = MECHA_MELEE | MECHA_RANGED
+
+/obj/item/mecha_parts/mecha_equipment/janitor/light_replacer/emag_act(mob/user)
+ . = ..()
+ emagged = TRUE
+ to_chat(user, "You short out the safeties on [src].")
+
+/obj/item/mecha_parts/mecha_equipment/janitor/light_replacer/action(atom/target)
+ if(istype(target, /obj/machinery/light))
+ chassis.Beam(target, icon_state = "rped_upgrade", icon = 'icons/effects/effects.dmi', time = 5)
+ playsound(src, 'sound/items/pshoom.ogg', 40, 1)
+ var/obj/machinery/light/light_to_fix = target
+ light_to_fix.fix(chassis.occupant, src, emagged)
+
+// Mecha spray
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_spray
+ name = "\improper JS-33 super spray"
+ desc = "A spray bottle, upscaled for an exosuit. Capable of mass sanitation."
+ icon_state = "mecha_spray"
+ equip_cooldown = 1.5 SECONDS
+ energy_drain = 200
+ range = MECHA_MELEE | MECHA_RANGED
+ /// Toggle for refilling itself
+ var/refill_enabled = TRUE
+ /// Rate per process() tick spray refills itself
+ var/refill_rate = 1
+ /// Power use per process to refill reagents
+ var/refill_cost = 25
+ /// What reagent to refill with
+ var/refill_reagent = "cleaner"
+ /// The range of tiles the sprayer will reach.
+ var/spray_range = 4
+ /// Internal sprayer object
+ var/obj/item/reagent_containers/spray/spray_controller = new /obj/item/reagent_containers/spray
+
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_spray/Initialize(mapload)
+ . = ..()
+ // Setup spray controller
+ spray_controller.loc = src
+ spray_controller.spray_maxrange = spray_range
+ spray_controller.spray_currentrange = spray_range
+ spray_controller.volume = 100
+ spray_controller.reagents.add_reagent("cleaner", 100)
+ START_PROCESSING(SSobj, src)
+
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_spray/emag_act(mob/user)
+ . = ..()
+ emagged = TRUE
+ to_chat(user, "You short out the automatic watering system on [src].")
+ spray_controller.reagents.clear_reagents()
+ refill_reagent = "lube"
+ refill_cost = 50
+ refill_rate = 5
+
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_spray/action(atom/target)
+ if(spray_controller.reagents.total_volume < 15) // Needs at least enough reagents to apply the full spray
+ to_chat(chassis.occupant, "*click*")
+ playsound(src, 'sound/weapons/empty.ogg', 100, 1)
+ return
+ var/direction = get_dir(chassis, target)
+ var/turf/T = get_turf(target)
+ var/turf/T1 = get_step(T, turn(direction, 90))
+ var/turf/T2 = get_step(T, turn(direction, -90))
+ var/list/the_targets = list(T, T1, T2)
+ playsound(chassis, 'sound/effects/spray2.ogg', 75, TRUE, -3)
+ for(var/turf/target_turf in the_targets)
+ INVOKE_ASYNC(src, PROC_REF(spray), target_turf)
+
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_spray/proc/spray(turf/target)
+ spray_controller.spray(target)
+
+// Auto-regeneration of space cleaner. Takes energy.
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_spray/process()
+ if(spray_controller.reagents.total_volume < 100)
+ spray_controller.reagents.add_reagent(refill_reagent, refill_rate)
+ chassis.use_power(refill_cost)
+ update_equip_info()
+
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_spray/get_equip_info()
+ var/output = ..()
+ if(output)
+ return "[output] \[Refill [refill_enabled? "Enabled" : "Disabled"]\] \[[spray_controller.reagents.total_volume]\]"
+
+/obj/item/mecha_parts/mecha_equipment/janitor/mega_spray/Topic(href,href_list)
+ ..()
+ var/datum/topic_input/afilter = new (href,href_list)
+ if(afilter.get("toggle_mode"))
+ refill_enabled = !refill_enabled
+ if(refill_enabled)
+ START_PROCESSING(SSobj, src)
+ else
+ STOP_PROCESSING(SSobj, src)
+ update_equip_info()
+
+// Garbage Magnet
+/obj/item/mecha_parts/mecha_equipment/janitor/garbage_magnet
+ name = "\improper WA1E Garbage Magnet"
+ desc = "Bluespace technology integrated with an oversized garbage bag and heavy duty magnets allows this device to pick up all manner of litter. \
+ The complex technology prevents users from directly looking inside the bag."
+ icon_state = "mecha_trash_magnet"
+ equip_cooldown = 1.5 SECONDS
+ energy_drain = 5
+ range = MECHA_MELEE | MECHA_RANGED
+ /// Toggle for filling the bag (true) or emptying (false)
+ var/bagging = TRUE
+ /// Toggle for wide area or single tile pickups
+ var/extended = FALSE
+ /// Garbage magnet range
+ var/max_range = 3
+ /// List of items the bag cannot hold
+ var/list/cant_hold = list(/obj/item/disk/nuclear, /obj/item/grown/bananapeel/traitorpeel, /obj/item/storage/bag)
+ /// Handles controlling the storage of items
+ var/obj/item/storage/bag/trash/storage_controller = new /obj/item/storage/bag/trash
+
+/obj/item/mecha_parts/mecha_equipment/janitor/garbage_magnet/Initialize(mapload)
+ . = ..()
+ storage_controller.loc = src
+ storage_controller.storage_slots = 100
+ storage_controller.max_combined_w_class = 100
+ storage_controller.max_w_class = WEIGHT_CLASS_NORMAL
+ storage_controller.w_class = WEIGHT_CLASS_NORMAL
+ storage_controller.allow_same_size = TRUE // This needs to be true or it won't be able to pick up smaller storages like boxes
+ storage_controller.cant_hold = typecacheof(cant_hold)
+
+/obj/item/mecha_parts/mecha_equipment/janitor/garbage_magnet/deconstruct()
+ var/turf/T = get_turf(src)
+ for(var/obj/item/I in storage_controller.contents)
+ storage_controller.remove_from_storage(I, T)
+ qdel(src)
+
+/obj/item/mecha_parts/mecha_equipment/janitor/garbage_magnet/get_equip_info()
+ var/output = ..()
+ if(output)
+ return "[output] \[[bagging? "Filling" : "Dumping"]\] \[Area [extended? "Extended" : "Focused"]\] \[Cargo: [length(storage_controller.contents)]/[storage_controller.max_combined_w_class]\]\]"
+
+/obj/item/mecha_parts/mecha_equipment/janitor/garbage_magnet/Topic(href,href_list)
+ ..()
+ var/datum/topic_input/afilter = new (href,href_list)
+ if(afilter.get("toggle_bagging"))
+ bagging = !bagging
+ update_equip_info()
+ return
+ if(afilter.get("toggle_extended"))
+ extended = !extended
+ update_equip_info()
+ return
+
+/obj/item/mecha_parts/mecha_equipment/janitor/garbage_magnet/action(atom/target)
+ var/target_distance = get_dist(chassis, target)
+ if(target_distance > max_range)
+ return
+
+ for(var/turf/tested_turf in get_line(chassis, target)) // Check if the path is blocked
+ if(iswallturf(tested_turf) || locate(/obj/structure/window) in tested_turf || locate(/obj/machinery/door) in tested_turf) // walls, windows, and doors
+ chassis.occupant_message("The target is out of reach of the magnet!")
+ return
+
+ if(istype(target, /obj/machinery/disposal)) // Emptying stuff into disposals
+ chassis.occupant.visible_message(
+ "[chassis.occupant] empties [src] into the disposal unit.",
+ "You empty [src] into disposal unit.",
+ "You hear someone emptying something into a disposal unit."
+ )
+ chassis.Beam(target, icon_state = "rped_upgrade", icon = 'icons/effects/effects.dmi', time = 5)
+ playsound(src, 'sound/items/pshoom.ogg', 40, 1)
+ for(var/obj/item/I in storage_controller.contents)
+ storage_controller.remove_from_storage(I, target)
+ return
+ var/turf/target_turf
+ if(iswallturf(target))
+ return
+ if(isturf(target))
+ target_turf = target
+ else
+ target_turf = get_turf(target)
+ if(bagging) // If picking up
+ if(extended) // If extended reach
+ for(var/turf/current_target_turf in view(1, target_turf))
+ for(var/obj/item/I in current_target_turf.contents)
+ if(storage_controller.can_be_inserted(I))
+ storage_controller.handle_item_insertion(I, null, TRUE)
+ else // Single turf
+ for(var/obj/item/I in target_turf.contents)
+ if(storage_controller.can_be_inserted(I))
+ storage_controller.handle_item_insertion(I, null, TRUE)
+ chassis.occupant_message("You pick up all the items with [src]. Remaining cargo compartment capacity: [storage_controller.max_combined_w_class - length(storage_controller.contents)]")
+
+ else // Dumping
+ for(var/obj/item/I in storage_controller.contents)
+ storage_controller.remove_from_storage(I, target_turf)
+ chassis.occupant_message("You dump everything out of [src].")
+ update_equip_info()
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index 64a264cf40a2..6552d9b32067 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -292,10 +292,10 @@
if(mode)
return analyze_reagents(target)
if(!length(syringes))
- occupant_message("No syringes loaded.")
+ occupant_message("No syringes loaded.")
return
if(reagents.total_volume<=0)
- occupant_message("No available reagents to load syringe with.")
+ occupant_message("No available reagents to load syringe with.")
return
var/turf/trg = get_turf(target)
var/obj/item/reagent_containers/syringe/mechsyringe = syringes[1]
@@ -324,7 +324,7 @@
var/mob/living/carbon/M = safepick(mobs)
if(M)
var/R
- mechsyringe.visible_message(" [M] was hit by the syringe!")
+ mechsyringe.visible_message(" [M] was hit by the syringe!")
if(M.can_inject(originaloccupant, TRUE, original_target_zone))
if(mechsyringe.reagents)
for(var/datum/reagent/A in mechsyringe.reagents.reagent_list)
@@ -470,7 +470,7 @@
occupant_message("The object is too far away.")
return FALSE
if(!A.reagents || ismob(A))
- occupant_message("No reagent info gained from [A].")
+ occupant_message("No reagent info gained from [A].")
return FALSE
occupant_message("Analyzing reagents...")
for(var/datum/reagent/R as anything in A.reagents.reagent_list)
@@ -504,7 +504,7 @@
if(..())
return
if(!length(processed_reagents) || reagents.total_volume >= reagents.maximum_volume || !chassis.has_charge(energy_drain))
- occupant_message("Reagent processing stopped.")
+ occupant_message("Reagent processing stopped.")
log_message("Reagent processing stopped.")
STOP_PROCESSING(SSobj, src)
return
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index 7d8f64ed04e9..934c7c364bfc 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -479,10 +479,9 @@
/obj/item/kinetic_crusher/mecha/Initialize(mapload)
. = ..()
- var/datum/component/unwanted = GetComponent(/datum/component/parry)
- unwanted?.RemoveComponent()
- unwanted = GetComponent(/datum/component/two_handed)
- unwanted?.RemoveComponent()
+ DeleteComponent(/datum/component/parry)
+ DeleteComponent(/datum/component/two_handed)
+
/// This is only for the sake of internal checks in the crusher itself.
ADD_TRAIT(src, TRAIT_WIELDED, "mech[UID()]")
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 59762a095485..13a6887278ba 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -391,6 +391,37 @@
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang/limited/rearm()
return//Extra bit of security
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/cleaner
+ name = "\improper N23 Rotary Janitation Launcher"
+ desc = "A tool of mass cleaning. Launches primed cleaning foam grenades. Major slipping hazard."
+ icon_state = "mecha_grenadelnchr"
+ origin_tech = "combat=4;engineering=4"
+ projectile = /obj/item/grenade/chem_grenade/cleaner
+ fire_sound = 'sound/effects/bang.ogg'
+ equip_cooldown = 6 SECONDS
+ projectiles = 6
+ missile_speed = 1.5
+ projectile_energy_cost = 1000
+ size = 1
+ /// Time until grenade detonates
+ var/det_time = 2 SECONDS
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/cleaner/action(target, params)
+ if(!action_checks(target))
+ return
+ set_ready_state(0)
+ var/obj/item/grenade/chem_grenade/cleaner/grenade = new projectile(chassis.loc)
+ playsound(chassis, fire_sound, 50, TRUE)
+ grenade.throw_at(target, missile_range, missile_speed)
+ projectiles--
+ log_message("Fired from [name], targeting [target].")
+ log_attack(chassis.occupant, target, "Cleaning grenade fired from [name], targeting [target].")
+ addtimer(CALLBACK(grenade, TYPE_PROC_REF(/obj/item/grenade/chem_grenade/cleaner, prime)), det_time)
+ do_after_cooldown()
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/cleaner/can_attach(obj/mecha/nkarrdem/M as obj)
+ return istype(M) && length(M.equipment) < M.max_equip
+
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar
equip_cooldown = 2 SECONDS
name = "banana mortar"
diff --git a/code/game/mecha/janitor/nkarrdem.dm b/code/game/mecha/janitor/nkarrdem.dm
new file mode 100644
index 000000000000..7018c5979403
--- /dev/null
+++ b/code/game/mecha/janitor/nkarrdem.dm
@@ -0,0 +1,92 @@
+/obj/mecha/nkarrdem
+ desc = "A heavy duty sanitation exosuit; optimized for the removal of mass amounts of dirt, grime, and grease."
+ name = "Nkarrdem"
+ icon_state = "nkarrdem"
+ initial_icon = "nkarrdem"
+ step_in = 3
+ turnsound = 'sound/mecha/mechmove01.ogg'
+ stepsound = 'sound/mecha/mechstep.ogg'
+ max_temperature = 10000
+ max_integrity = 110
+ max_equip = 4
+ wreckage = /obj/structure/mecha_wreckage/nkarrdem
+ internal_damage_threshold = 35
+ deflect_chance = 15
+ step_energy_drain = 6
+ normal_step_energy_drain = 6
+ /// Is the janihud on?
+ var/builtin_hud_user = FALSE
+ /// Action that controls the floor buffer
+ var/datum/action/innate/mecha/mech_toggle_floorbuffer/floorbuffer_action = new
+
+/obj/mecha/nkarrdem/examine_more(mob/user)
+ ..()
+ . = list()
+ . += "The Nkarrdem is an older-generation CBRN mech developed jointly by Interdyne and Shellguard for rapid decontamination during a period where biological weapons are frequently used, though it suffered from several \
+ cost-cutting measures that exposes the operator to the hazardous environments. Surplus units are then sold for cleaning purposes."
+ . += ""
+ . += "The name 'Nkarrdem' comes from Skrellian legend, meaning 'Turquoise Fields'. The Turquoise Fields are an algae plataeu, where the kings of old would go to their final rest."
+
+
+/obj/mecha/nkarrdem/moved_inside(mob/living/carbon/human/H)
+ . = ..()
+ if(. && ishuman(H))
+ if(istype(H.glasses, /obj/item/clothing/glasses/hud))
+ occupant_message("[H.glasses] prevent you from using [src]'s built-in janitorial HUD.")
+ else
+ var/datum/atom_hud/data/janitor/jani_hud = GLOB.huds[DATA_HUD_JANITOR]
+ jani_hud.add_hud_to(H)
+ builtin_hud_user = TRUE
+
+/obj/mecha/nkarrdem/mmi_moved_inside(obj/item/mmi/mmi_as_oc, mob/user)
+ . = ..()
+ if(.)
+ if(occupant.client)
+ var/datum/atom_hud/data/janitor/jani_hud = GLOB.huds[DATA_HUD_JANITOR]
+ jani_hud.add_hud_to(occupant)
+ builtin_hud_user = TRUE
+
+/obj/mecha/nkarrdem/go_out()
+ if(ishuman(occupant) && builtin_hud_user)
+ var/mob/living/carbon/human/H = occupant
+ var/datum/atom_hud/data/janitor/jani_hud = GLOB.huds[DATA_HUD_JANITOR]
+ jani_hud.remove_hud_from(H)
+ builtin_hud_user = FALSE
+ else if((isbrain(occupant) || pilot_is_mmi()) && builtin_hud_user)
+ var/mob/living/brain/H = occupant
+ var/datum/atom_hud/data/janitor/jani_hud = GLOB.huds[DATA_HUD_JANITOR]
+ jani_hud.remove_hud_from(H)
+ builtin_hud_user = FALSE
+ return ..()
+
+/obj/mecha/nkarrdem/GrantActions(mob/living/user, human_occupant = 0)
+ . = ..()
+ floorbuffer_action.Grant(user, src)
+
+/obj/mecha/nkarrdem/RemoveActions(mob/living/user, human_occupant = 0)
+ . = ..()
+ floorbuffer_action.Remove(user)
+
+// Moving has to clean floors if the buffer is active
+/obj/mecha/nkarrdem/Move()
+ . = ..()
+ if(!floor_buffer)
+ return
+ var/turf/tile = get_turf(src)
+ if(!isturf(tile))
+ return
+ tile.clean_blood()
+ for(var/obj/effect/E in tile)
+ if(E.is_cleanable())
+ qdel(E)
+
+/obj/mecha/nkarrdem/loaded/Initialize(mapload)
+ . = ..()
+ var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/janitor/mega_spray
+ ME.attach(src)
+ ME = new /obj/item/mecha_parts/mecha_equipment/janitor/mega_mop
+ ME.attach(src)
+ ME = new /obj/item/mecha_parts/mecha_equipment/janitor/light_replacer
+ ME.attach(src)
+ ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/cleaner
+ ME.attach(src)
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index c64cfd40f11e..efcbd0ff3bfa 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -71,6 +71,7 @@
"MODsuit Modules",
"Ripley",
"Firefighter",
+ "Nkarrdem",
"Odysseus",
"Gygax",
"Durand",
@@ -246,6 +247,8 @@
/obj/machinery/mecha_part_fabricator/proc/build_design_timer_finish(datum/design/D, list/final_cost)
// Spawn the item (in a lockbox if restricted) OR mob (e.g. IRC body)
var/atom/A = new D.build_path(get_step(src, output_dir))
+ if(is_station_level(z))
+ SSblackbox.record_feedback("tally", "station_mechfab_production", 1, "[D.type]")
if(isitem(A))
var/obj/item/I = A
I.materials = final_cost
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 813b9983e04f..bd96797ad522 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -109,6 +109,10 @@
var/phasing = FALSE
var/phasing_energy_drain = 200
var/phase_state = "" //icon_state when phasing
+ /// How much speed the mech loses while the buffer is active
+ var/buffer_delay = 1
+ /// Does it clean the tile under it?
+ var/floor_buffer = FALSE
//Action datums
var/datum/action/innate/mecha/mech_eject/eject_action = new
@@ -155,7 +159,7 @@
qdel(V)
set_light(lights_range_ambient, lights_power_ambient)
- update_overlays()
+ update_icon(UPDATE_OVERLAYS)
/obj/mecha/update_overlays()
. = ..()
@@ -1033,7 +1037,7 @@
AI.forceMove(src)
occupant = AI
icon_state = reset_icon(icon_state)
- update_overlays()
+ update_icon(UPDATE_OVERLAYS)
playsound(src, 'sound/machines/windowdoor.ogg', 50, 1)
if(!hasInternalDamage())
SEND_SOUND(occupant, sound(nominalsound, volume = 50))
@@ -1191,7 +1195,7 @@
H.throw_alert("locked", /atom/movable/screen/alert/mech_maintenance)
if(connected_port)
H.throw_alert("mechaport_d", /atom/movable/screen/alert/mech_port_disconnect)
- update_overlays()
+ update_icon(UPDATE_OVERLAYS)
return TRUE
else
return FALSE
@@ -1247,7 +1251,7 @@
Move(loc)
icon_state = reset_icon()
dir = dir_in
- update_overlays()
+ update_icon(UPDATE_OVERLAYS)
log_message("[mmi_as_oc] moved in as pilot.")
if(!hasInternalDamage())
SEND_SOUND(occupant, sound(nominalsound, volume = 50))
@@ -1337,7 +1341,7 @@
if(ishuman(L))
var/mob/living/carbon/human/H = L
H.regenerate_icons() // workaround for 14457
- update_overlays()
+ update_icon(UPDATE_OVERLAYS)
/obj/mecha/force_eject_occupant(mob/target)
go_out()
diff --git a/code/game/mecha/mecha_actions.dm b/code/game/mecha/mecha_actions.dm
index 316e4eb737e5..437cf6aba105 100644
--- a/code/game/mecha/mecha_actions.dm
+++ b/code/game/mecha/mecha_actions.dm
@@ -221,6 +221,22 @@
playsound(src, 'sound/mecha/mechmove01.ogg', 50, TRUE)
UpdateButtons()
+// Floor Buffer Action
+/datum/action/innate/mecha/mech_toggle_floorbuffer
+ name = "Toggle Floor Buffer"
+ desc = "Movement speed is decreased while active."
+ button_overlay_icon = 'icons/obj/vehicles.dmi'
+ button_overlay_icon_state = "upgrade"
+
+/datum/action/innate/mecha/mech_toggle_floorbuffer/Activate()
+ if(!chassis.floor_buffer)
+ chassis.floor_buffer = TRUE
+ chassis.step_in += chassis.buffer_delay
+ else
+ chassis.floor_buffer = FALSE
+ chassis.step_in -= chassis.buffer_delay
+ to_chat(usr, "The floor buffer is now [chassis.floor_buffer ? "active" : "deactivated"].")
+
/datum/action/innate/mecha/select_module
name = "Hey, you shouldn't see this please make a bug report"
var/obj/item/mecha_parts/mecha_equipment/equipment
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 02e7450f548c..9f212e3400a8 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -1810,4 +1810,249 @@
holder.icon_state = "odysseus12"
return 1
+// NKARRDEM
+
+/datum/construction/mecha/nkarrdem_chassis
+ steps = list(list("key"=/obj/item/mecha_parts/part/nkarrdem_torso), // 1
+ list("key"=/obj/item/mecha_parts/part/nkarrdem_head), // 2
+ list("key"=/obj/item/mecha_parts/part/nkarrdem_left_arm), // 3
+ list("key"=/obj/item/mecha_parts/part/nkarrdem_right_arm), // 4
+ list("key"=/obj/item/mecha_parts/part/nkarrdem_left_leg), // 5
+ list("key"=/obj/item/mecha_parts/part/nkarrdem_right_leg) // 6
+ )
+
+/datum/construction/mecha/nkarrdem_chassis/custom_action(step, atom/used_atom, mob/user)
+ user.visible_message("[user] has connected [used_atom] to the [holder].", "You connect [used_atom] to the [holder]")
+ holder.overlays += used_atom.icon_state + "+o"
+ qdel(used_atom)
+ return TRUE
+
+/datum/construction/mecha/nkarrdem_chassis/action(atom/used_atom,mob/user as mob)
+ return check_all_steps(used_atom,user)
+
+/datum/construction/mecha/nkarrdem_chassis/spawn_result(mob/user, result_name)
+ ..(user, "Nkarrdem")
+ var/obj/item/mecha_parts/chassis/const_holder = holder
+ const_holder.construct = new /datum/construction/reversible/mecha/nkarrdem(const_holder)
+ const_holder.icon = 'icons/mecha/mech_construction.dmi'
+ const_holder.icon_state = "nkarrdem0"
+ const_holder.density = TRUE
+ qdel(src)
+
+/datum/construction/reversible/mecha/nkarrdem
+ result = "/obj/mecha/nkarrdem"
+ steps = list(
+ //1
+ list(
+ "key" = TOOL_WELDER,
+ "backkey" = TOOL_WRENCH,
+ "desc" = "External armor is wrenched."),
+ //2
+ list(
+ "key" = TOOL_WRENCH,
+ "backkey" = TOOL_CROWBAR,
+ "desc" = "External armor is installed."),
+ //3
+ list(
+ "key" = /obj/item/stack/sheet/plasteel,
+ "backkey" = TOOL_WELDER,
+ "desc" = "Internal armor is welded."),
+ //4
+ list(
+ "key" = TOOL_WELDER,
+ "backkey" = TOOL_WRENCH,
+ "desc" = "Internal armor is wrenched."),
+ //5
+ list(
+ "key" = TOOL_WRENCH,
+ "backkey" = TOOL_CROWBAR,
+ "desc" = "Internal armor is installed."),
+ //6
+ list(
+ "key" = /obj/item/stack/sheet/metal,
+ "backkey" = TOOL_SCREWDRIVER,
+ "desc" = "Floor buffer is secured."),
+ //7
+ list(
+ "key" = TOOL_SCREWDRIVER,
+ "backkey" = TOOL_CROWBAR,
+ "desc" = "Floor buffer is installed."),
+ //8
+ list(
+ "key" = /obj/item/borg/upgrade/floorbuffer,
+ "backkey" = TOOL_SCREWDRIVER,
+ "desc" = "Peripherals control module is secured."),
+ //9
+ list(
+ "key" = TOOL_SCREWDRIVER,
+ "backkey" = TOOL_CROWBAR,
+ "desc" = "Peripherals control module is installed."),
+ //10
+ list(
+ "key" = /obj/item/circuitboard/mecha/nkarrdem/peripherals,
+ "backkey" = TOOL_SCREWDRIVER,
+ "desc" = "Central control module is secured."),
+
+ //11
+ list(
+ "key" = TOOL_SCREWDRIVER,
+ "backkey" = TOOL_CROWBAR,
+ "desc" = "Central control module is installed."),
+ //12
+ list(
+ "key" = /obj/item/circuitboard/mecha/nkarrdem/main,
+ "backkey" = TOOL_SCREWDRIVER,
+ "desc" = "The wiring is adjusted."),
+ //13
+ list(
+ "key" = /obj/item/wirecutters,
+ "backkey" = TOOL_SCREWDRIVER,
+ "desc" = "The wiring is added."),
+ //14
+ list(
+ "key" = /obj/item/stack/cable_coil,
+ "backkey" = TOOL_SCREWDRIVER,
+ "desc" = "The hydraulic systems are active."),
+ //15
+ list(
+ "key" = TOOL_SCREWDRIVER,
+ "backkey" = TOOL_WRENCH,
+ "desc" = "The hydraulic systems are connected."),
+ //16
+ list(
+ "key" = TOOL_WRENCH,
+ "desc" = "The hydraulic systems are disconnected.")
+ )
+
+/datum/construction/reversible/mecha/nkarrdem/action(atom/used_atom, mob/user)
+ return check_step(used_atom,user)
+
+/datum/construction/reversible/mecha/nkarrdem/custom_action(index, diff, atom/used_atom, mob/user)
+ if(!..())
+ return FALSE
+
+ switch(index)
+ if(16)
+ user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.")
+ holder.icon_state = "nkarrdem1"
+ if(15)
+ if(diff == CONSTRUCTION_PATH_FORWARDS)
+ user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.")
+ holder.icon_state = "nkarrdem2"
+ else
+ user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.")
+ holder.icon_state = "nkarrdem0"
+ if(14)
+ if(diff == CONSTRUCTION_PATH_FORWARDS)
+ user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].")
+ holder.icon_state = "nkarrdem3"
+ else
+ user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.")
+ holder.icon_state = "nkarrdem1"
+ if(13)
+ if(diff == CONSTRUCTION_PATH_FORWARDS)
+ user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].")
+ holder.icon_state = "nkarrdem4"
+ else
+ user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].")
+ var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder))
+ coil.amount = 4
+ holder.icon_state = "nkarrdem2"
+ if(12)
+ if(diff == CONSTRUCTION_PATH_FORWARDS)
+ user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].")
+ qdel(used_atom)
+ holder.icon_state = "nkarrdem5"
+ else
+ user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].")
+ holder.icon_state = "nkarrdem3"
+ if(11)
+ if(diff == CONSTRUCTION_PATH_FORWARDS)
+ user.visible_message("[user] secures the mainboard.", "You secure the mainboard.")
+ holder.icon_state = "nkarrdem6"
+ else
+ user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].")
+ new /obj/item/circuitboard/mecha/nkarrdem/main(get_turf(holder))
+ holder.icon_state = "nkarrdem4"
+ if(10)
+ if(diff == CONSTRUCTION_PATH_FORWARDS)
+ user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].")
+ qdel(used_atom)
+ holder.icon_state = "nkarrdem7"
+ else
+ user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.")
+ holder.icon_state = "nkarrdem5"
+ if(9)
+ if(diff == CONSTRUCTION_PATH_FORWARDS)
+ user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.")
+ holder.icon_state = "nkarrdem8"
+ else
+ user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].")
+ new /obj/item/circuitboard/mecha/nkarrdem/peripherals(get_turf(holder))
+ holder.icon_state = "nkarrdem6"
+ if(8)
+ if(diff == CONSTRUCTION_PATH_FORWARDS)
+ user.visible_message("[user] installs a floor buffer into [holder].", "You install a floor buffer into [holder].")
+ qdel(used_atom)
+ holder.icon_state = "nkarrdem9"
+ else
+ user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.")
+ holder.icon_state = "nkarrdem7"
+ if(7)
+ if(diff == CONSTRUCTION_PATH_FORWARDS)
+ user.visible_message("[user] secures a floor buffer into [holder].", "You secure the floor buffer into [holder].")
+ holder.icon_state = "nkarrdem10"
+ else
+ user.visible_message("[user] removes the floor buffer from the [holder].", "You unfasten the floor buffer from the [holder].")
+ new /obj/item/borg/upgrade/floorbuffer(get_turf(holder))
+ holder.icon_state = "nkarrdem8"
+ if(6)
+ if(diff == CONSTRUCTION_PATH_FORWARDS)
+ user.visible_message("[user] installs the internal armor layer to the [holder].", "You install the internal armor layer to the [holder].")
+ holder.icon_state = "nkarrdem11"
+ else
+ user.visible_message("[user] unfastens the floor buffer.", "You unfasten the floor buffer.")
+ holder.icon_state = "nkarrdem9"
+ if(5)
+ if(diff == CONSTRUCTION_PATH_FORWARDS)
+ user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.")
+ holder.icon_state = "nkarrdem12"
+ else
+ user.visible_message("[user] pries internal armor layer from the [holder].", "You pry internal armor layer from the [holder].")
+ var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/metal(get_turf(holder))
+ MS.amount = 5
+ holder.icon_state = "nkarrdem10"
+ if(4)
+ if(diff == CONSTRUCTION_PATH_FORWARDS)
+ user.visible_message("[user] welds the internal armor layer to the [holder].", "You weld the internal armor layer to the [holder].")
+ holder.icon_state = "nkarrdem13"
+ else
+ user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.")
+ holder.icon_state = "nkarrdem11"
+ if(3)
+ if(diff == CONSTRUCTION_PATH_FORWARDS)
+ user.visible_message("[user] installs [used_atom] layer to the [holder].", "You install the external reinforced armor layer to the [holder].")
+
+ holder.icon_state = "nkarrdem14"
+ else
+ user.visible_message("[user] cuts the internal armor layer from the [holder].", "You cut the internal armor layer from the [holder].")
+ holder.icon_state = "nkarrdem12"
+ if(2)
+ if(diff == CONSTRUCTION_PATH_FORWARDS)
+ user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.")
+ holder.icon_state = "nkarrdem15"
+ else
+ var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder))
+ MS.amount = 5
+ user.visible_message("[user] pries [MS] from the [holder].", "You pry [MS] from the [holder].")
+ holder.icon_state = "nkarrdem13"
+ if(1)
+ if(diff == CONSTRUCTION_PATH_FORWARDS)
+ user.visible_message("[user] welds the external armor layer to the [holder].", "You weld the external armor layer to the [holder].")
+ holder.icon_state = "nkarrdem16"
+ else
+ user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.")
+ holder.icon_state = "nkarrdem14"
+ return TRUE
+
#undef STANDARD_STACK_AMOUNT
diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm
index 6773202fd413..f21c8c915731 100644
--- a/code/game/mecha/mecha_parts.dm
+++ b/code/game/mecha/mecha_parts.dm
@@ -349,6 +349,44 @@
icon_state = "odysseus_armour"
origin_tech = "materials=3;engineering=3")*/
+///////// Nkarrdem
+/obj/item/mecha_parts/chassis/nkarrdem
+ name = "\improper Nkarrdem Chassis"
+
+/obj/item/mecha_parts/chassis/nkarrdem/New()
+ ..()
+ construct = new /datum/construction/mecha/nkarrdem_chassis(src)
+
+/obj/item/mecha_parts/part/nkarrdem_head
+ name = "\improper Nkarrdem head"
+ icon_state = "nkarrdem_head"
+
+/obj/item/mecha_parts/part/nkarrdem_torso
+ name = "\improper Nkarrdem torso"
+ desc = "A torso part of Nkarrdem. Contains power unit, processing core and life support systems."
+ icon_state = "nkarrdem_harness"
+ origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
+
+/obj/item/mecha_parts/part/nkarrdem_left_arm
+ name = "\improper Nkarrdem left arm"
+ desc = "A Nkarrdem left arm. Data and power sockets are compatible with most exosuit tools."
+ icon_state = "nkarrdem_l_arm"
+
+/obj/item/mecha_parts/part/nkarrdem_right_arm
+ name = "\improper Nkarrdem right arm"
+ desc = "A Nkarrdem right arm. Data and power sockets are compatible with most exosuit tools."
+ icon_state = "nkarrdem_r_arm"
+
+/obj/item/mecha_parts/part/nkarrdem_left_leg
+ name = "\improper Nkarrdem left leg"
+ desc = "A Nkarrdem left leg. Contains somewhat complex servodrives and balance maintaining systems."
+ icon_state = "nkarrdem_l_leg"
+
+/obj/item/mecha_parts/part/nkarrdem_right_leg
+ name = "\improper Nkarrdem right leg"
+ desc = "A Nkarrdem right leg. Contains somewhat complex servodrives and balance maintaining systems."
+ icon_state = "nkarrdem_r_leg"
+
///////// Circuitboards
@@ -373,6 +411,16 @@
board_name = "Ripley Peripherals Control Module"
icon_state = "mcontroller"
+/obj/item/circuitboard/mecha/nkarrdem
+ origin_tech = "programming=2"
+
+/obj/item/circuitboard/mecha/nkarrdem/main
+ board_name = "Nkarrdem Central Control Module"
+ icon_state = "mainboard"
+
+/obj/item/circuitboard/mecha/nkarrdem/peripherals
+ board_name = "Nkarrdem Peripherals Control Module"
+ icon_state = "mcontroller"
/obj/item/circuitboard/mecha/gygax
origin_tech = "programming=4;combat=3;engineering=3"
diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm
index c5e87d3789d0..18938ca20548 100644
--- a/code/game/mecha/mecha_wreckage.dm
+++ b/code/game/mecha/mecha_wreckage.dm
@@ -218,3 +218,15 @@
/obj/item/mecha_parts/part/odysseus_right_arm,
/obj/item/mecha_parts/part/odysseus_left_leg,
/obj/item/mecha_parts/part/odysseus_right_leg)
+
+/obj/structure/mecha_wreckage/nkarrdem
+ name = "\improper Nkarrdem wreckage"
+ icon_state = "nkarrdem-broken"
+ parts = list(
+ /obj/item/mecha_parts/part/nkarrdem_torso,
+ /obj/item/mecha_parts/part/nkarrdem_head,
+ /obj/item/mecha_parts/part/nkarrdem_left_arm,
+ /obj/item/mecha_parts/part/nkarrdem_right_arm,
+ /obj/item/mecha_parts/part/nkarrdem_left_leg,
+ /obj/item/mecha_parts/part/nkarrdem_right_leg
+ )
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 9d4b3ab2dc48..cc12806842f4 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -194,4 +194,4 @@
/mob/living/proc/check_buckled()
if(buckled && !(buckled in loc))
- buckled.unbuckle_mob(src, force = TRUE)
+ unbuckle(force = TRUE)
diff --git a/code/game/objects/cleaning.dm b/code/game/objects/cleaning.dm
index 5c81fd4b27bb..82c1df319614 100644
--- a/code/game/objects/cleaning.dm
+++ b/code/game/objects/cleaning.dm
@@ -13,7 +13,9 @@
//Can normally be left alone, but needs to be defined if the thing being cleaned isn't necessarily the thing being clicked on,
//such as /obj/effect/rune/cleaning_act() bouncing to turf/simulated/cleaning_act().
-/atom/proc/cleaning_act(mob/user, atom/cleaner, cleanspeed = 5 SECONDS, text_verb = "clean", text_description = " with [cleaner].", text_targetname = name)
+// skip_do_after - When TRUE, do after and visible messages are disabled
+
+/atom/proc/cleaning_act(mob/user, atom/cleaner, cleanspeed = 5 SECONDS, text_verb = "clean", text_description = " with [cleaner].", text_targetname = name, skip_do_after = FALSE)
var/is_cmagged = FALSE
if(user.client && (src in user.client.screen)) //You can't clean items you're wearing for technical reasons
@@ -25,9 +27,10 @@
text_verb = "clean the ooze off"
cleanspeed = CMAG_CLEANTIME
- user.visible_message("[user] begins to [text_verb] \the [text_targetname][text_description]", "You begin to [text_verb] \the [text_targetname][text_description]")
- if(!do_after(user, cleanspeed, target = src))
- return FALSE
+ if(!skip_do_after)
+ user.visible_message("[user] begins to [text_verb] \the [text_targetname][text_description]", "You begin to [text_verb] \the [text_targetname][text_description]")
+ if(!do_after(user, cleanspeed, target = src))
+ return FALSE
if(!cleaner.can_clean())
cleaner.post_clean(src, user)
@@ -35,7 +38,8 @@
cleaner.post_clean(src, user)
- to_chat(user, "You [text_verb] \the [text_targetname][text_description]")
+ if(!skip_do_after)
+ to_chat(user, "You [text_verb] \the [text_targetname][text_description]")
if(is_cmagged) //If we've cleaned a cmagged object
REMOVE_TRAIT(src, TRAIT_CMAGGED, CLOWN_EMAG)
diff --git a/code/game/objects/effects/alien_acid.dm b/code/game/objects/effects/alien_acid.dm
index 86c1c0c2c730..afc114502d52 100644
--- a/code/game/objects/effects/alien_acid.dm
+++ b/code/game/objects/effects/alien_acid.dm
@@ -53,7 +53,7 @@
/obj/effect/acid/Crossed(AM as mob|obj)
if(isliving(AM))
var/mob/living/L = AM
- if(L.flying)
+ if(HAS_TRAIT(L, TRAIT_FLYING))
return
if(L.m_intent != MOVE_INTENT_WALK && prob(40))
var/acid_used = min(acid_level * 0.05, 20)
diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index ecc63e2fd6a5..05d1197a40b4 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/code/game/objects/effects/anomalies.dm
@@ -51,6 +51,11 @@
countdown.color = countdown_colour
countdown.start()
+ // Only log an anomaly if it drops a core. Prevents logging of SM events and Vetus.
+ if(drops_core)
+ message_admins("\A [name] has spawned at [impact_area][ADMIN_COORDJMP(impact_area)]")
+ log_admin("\A [name] has spawned at [impact_area]")
+
/obj/effect/anomaly/Destroy()
GLOB.poi_list.Remove(src)
STOP_PROCESSING(SSobj, src)
@@ -82,17 +87,17 @@
if(drops_core)
aSignal.forceMove(drop_location())
aSignal = null
- // else, anomaly core gets deleted by qdel(src).
+ // Subtracts the time remaining from lifespan to get defuse time, converts it to seconds
+ var/defuse_time = round((lifespan - (death_time - world.time)) / 10)
+ SSblackbox.record_feedback("ledger", "anomaly_defuse_time", "[defuse_time]", "[type]")
+ // Else, anomaly core gets deleted by qdel(src).
qdel(src)
-
/obj/effect/anomaly/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/analyzer))
to_chat(user, "Analyzing... [src]'s unstable field is fluctuating along frequency [format_frequency(aSignal.frequency)], code [aSignal.code].")
-///////////////////////
-
/obj/effect/anomaly/grav
name = "gravitational anomaly"
icon_state = "shield2"
@@ -169,8 +174,7 @@
if(T && length(GLOB.gravity_generators["[T.z]"]))
var/obj/machinery/gravity_generator/main/G = pick(GLOB.gravity_generators["[T.z]"])
G.set_broken() //Requires engineering to fix the gravity generator, as it gets overloaded by the anomaly.
-
-/////////////////////
+ log_and_message_admins("A [name] has detonated a gravity generator")
/obj/effect/anomaly/flux
name = "flux wave anomaly"
@@ -222,12 +226,12 @@
/obj/effect/anomaly/flux/detonate()
if(explosive)
- explosion(src, 1, 4, 16, 18) //Low devastation, but hits a lot of stuff.
+ explosion(src, 1, 4, 16, 18, FALSE) // Set adminlog to FALSE for custom logging
+ message_admins("\A [name] has detonated at [impact_area][ADMIN_COORDJMP(impact_area)]")
+ log_admin("\A [name] has detonated at [impact_area]")
else
new /obj/effect/particle_effect/sparks(loc)
-/////////////////////
-
/obj/effect/anomaly/bluespace
name = "bluespace anomaly"
icon = 'icons/obj/projectiles.dmi'
@@ -328,9 +332,6 @@
M.client.screen -= blueeffect
qdel(blueeffect)
-
-/////////////////////
-
/obj/effect/anomaly/pyro
name = "pyroclastic anomaly"
icon_state = "mustard"
@@ -365,6 +366,9 @@
/obj/effect/anomaly/pyro/detonate()
if(produces_slime)
INVOKE_ASYNC(src, PROC_REF(makepyroslime))
+ if(drops_core)
+ message_admins("\A [name] has detonated at [impact_area][ADMIN_COORDJMP(impact_area)]")
+ log_admin("\A [name] has detonated at [impact_area]")
/obj/effect/anomaly/pyro/proc/makepyroslime()
var/turf/simulated/T = get_turf(src)
@@ -391,8 +395,6 @@
dust_if_respawnable(chosen)
log_game("[key_name(S.key)] was made into a slime by pyroclastic anomaly at [AREACOORD(T)].")
-/////////////////////
-
/obj/effect/anomaly/cryo
name = "cryogenic anomaly"
desc = "Hope you brought a jacket!"
@@ -466,8 +468,8 @@
air.set_sleeping_agent(3000)
air.set_carbon_dioxide(3000)
T.blind_release_air(air)
-
-/////////////////////
+ message_admins("\A [name] has detonated at [impact_area][ADMIN_COORDJMP(impact_area)]")
+ log_admin("\A [name] has detonated at [impact_area]")
/obj/effect/anomaly/bhole
name = "vortex anomaly"
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index 1e93d42a1040..152ce009b9e1 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -55,7 +55,7 @@
var/turf/T = get_turf(src)
check_gravity(T)
- if((T && (T.density)) || !gravity_check || locate(/obj/structure/window/) in T || locate(/obj/structure/grille/) in T)
+ if(!istype(src, /obj/effect/decal/cleanable/blood/footprints) && ((T && (T.density)) || !gravity_check || locate(/obj/structure/window/full) in T || locate(/obj/structure/grille/) in T))
off_floor = TRUE
layer = ABOVE_MOB_LAYER
plane = GAME_PLANE
diff --git a/code/game/objects/effects/map_effects/mapmanip.dm b/code/game/objects/effects/map_effects/mapmanip.dm
new file mode 100644
index 000000000000..d0be4103dd90
--- /dev/null
+++ b/code/game/objects/effects/map_effects/mapmanip.dm
@@ -0,0 +1,26 @@
+/obj/effect/map_effect/marker/mapmanip
+ name = "mapmanip marker"
+ layer = POINT_LAYER
+
+/obj/effect/map_effect/marker/mapmanip/Initialize(mapload)
+ . = ..()
+ qdel(src)
+
+/obj/effect/map_effect/marker/mapmanip/submap/extract
+ name = "mapmanip marker, extract submap"
+ icon = 'icons/effects/map_effects_96x96.dmi'
+ icon_state = "mapmanip_extract"
+ pixel_x = -32
+ pixel_y = -32
+
+/obj/effect/map_effect/marker/mapmanip/submap/insert
+ name = "mapmanip marker, insert submap"
+ icon = 'icons/effects/map_effects_96x96.dmi'
+ icon_state = "mapmanip_insert"
+ pixel_x = -32
+ pixel_y = -32
+
+/obj/effect/map_effect/marker_helper/mapmanip/submap/edge
+ name = "mapmanip helper marker, edge of submap"
+ icon = 'icons/effects/mapping_helpers.dmi'
+ icon_state = "mapmanip_submap_edge"
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 08b657be0ed8..756be876e05c 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -16,7 +16,7 @@
var/mob/living/M = AM
if(faction && (faction in M.faction))
return
- if(M.flying)
+ if(HAS_TRAIT(M, TRAIT_FLYING))
return
triggermine(M)
diff --git a/code/game/objects/effects/misc_effects.dm b/code/game/objects/effects/misc_effects.dm
index ee56195d173f..bc12b3c7851c 100644
--- a/code/game/objects/effects/misc_effects.dm
+++ b/code/game/objects/effects/misc_effects.dm
@@ -58,7 +58,7 @@
/obj/effect/shut_controller
name = "shut controller"
var/moving = null
- var/list/parts = list( )
+ var/list/parts = list()
/obj/structure/showcase
name = "Showcase"
@@ -86,7 +86,7 @@
name = "mobl"
var/master = null
- var/list/container = list( )
+ var/list/container = list()
/obj/structure/showcase/horrific_experiment
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index 3513a8827f81..c57228f9fb69 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -60,3 +60,11 @@
..()
pixel_x += rand(-10, 10)
pixel_y += rand(-10, 10)
+
+/// Door overlay for animating closets
+/obj/effect/overlay/closet_door
+ anchored = TRUE
+ plane = FLOAT_PLANE
+ layer = FLOAT_LAYER
+ vis_flags = VIS_INHERIT_ID
+ appearance_flags = KEEP_TOGETHER | LONG_GLIDE | PIXEL_SCALE
diff --git a/code/game/objects/effects/spawners/airlock_spawner.dm b/code/game/objects/effects/spawners/airlock_spawner.dm
index cfeea9b4448e..3fa3c557e4b8 100644
--- a/code/game/objects/effects/spawners/airlock_spawner.dm
+++ b/code/game/objects/effects/spawners/airlock_spawner.dm
@@ -207,14 +207,10 @@ This spawner places pipe leading up to the interior door, you will need to finis
// Since airlocks are created first, we steal the payload logic
// to apply to the controls later
req_access = airlock.req_access
- req_access_txt = airlock.req_access_txt
req_one_access = airlock.req_one_access
- req_one_access_txt = airlock.req_one_access_txt
else
I.req_access = req_access
- I.req_access_txt = req_access_txt
I.req_one_access = req_one_access
- I.req_one_access_txt = req_one_access_txt
// MARK: AIRLOCK HELPERS
diff --git a/code/game/objects/effects/spawners/decorative_spawners.dm b/code/game/objects/effects/spawners/decorative_spawners.dm
index 7b200d627308..c01caca049a5 100644
--- a/code/game/objects/effects/spawners/decorative_spawners.dm
+++ b/code/game/objects/effects/spawners/decorative_spawners.dm
@@ -112,20 +112,3 @@
result = list(
/datum/nothing = 7,
/obj/effect/decal/cleanable/dirt = 1)
-
-/obj/effect/spawner/random_spawners/fungus_maybe
- name = "fungus maybe"
- icon_state = "fungus"
- color = "#D5820B"
- result = list(
- /datum/nothing = 7,
- /obj/effect/decal/cleanable/fungus = 1)
-
-/obj/effect/spawner/random_spawners/fungus_probably
- name = "fungus probably"
- icon_state = "fungus"
- color = "#D5820B"
- result = list(
- /datum/nothing = 1,
- /obj/effect/decal/cleanable/fungus = 7)
-
diff --git a/code/game/objects/effects/spawners/depot_spawners.dm b/code/game/objects/effects/spawners/depot_spawners.dm
index 49742158d155..e2e380831927 100644
--- a/code/game/objects/effects/spawners/depot_spawners.dm
+++ b/code/game/objects/effects/spawners/depot_spawners.dm
@@ -37,14 +37,14 @@
name = "33pc trap pizza"
icon_state = "pizzabox"
loot = list(
- /obj/item/pizzabox/pepperoni = 7, // Higher weight as a pizza bomb looks like pepperoni by default
- /obj/item/pizzabox/pizza_bomb/autoarm = 7,
+ /obj/item/pizzabox/pizza_bomb/autoarm = 4,
/obj/item/pizzabox/firecracker = 1,
/obj/item/pizzabox/garlic = 1,
/obj/item/pizzabox/hawaiian = 1,
/obj/item/pizzabox/margherita = 1,
/obj/item/pizzabox/meat = 1,
/obj/item/pizzabox/mushroom = 1,
+ /obj/item/pizzabox/pepperoni = 1,
/obj/item/pizzabox/vegetable = 1,
)
@@ -58,12 +58,16 @@
/obj/effect/spawner/random/syndicate/trapped_documents
name = "50pc trapped documents"
icon_state = "folder"
+ spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot
loot = list(
/obj/item/documents/syndicate/yellow,
/obj/item/documents/syndicate/yellow/trapped,
)
// Loot
+/obj/effect/spawner/random/syndicate/loot
+ spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot
+
/obj/effect/spawner/random/syndicate/loot/common
name = "syndicate depot loot, common"
icon_state = "loot"
@@ -87,6 +91,7 @@
/obj/effect/spawner/random/syndicate/loot/stetchkin
name = "syndicate depot loot, 20pct stetchkin"
icon_state = "stetchkin"
+ spawn_inside = null
spawn_loot_chance = 80
loot = list(
/obj/item/gun/projectile/automatic/pistol,
@@ -155,6 +160,7 @@
/obj/effect/spawner/random/syndicate/loot/armory
name = "syndicate depot loot, armory"
+ spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot/armory
// Combat orientated items that could give the player an advantage if an antag messes with them.
loot = list(
/obj/item/autosurgeon/organ/syndicate/oneuse/razorwire,
@@ -167,6 +173,7 @@
/obj/item/shield/energy,
/obj/item/storage/box/syndie_kit/teleporter,
/obj/item/weaponcrafting/gunkit/universal_gun_kit,
+ /obj/item/mod/control/pre_equipped/traitor_elite
)
// Layout-affecting spawns
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 0daaeef79308..ee32405e0680 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -272,7 +272,7 @@
/obj/item/melee/baseball_bat/homerun = 50,
/obj/item/rcd/combat = 50,
/obj/item/weaponcrafting/gunkit/universal_gun_kit/sol_gov = 50,
- /obj/item/storage/box/buck = 30, //Only seven shots, make them count
+ /obj/item/storage/fancy/shell/buck = 30, //Only eight shots, make them count
/obj/item/mod/module/noslip = 40,
/obj/item/clothing/mask/holo_cigar = 50
)
@@ -389,7 +389,7 @@
/obj/item/mod/construction/plating/research = 30,
/obj/item/assembly/signaler/anomaly/random = 20,
/obj/item/gun/energy/gun = 50,
- /obj/item/storage/box/dragonsbreath = 30,
+ /obj/item/storage/fancy/shell/dragonsbreath = 30,
/obj/item/storage/box/turbine_kit = 20,
/obj/item/mod/module/firefighting_tank = 40,
/obj/item/mod/module/jetpack/advanced = 40
diff --git a/code/game/objects/effects/spawners/random/furniture_spawners.dm b/code/game/objects/effects/spawners/random/furniture_spawners.dm
new file mode 100644
index 000000000000..f5c41a3e050b
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/furniture_spawners.dm
@@ -0,0 +1,18 @@
+/obj/effect/spawner/random/storage
+ name = "storage furniture spawner"
+ icon = 'icons/effects/random_spawners.dmi'
+ icon_state = "shelf"
+ layer = BELOW_OBJ_LAYER
+ loot = list(
+ list(
+ /obj/structure/shelf = 10,
+ /obj/structure/shelf/command,
+ /obj/structure/shelf/engineering,
+ /obj/structure/shelf/medbay,
+ /obj/structure/shelf/science,
+ /obj/structure/shelf/security,
+ /obj/structure/shelf/service,
+ /obj/structure/shelf/supply,
+ ),
+ /obj/structure/rack,
+ )
diff --git a/code/game/objects/effects/spawners/random/random_spawner.dm b/code/game/objects/effects/spawners/random/random_spawner.dm
index 880454842f71..1120de174df5 100644
--- a/code/game/objects/effects/spawners/random/random_spawner.dm
+++ b/code/game/objects/effects/spawners/random/random_spawner.dm
@@ -35,6 +35,8 @@
var/spawn_random_angle = FALSE
/// Whether blackbox should record when the spawner spawns.
var/record_spawn = FALSE
+ /// Where do we want to spawn an item (closet, safe etc.)
+ var/spawn_inside
// Brief explanation:
// Rather then setting up and then deleting spawners, we block all atomlike setup
@@ -57,6 +59,9 @@
var/list/spawn_locations = get_spawn_locations(spawn_scatter_radius)
var/spawn_loot_count = isnull(lootcount_override) ? src.spawn_loot_count : lootcount_override
+ if(spawn_inside)
+ new spawn_inside(loc)
+
if(spawn_all_loot)
spawn_loot_count = INFINITY
spawn_loot_double = FALSE
@@ -71,6 +76,8 @@
var/loot_spawned = 0
var/pixel_divider = FLOOR(spawn_random_offset_max_pixels / spawn_loot_split_pixel_offsets, 1)
while((spawn_loot_count-loot_spawned) && length(loot))
+ loot_spawned++
+
var/lootspawn = pick_weight_recursive(loot)
if(!spawn_loot_double)
loot.Remove(lootspawn)
@@ -79,6 +86,10 @@
if(spawn_scatter_radius > 0 && length(spawn_locations))
spawn_loc = pick(spawn_locations)
+ if(ispath(lootspawn, /turf))
+ spawn_loc.ChangeTurf(lootspawn)
+ continue
+
var/atom/movable/spawned_loot = make_item(spawn_loc, lootspawn)
spawned_loot.setDir(dir)
@@ -95,7 +106,6 @@
var/column = FLOOR(loot_spawned / pixel_divider, 1)
spawned_loot.pixel_x = spawn_loot_split_pixel_offsets * (loot_spawned % pixel_divider) + (column * spawn_loot_split_pixel_offsets)
spawned_loot.pixel_y = spawn_loot_split_pixel_offsets * (loot_spawned % pixel_divider)
- loot_spawned++
/**
* Makes the actual item related to our spawner. If `record_spawn` is `TRUE`,
diff --git a/code/game/objects/effects/spawners/random/trash_spawners.dm b/code/game/objects/effects/spawners/random/trash_spawners.dm
index bc15b76c47d0..6fc25c65a82d 100644
--- a/code/game/objects/effects/spawners/random/trash_spawners.dm
+++ b/code/game/objects/effects/spawners/random/trash_spawners.dm
@@ -58,8 +58,16 @@
// Ammo casings rarely
list(
- /obj/item/ammo_casing/c10mm,
- /obj/item/trash/spentcasing,
+ /obj/item/trash/spentcasing/shotgun,
+ /obj/item/trash/spentcasing/shotgun/rubbershot,
+ /obj/item/trash/spentcasing/shotgun/beanbag,
+ /obj/item/trash/spentcasing/shotgun/slug,
+ /obj/item/trash/spentcasing/shotgun/dragonsbreath,
+ /obj/item/trash/spentcasing/shotgun/stun,
+ /obj/item/trash/spentcasing/bullet,
+ /obj/item/trash/spentcasing/bullet/medium,
+ /obj/item/trash/spentcasing/bullet/large,
+ /obj/item/trash/spentcasing/bullet/lasershot
) = 1,
)
diff --git a/code/game/objects/effects/spawners/random/wall_decal_spawners.dm b/code/game/objects/effects/spawners/random/wall_decal_spawners.dm
new file mode 100644
index 000000000000..20e586a82aad
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/wall_decal_spawners.dm
@@ -0,0 +1,13 @@
+/obj/effect/spawner/random/fungus
+ icon_state = "fungus"
+ color = "#D5820B"
+ loot = list(/obj/effect/decal/cleanable/fungus)
+
+/obj/effect/spawner/random/fungus/maybe
+ spawn_loot_chance = 15
+
+/obj/effect/spawner/random/fungus/frequent
+ spawn_loot_chance = 50
+
+/obj/effect/spawner/random/fungus/probably
+ spawn_loot_chance = 85
diff --git a/code/game/objects/effects/spawners/random_barrier.dm b/code/game/objects/effects/spawners/random_barrier.dm
index 385b0c38ace4..0843419470d1 100644
--- a/code/game/objects/effects/spawners/random_barrier.dm
+++ b/code/game/objects/effects/spawners/random_barrier.dm
@@ -1,72 +1,58 @@
-/obj/effect/spawner/random_barrier
- name = "random tile"
- icon = 'icons/effects/spawner_icons.dmi'
- icon_state = "questionmark"
- var/list/result = list(
- /turf/simulated/floor/plasteel = 1,
- /turf/simulated/wall = 1,
- /obj/structure/falsewall = 1,
- /obj/effect/spawner/window/reinforced = 1,
- /obj/machinery/door/airlock = 1,
- /obj/machinery/door/airlock/welded = 1,
- /obj/structure/barricade/wooden = 1)
-
-// This needs to come before the initialization wave because
-// the thing it creates might need to be initialized too
-/obj/effect/spawner/random_barrier/Initialize()
- . = ..()
- var/turf/T = get_turf(src)
- if(!T)
- CRASH("Barrier spawner placed in nullspace!")
- var/thing_to_place = pickweight(result)
- if(ispath(thing_to_place, /turf))
- T.ChangeTurf(thing_to_place)
- else
- new thing_to_place(T)
- return INITIALIZE_HINT_QDEL
+/obj/effect/spawner/random/barrier
+ name = "random barrier spawner"
+ icon = 'icons/effects/random_spawners.dmi'
+ icon_state = "barrier"
+ loot = list(
+ /obj/effect/spawner/window/reinforced,
+ /obj/machinery/door/airlock,
+ /obj/machinery/door/airlock/welded,
+ /obj/structure/barricade/wooden,
+ /obj/structure/falsewall,
+ /turf/simulated/floor/plasteel,
+ /turf/simulated/wall,
+ )
-/obj/effect/spawner/random_barrier/wall_probably
+/obj/effect/spawner/random/barrier/wall_probably
name = "probably a wall"
- icon_state = "girder"
- result = list(
- /turf/simulated/wall = 9,
- /obj/structure/falsewall = 1)
-
-/obj/effect/spawner/random_barrier/floor_probably
- name = "probably a floor"
- result = list(
- /turf/simulated/floor/plasteel = 3,
- /turf/simulated/wall = 1)
+ icon_state = "wall"
+ loot = list(
+ /obj/structure/falsewall = 1,
+ /turf/simulated/wall = 9,
+ )
-/obj/effect/spawner/random_barrier/obstruction
+/obj/effect/spawner/random/barrier/obstruction
name = "obstruction"
icon_state = "barrier"
- result = list(
- /turf/simulated/wall = 1,
- /obj/structure/falsewall = 1,
- /obj/structure/barricade/wooden = 1,
- /obj/machinery/door/airlock/welded = 1)
+ loot = list(
+ /obj/machinery/door/airlock/welded,
+ /obj/structure/barricade/wooden,
+ /obj/structure/falsewall,
+ /turf/simulated/wall,
+ )
/// these have no access restrictions, so for internal maintenance only
-/obj/effect/spawner/random_barrier/possibly_welded_airlock
+/obj/effect/spawner/random/barrier/possibly_welded_airlock
name = "possibly welded airlock"
icon_state = "airlock"
- result = list(
- /obj/machinery/door/airlock = 3,
- /obj/machinery/door/airlock/welded = 1)
+ loot = list(
+ /obj/machinery/door/airlock = 3,
+ /obj/machinery/door/airlock/welded = 1,
+ )
-/obj/effect/spawner/random_spawners/grille_often
+/obj/effect/spawner/random/barrier/grille_often
name = "grille often"
icon_state = "grille"
- result = list(
- /obj/structure/grille = 8,
- /obj/structure/grille/broken = 4,
- /turf/simulated/floor/plating = 2)
+ loot = list(
+ /obj/structure/grille = 8,
+ /obj/structure/grille/broken = 4,
+ /turf/simulated/floor/plating = 2,
+ )
-/obj/effect/spawner/random_spawners/grille_maybe
+/obj/effect/spawner/random/barrier/grille_maybe
name = "grille maybe"
icon_state = "grille"
- result = list(
- /obj/structure/grille = 2,
- /obj/structure/grille/broken = 2,
- /turf/simulated/floor/plating = 5)
+ loot = list(
+ /obj/structure/grille = 2,
+ /obj/structure/grille/broken = 2,
+ /turf/simulated/floor/plating = 5,
+ )
diff --git a/code/game/objects/effects/temporary_visuals/misc_visuals.dm b/code/game/objects/effects/temporary_visuals/misc_visuals.dm
index 77cdaa73bf46..f06a632c2957 100644
--- a/code/game/objects/effects/temporary_visuals/misc_visuals.dm
+++ b/code/game/objects/effects/temporary_visuals/misc_visuals.dm
@@ -520,3 +520,20 @@
icon = 'icons/effects/96x96.dmi'
icon_state = "warning"
duration = 3 SECONDS
+
+/obj/effect/temp_visual/bsa_splash
+ name = "\improper Bluespace energy wave"
+ desc = "A massive, rippling wave of bluepace energy, all rapidly exhausting itself the moment it leaves the concentrated beam of light."
+ icon = 'icons/effects/beam_splash.dmi'
+ icon_state = "beam_splash_l"
+ layer = ABOVE_ALL_MOB_LAYER
+ pixel_y = -16
+ duration = 50
+
+/obj/effect/temp_visual/bsa_splash/Initialize(mapload, dir)
+ . = ..()
+ switch(dir)
+ if(WEST)
+ icon_state = "beam_splash_w"
+ if(EAST)
+ icon_state = "beam_splash_e"
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 2789b031739f..399f4791ae3a 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -1022,7 +1022,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
if(!istype(cig))
return null
- if(user.zone_selected != "mouth" || !user.a_intent == INTENT_HELP)
+ if(!direct_attackby_item && (user.zone_selected != "mouth" || user.a_intent != INTENT_HELP))
return null
if(cig.lit)
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 12341795b450..68bb083c199d 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -16,9 +16,9 @@
name = "body bag"
desc = "A plastic bag designed for the storage and transportation of cadavers."
icon = 'icons/obj/bodybag.dmi'
- icon_state = "bodybag_closed"
- icon_closed = "bodybag_closed"
- icon_opened = "bodybag_open"
+ icon_state = "bodybag"
+ enable_door_overlay = FALSE
+ door_anim_time = 0
density = FALSE
integrity_failure = 0
open_sound = 'sound/items/zip.ogg'
@@ -27,7 +27,6 @@
close_sound_volume = 15
var/item_path = /obj/item/bodybag
-
/obj/structure/closet/body_bag/attackby(obj/item/I, mob/user, params)
if(is_pen(I))
var/t = rename_interactive(user, I)
@@ -54,7 +53,7 @@
return FALSE
/obj/structure/closet/body_bag/update_overlays()
- ..()
+ . = ..()
if(name != initial(name))
. += "bodybag_label"
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 107beb353738..13fb3a5cf097 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -359,6 +359,9 @@
attackee.lip_color = colour
attackee.update_body()
+ play_spray_sound(user)
+
+/obj/item/toy/crayon/spraycan/proc/play_spray_sound(mob/user)
playsound(user, 'sound/effects/spray.ogg', 5, TRUE, 5)
/obj/item/toy/crayon/spraycan/update_icon_state()
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 8ac39ab3c0ed..604a8f0e13d5 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -345,7 +345,7 @@
name = "glowing slime extract"
desc = "A glowing ball of what appears to be amber."
icon = 'icons/obj/lighting.dmi'
- icon_state = "floor1" //not a slime extract sprite but... something close enough!
+ icon_state = "slime-on"
item_state = "slime"
w_class = WEIGHT_CLASS_TINY
brightness_on = 6
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 30a73ab0ad11..7dac6e3640e0 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -31,13 +31,6 @@
// access to them, and only one of them can emag their device.
//
// The explosion cannot insta-kill anyone with 30% or more health.
-
-#define LIGHT_OK 0
-#define LIGHT_EMPTY 1
-#define LIGHT_BROKEN 2
-#define LIGHT_BURNED 3
-
-
/obj/item/lightreplacer
name = "light replacer"
desc = "A device to automatically replace lights. Refill with broken or working light bulbs, or sheets of glass."
@@ -198,21 +191,10 @@
if(CanUse(U))
if(!Use(U))
return
- to_chat(U, "You replace the light [target.fitting] with [src].")
-
if(target.status != LIGHT_EMPTY)
AddShards(1, U)
target.status = LIGHT_EMPTY
-
- var/obj/item/light/replacement = target.light_type
- target.status = LIGHT_OK
- target.switchcount = 0
- target.rigged = emagged
- target.brightness_range = initial(replacement.brightness_range)
- target.brightness_power = initial(replacement.brightness_power)
- target.brightness_color = initial(replacement.brightness_color)
- target.on = target.has_power()
- target.update(TRUE, TRUE, FALSE)
+ target.fix(U, src, emagged)
else
to_chat(U, "[src]'s refill light blinks red.")
@@ -270,8 +252,3 @@
/obj/item/lightreplacer/bluespace/emag_act()
return // long range explosions are stupid
-
-#undef LIGHT_OK
-#undef LIGHT_EMPTY
-#undef LIGHT_BROKEN
-#undef LIGHT_BURNED
diff --git a/code/game/objects/items/devices/painter/floor_painter.dm b/code/game/objects/items/devices/painter/floor_painter.dm
index 6d796aebc37d..206500d4a182 100644
--- a/code/game/objects/items/devices/painter/floor_painter.dm
+++ b/code/game/objects/items/devices/painter/floor_painter.dm
@@ -4,7 +4,7 @@
module_name = "floor painter"
module_state = "floor_painter"
- var/floor_icon
+ var/floor_icon = 'icons/turf/floors.dmi'
var/floor_state = "floor"
var/floor_dir = SOUTH
@@ -21,23 +21,6 @@
"darkred", "darkredcorners", "darkredfull", "darkblue", "darkbluecorners", "darkbluefull", "darkgreen", "darkgreencorners",
"darkgreenfull", "darkyellow", "darkyellowcorners", "darkyellowfull", "darkbrown", "darkbrowncorners", "darkbrownfull")
- // This is a double-list. First entry is the type key, second is the direction, with the final value being the b64 of the icon
- var/static/list/lookup_cache = list()
-
-/datum/painter/floor/New(obj/item/painter/parent_painter)
- . = ..()
- if(!length(lookup_cache))
- for(var/style in allowed_states)
- if(!(style in lookup_cache))
- lookup_cache += style
- lookup_cache[style] = list()
-
- for(var/dir in GLOB.alldirs)
- var/icon/floor_icon = icon('modular_ss220/aesthetics/floors/icons/floors.dmi', style, dir) // SS220 EDIT
- // These indexes have to be strings otherwise it treats it as a list index not a map lookup index
- lookup_cache[style] += "[dir]"
- lookup_cache[style]["[dir]"] = icon2base64(floor_icon)
-
/datum/painter/floor/paint_atom(atom/target, mob/user)
if(!istype(target, /turf/simulated/floor/plasteel))
to_chat(user, "[holder] can only be used on station flooring.")
@@ -65,31 +48,20 @@
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "FloorPainter", module_name)
- // Disable automatic updates, because:
- // 1) we are the only user of the item, and don't expect to observe external changes
- // 2) generating and sending the icon each tick is a bit expensive, and creates small but noticeable lag
+ // Disable automatic updates, because we are the only user of the item, and don't expect to observe external changes
ui.set_autoupdate(FALSE)
ui.open()
/datum/painter/floor/ui_data(mob/user)
var/list/data = list()
- data["availableStyles"] = allowed_states
data["selectedStyle"] = floor_state
- data["selectedDir"] = dir2text(floor_dir)
-
- data["directionsPreview"] = list()
- for(var/dir in GLOB.alldirs)
- data["directionsPreview"][dir2text(dir)] = lookup_cache[floor_state]["[dir]"]
-
+ data["selectedDir"] = floor_dir
return data
-
/datum/painter/floor/ui_static_data(mob/user)
var/list/data = list()
- data["allStylesPreview"] = list()
- for(var/style in allowed_states)
- data["allStylesPreview"][style] = lookup_cache[style]["[SOUTH]"]
-
+ data["icon"] = floor_icon
+ data["availableStyles"] = allowed_states
return data
/datum/painter/floor/ui_act(action, params)
@@ -111,7 +83,7 @@
floor_state = allowed_states[index]
if(action == "select_direction")
- var/dir = text2dir(params["direction"])
+ var/dir = params["direction"]
if(dir != 0)
floor_dir = dir
diff --git a/code/game/objects/items/devices/painter/pipe_painter.dm b/code/game/objects/items/devices/painter/pipe_painter.dm
index 879533899fb6..85770060657d 100644
--- a/code/game/objects/items/devices/painter/pipe_painter.dm
+++ b/code/game/objects/items/devices/painter/pipe_painter.dm
@@ -7,7 +7,7 @@
/datum/painter/pipe/New()
..()
if(!length(modes))
- for(var/C in GLOB.pipe_colors)
+ for(var/C in GLOB.pipe_icon_manager.pipe_colors)
modes += "[C]"
paint_setting = pick(modes)
@@ -25,7 +25,7 @@
if(is_type_in_list(P, blacklisted_pipes))
return
- if(P.pipe_color == GLOB.pipe_colors[paint_setting])
+ if(P.pipe_color == GLOB.pipe_icon_manager.pipe_colors[paint_setting])
to_chat(user, "This pipe is aready painted [paint_setting]!")
return
@@ -34,5 +34,5 @@
to_chat(user, "You must remove the flooring first.")
return
- P.change_color(GLOB.pipe_colors[paint_setting])
+ P.change_color(GLOB.pipe_icon_manager.pipe_colors[paint_setting])
return TRUE
diff --git a/code/game/objects/items/devices/painter/window_painter.dm b/code/game/objects/items/devices/painter/window_painter.dm
index 92671f7fc71b..20ddaf7d78b1 100644
--- a/code/game/objects/items/devices/painter/window_painter.dm
+++ b/code/game/objects/items/devices/painter/window_painter.dm
@@ -20,17 +20,17 @@
var/obj/structure/window/W = target
if(is_type_in_list(target, polarized_windows))
- if((W.opacity && W.old_color == GLOB.pipe_colors[paint_setting]) || (!W.opacity && W.color == GLOB.pipe_colors[paint_setting]))
+ if((W.opacity && W.old_color == GLOB.pipe_icon_manager.pipe_colors[paint_setting]) || (!W.opacity && W.color == GLOB.pipe_icon_manager.pipe_colors[paint_setting]))
to_chat(user, "This window is aready painted [paint_setting]!")
return
if(!W.opacity)
- W.color = GLOB.pipe_colors[paint_setting]
- W.old_color = GLOB.pipe_colors[paint_setting]
+ W.color = GLOB.pipe_icon_manager.pipe_colors[paint_setting]
+ W.old_color = GLOB.pipe_icon_manager.pipe_colors[paint_setting]
return TRUE
- if(W.color == GLOB.pipe_colors[paint_setting])
+ if(W.color == GLOB.pipe_icon_manager.pipe_colors[paint_setting])
to_chat(user, "This window is aready painted [paint_setting]!")
return
- W.color = GLOB.pipe_colors[paint_setting]
+ W.color = GLOB.pipe_icon_manager.pipe_colors[paint_setting]
return TRUE
diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm
index 498e3c41aba1..b09a7739b99a 100644
--- a/code/game/objects/items/devices/radio/beacon.dm
+++ b/code/game/objects/items/devices/radio/beacon.dm
@@ -15,6 +15,7 @@
var/syndicate = FALSE
var/area_bypass = FALSE
var/cc_beacon = FALSE //set if allowed to teleport to even if on zlevel2
+ var/wormhole_weaver = FALSE // special beacons for wormwhole weaver
/obj/item/beacon/Initialize()
. = ..()
@@ -169,3 +170,9 @@
/obj/item/beacon/engine/sing
name = "Engine Beacon for Singularity"
enginetype = list(ENGTYPE_SING)
+
+/obj/item/beacon/wormhole_weaver
+ name = "prototype beacon"
+ desc = "A beacon used by a prototype wormhole device."
+ wormhole_weaver = TRUE
+ icon_state = "beacon_wormhole_weaver"
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 642e3f497f2c..ea8dac2bb266 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -346,7 +346,7 @@
/obj/item/radio/headset/ert/alt
name = "emergency response team's bowman headset"
- desc = "The headset of the boss. Protects ears from flashbangs."
+ desc = "An ergonomic tactical headset used by Nanotrasen-affiliated PMCs. Protects against loud noises."
flags = EARBANGPROTECT
icon_state = "com_headset_alt"
item_state = "com_headset_alt"
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index 463a69a18d3c..6feda858d4c8 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -116,10 +116,11 @@
/obj/item/taperecorder/AltClick(mob/user)
if(in_range(user, src) && mytape && !HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
- var/list/options = list( "Playback Tape" = image(icon = 'icons/obj/device.dmi', icon_state = "taperecorder_playing"),
- "Print Transcript" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "paper_words"),
- "Eject Tape" = image(icon = 'icons/obj/device.dmi', icon_state = "[mytape.icon_state]")
- )
+ var/list/options = list(
+ "Playback Tape" = image(icon = 'icons/obj/device.dmi', icon_state = "taperecorder_playing"),
+ "Print Transcript" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "paper_words"),
+ "Eject Tape" = image(icon = 'icons/obj/device.dmi', icon_state = "[mytape.icon_state]")
+ )
var/choice = show_radial_menu(user, src, options)
if(user.incapacitated())
return
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 5fc6a3614cf9..2b279b5a781b 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -108,15 +108,20 @@
if(!charges && !EMP_D) //If it's empd, you are moving no matter what.
to_chat(user, "[src] is still recharging.")
return
-
+ var/turf/starting = get_turf(src)
+ var/area/starting_area = get_area(starting)
+ if(!is_teleport_allowed(starting.z) || starting_area.tele_proof)
+ to_chat(user, "[src] will not work here!")
+ return
var/mob/living/M = user
var/turf/mobloc = get_turf(M)
var/list/turfs = list()
var/found_turf = FALSE
var/list/bagholding = user.search_contents_for(/obj/item/storage/backpack/holding)
for(var/turf/T in range(user, tp_range))
- if(!is_teleport_allowed(T.z))
- break
+ var/area/dropping_area = get_area(T)
+ if(dropping_area.tele_proof) //There might be some valid turfs before / after you reach such an area, so we continue, not break.
+ continue
if(!(length(bagholding) && !flawless)) //Chaos if you have a bag of holding
if(get_dir(M, T) != M.dir)
continue
@@ -316,7 +321,7 @@
if(used)
to_chat(user, "The injector is empty!")
return
- used = TRUE
+ used = TRUE
to_chat(user, "You inject yourself with the enhancer!")
ADD_TRAIT(user, TRAIT_DRASK_SUPERCOOL, "cryoregenerative_enhancer")
diff --git a/code/game/objects/items/mountable_frames/frames.dm b/code/game/objects/items/mountable_frames/frames.dm
index 5823064a91a1..6da3982e04d1 100644
--- a/code/game/objects/items/mountable_frames/frames.dm
+++ b/code/game/objects/items/mountable_frames/frames.dm
@@ -22,15 +22,15 @@
/obj/item/mounted/frame/try_build(turf/on_wall, mob/user)
if(!..())
- return
+ return FALSE
var/turf/build_turf = get_turf(user)
if((mount_requirements & MOUNTED_FRAME_SIMFLOOR) && !isfloorturf(build_turf))
to_chat(user, "[src] cannot be placed on this spot.")
- return
+ return FALSE
if(mount_requirements & MOUNTED_FRAME_NOSPACE)
var/area/my_area = get_area(build_turf)
if(!istype(my_area) || !my_area.requires_power || isspacearea(my_area))
to_chat(user, "[src] cannot be placed in this area.")
- return
+ return FALSE
return TRUE
diff --git a/code/game/objects/items/mountable_frames/light_frames.dm b/code/game/objects/items/mountable_frames/light_frames.dm
index 7d31cf49a249..ab59c8c29521 100644
--- a/code/game/objects/items/mountable_frames/light_frames.dm
+++ b/code/game/objects/items/mountable_frames/light_frames.dm
@@ -22,6 +22,8 @@
newlight = new /obj/machinery/light_construct/small(constrloc)
if("tube")
newlight = new /obj/machinery/light_construct(constrloc)
+ if("floor")
+ newlight = new /obj/machinery/light_construct/floor(on_wall)
else
newlight = new /obj/machinery/light_construct/small(constrloc)
newlight.dir = constrdir
@@ -40,3 +42,13 @@
icon_state = "bulb-construct-item"
fixture_type = "bulb"
metal_sheets_refunded = 1
+
+/obj/item/mounted/frame/light_fixture/floor
+ name = "floor light fixture frame"
+ desc = "Used for building floor lights."
+ icon = 'icons/obj/lighting.dmi'
+ icon_state = "floor-construct-item"
+ fixture_type = "floor"
+ metal_sheets_refunded = 3
+ buildon_types = list(/turf/simulated/floor)
+ allow_floor_mounting = TRUE
diff --git a/code/game/objects/items/mountable_frames/mountables.dm b/code/game/objects/items/mountable_frames/mountables.dm
index c850bb5b6e9d..31fa665a51b5 100644
--- a/code/game/objects/items/mountable_frames/mountables.dm
+++ b/code/game/objects/items/mountable_frames/mountables.dm
@@ -3,35 +3,31 @@
/turf/simulated/mineral/ancient,
/turf/simulated/wall
)
+ var/allow_floor_mounting = FALSE
/obj/item/mounted/afterattack(atom/A, mob/user, proximity_flag)
- var/found_type = 0
- for(var/turf_type in src.buildon_types)
- if(istype(A, turf_type))
- found_type = 1
- break
-
- if(found_type)
+ if(is_type_in_list(A, buildon_types))
if(try_build(A, user, proximity_flag))
return do_build(A, user)
- else
- ..()
+ ..()
/obj/item/mounted/proc/try_build(turf/on_wall, mob/user, proximity_flag) //checks
if(!on_wall || !user)
- return
- if(proximity_flag != 1) //if we aren't next to the wall
- return
- if(!( get_dir(on_wall,user) in GLOB.cardinal))
- to_chat(user, "You need to be standing next to a wall to place \the [src].")
- return
+ return FALSE
+ if(!proximity_flag) //if we aren't next to the turf
+ return FALSE
+
+ if(!allow_floor_mounting)
+ if(!(get_dir(on_wall, user) in GLOB.cardinal))
+ to_chat(user, "You need to be standing next to [on_wall] to place [src].")
+ return FALSE
- if(gotwallitem(get_turf(user), get_dir(on_wall,user)))
- to_chat(user, "There's already an item on this wall!")
- return
+ if(gotwallitem(get_turf(user), get_dir(user, on_wall)))
+ to_chat(user, "There's already an item on this wall!")
+ return FALSE
- return 1
+ return TRUE
/obj/item/mounted/proc/do_build(turf/on_wall, mob/user) //the buildy bit after we pass the checks
return
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index 777564380bfe..75748a9dc986 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -17,6 +17,10 @@
var/list/items_to_add = list()
/// A list of replacement items will need to be placed into a cyborg module's `special_rechargable` list after this upgrade is installed.
var/list/special_rechargables = list()
+ /// Allow the same upgrade to be installed multiple times, FALSE by default
+ var/allow_duplicate = FALSE
+ /// Delete the module after installing it. For deleting upgrades that might be installed multiple times, like the rename/reset upgrades.
+ var/delete_after_install = FALSE
/**
* Called when someone clicks on a borg with an upgrade in their hand.
@@ -24,12 +28,19 @@
* Arguments:
* * R - the cyborg that was clicked on with an upgrade.
*/
-/obj/item/borg/upgrade/proc/action(mob/living/silicon/robot/R)
- if(!pre_install_checks(R))
+/obj/item/borg/upgrade/proc/action(mob/user, mob/living/silicon/robot/R)
+ if(!pre_install_checks(user, R))
return
+ if(!user.drop_item())
+ to_chat(user, "\The [src] is stuck to your hand, you cannot install it in [R]")
+ return FALSE
if(!do_install(R))
return
after_install(R)
+ if(delete_after_install)
+ qdel(src)
+ else
+ forceMove(R)
return TRUE
/**
@@ -38,13 +49,17 @@
* Arguments:
* * R - the cyborg that was clicked on with an upgrade.
*/
-/obj/item/borg/upgrade/proc/pre_install_checks(mob/living/silicon/robot/R)
+/obj/item/borg/upgrade/proc/pre_install_checks(mob/user, mob/living/silicon/robot/R)
if(R.stat == DEAD)
- to_chat(usr, "[src] will not function on a deceased cyborg.")
+ to_chat(user, "[src] will not function on a deceased cyborg.")
return
if(module_type && !istype(R.module, module_type))
- to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!")
- to_chat(usr, "There's no mounting point for the module!")
+ to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!")
+ to_chat(user, "There's no mounting point for the module!")
+ return
+ var/obj/item/borg/upgrade/u = locate(type) in R
+ if(u && !allow_duplicate)
+ to_chat(user, "This unit already has [src] installed!")
return
return TRUE
@@ -89,6 +104,7 @@
desc = "Used to reset a cyborg's module. Destroys any other upgrades applied to the cyborg."
icon_state = "cyborg_upgrade1"
require_module = TRUE
+ delete_after_install = TRUE
/obj/item/borg/upgrade/reset/do_install(mob/living/silicon/robot/R)
R.reset_module()
@@ -101,6 +117,7 @@
name = "cyborg reclassification board"
desc = "Used to rename a cyborg."
icon_state = "cyborg_upgrade1"
+ delete_after_install = TRUE
var/heldname = "default name"
/obj/item/borg/upgrade/rename/attack_self(mob/user)
@@ -125,6 +142,7 @@
name = "cyborg emergency reboot module"
desc = "Used to force a reboot of a disabled-but-repaired cyborg, bringing it back online."
icon_state = "cyborg_upgrade1"
+ delete_after_install = TRUE
/obj/item/borg/upgrade/restart/do_install(mob/living/silicon/robot/R)
if(R.health < 0)
@@ -150,10 +168,6 @@
origin_tech = "engineering=4;powerstorage=4"
/obj/item/borg/upgrade/thrusters/do_install(mob/living/silicon/robot/R)
- if(R.ionpulse)
- to_chat(usr, "This unit already has ion thrusters installed!")
- return
-
R.ionpulse = TRUE
return TRUE
@@ -170,11 +184,6 @@
var/mob/living/silicon/robot/cyborg
/obj/item/borg/upgrade/selfrepair/do_install(mob/living/silicon/robot/R)
- var/obj/item/borg/upgrade/selfrepair/U = locate() in R
- if(U)
- to_chat(usr, "This unit is already equipped with a self-repair module.")
- return
-
cyborg = R
icon_state = "selfrepair_off"
var/datum/action/A = new /datum/action/item_action/toggle(src)
@@ -259,11 +268,6 @@
origin_tech = "engineering=4;materials=5;programming=4"
/obj/item/borg/upgrade/vtec/do_install(mob/living/silicon/robot/R)
- for(var/obj/item/borg/upgrade/vtec/U in R.contents)
- to_chat(R, "A VTEC unit is already installed!")
- to_chat(usr, "There's no room for another VTEC unit!")
- return
-
R.slowdown_cap = 3.5
return TRUE
@@ -376,10 +380,6 @@
var/mob/living/silicon/robot/cyborg
/obj/item/borg/upgrade/floorbuffer/do_install(mob/living/silicon/robot/R)
- for(var/obj/item/borg/upgrade/floorbuffer/U in R)
- to_chat(R, "A floor buffer unit is already installed!")
- to_chat(usr, "There's no room for another floor buffer unit!")
- return
cyborg = R
var/datum/action/A = new /datum/action/item_action/floor_buffer(src)
A.Grant(R)
diff --git a/code/game/objects/items/salvage.dm b/code/game/objects/items/salvage.dm
index 67152ab26597..a4903a6cb2ac 100644
--- a/code/game/objects/items/salvage.dm
+++ b/code/game/objects/items/salvage.dm
@@ -27,7 +27,7 @@
icon_state = "barrel"
color = "#7e5c00" // So that it's slightly different from normal kegs
-/obj/item/salvage/ruin/russian
+/obj/item/salvage/ruin/soviet
name = "armaments cache"
desc = "A crate of old disused Belastrav ballistic firearms that have been weathered into uselessness. They still may be of value to collectors, however."
icon_state = "weapon_crate"
@@ -85,7 +85,7 @@
pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg'
drop_sound = 'sound/items/handling/taperecorder_drop.ogg'
-/obj/item/salvage/loot/russian
+/obj/item/salvage/loot/soviet
name = "\improper Cygni manifesto"
desc = "A small book, written in Neo-Russkyia, detailing the manifesto of Malfoy Ames, father of The Cygni Rebellion. Banned in Federation space, it may fetch a decent price on the black market."
icon_state = "ussp_manual"
diff --git a/code/game/objects/items/scratch_card.dm b/code/game/objects/items/scratch_card.dm
index 2a6f372fe7d0..5864b207e7ee 100644
--- a/code/game/objects/items/scratch_card.dm
+++ b/code/game/objects/items/scratch_card.dm
@@ -27,7 +27,7 @@
icon_state = "scard_loser"
playsound(user, 'sound/items/scratching.ogg', 25, TRUE)
scratched = TRUE
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/scratch/attack_obj(obj/O, mob/living/user, params)
if(winner && istype(O, /obj/machinery/economy/atm))
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index def83cd1a56f..9510c01b0336 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -81,6 +81,8 @@ GLOBAL_LIST_INIT(metal_recipes, list(
new /datum/stack_recipe("firelock frame", /obj/structure/firelock_frame, 3, time = 5 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("meatspike frame", /obj/structure/kitchenspike_frame, 5, time = 5 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("reflector frame", /obj/structure/reflector, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
+ new /datum/stack_recipe("storage shelf", /obj/structure/shelf, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
+ new /datum/stack_recipe("gun rack", /obj/structure/gunrack, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
null,
new /datum/stack_recipe_list("airlock assemblies", list(
new /datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 5 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
@@ -110,6 +112,7 @@ GLOBAL_LIST_INIT(metal_recipes, list(
new /datum/stack_recipe("grenade casing", /obj/item/grenade/chem_grenade),
new /datum/stack_recipe("light fixture frame", /obj/item/mounted/frame/light_fixture, 2),
new /datum/stack_recipe("small light fixture frame", /obj/item/mounted/frame/light_fixture/small, 1),
+ new /datum/stack_recipe("floor light fixture frame", /obj/item/mounted/frame/light_fixture/floor, 3),
null,
new /datum/stack_recipe("apc frame", /obj/item/mounted/frame/apc_frame, 2),
new /datum/stack_recipe("air alarm frame", /obj/item/mounted/frame/alarm_frame, 2),
diff --git a/code/game/objects/items/stacks/stack_recipe.dm b/code/game/objects/items/stacks/stack_recipe.dm
index 0cabc52e5368..3e1b60222c20 100644
--- a/code/game/objects/items/stacks/stack_recipe.dm
+++ b/code/game/objects/items/stacks/stack_recipe.dm
@@ -104,11 +104,15 @@
if(!do_after(user, time, target = material.loc))
return FALSE
+ if(material.get_amount() < req_amount * multiplier) // Check they still have enough.
+ return FALSE
+
if(cult_structure && locate(/obj/structure/cult) in get_turf(material)) // Check again after do_after to prevent queuing construction exploit.
to_chat(user, "There is a structure here!")
return FALSE
- if(material.get_amount() < req_amount * multiplier) // Check they still have enough.
+ if(one_per_turf && (locate(result_type) in get_turf(material))) // Yes, we need to do this twice. Once during try_build, and when we build the actual thing, in case it was on a do-after and there's now a structure here.
+ to_chat(user, "There is another [title] here!")
return FALSE
if(max_res_amount > 1) // Is it a stack?
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index b92eab964a2a..da72b17dade1 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -335,6 +335,7 @@
mineralType = "metal"
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 70)
resistance_flags = FIRE_PROOF
+ merge_type = /obj/item/stack/tile/catwalk
/obj/item/stack/tile/catwalk/cyborg
energy_type = /datum/robot_storage/energy/catwalk
diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm
index eaa00d8e6388..cd68290806c2 100644
--- a/code/game/objects/items/tools/wirecutters.dm
+++ b/code/game/objects/items/tools/wirecutters.dm
@@ -36,7 +36,7 @@
user.visible_message("[user] cuts [C]'s restraints with [src]!")
QDEL_NULL(C.handcuffed)
if(C.buckled && C.buckled.buckle_requires_restraints)
- C.buckled.unbuckle_mob(C)
+ C.unbuckle()
C.update_handcuffed()
return
else
diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm
index d921a5a4cd42..fc90779a97a4 100644
--- a/code/game/objects/items/tools/wrench.dm
+++ b/code/game/objects/items/tools/wrench.dm
@@ -88,6 +88,7 @@
throwforce = 4
origin_tech = "materials=1;engineering=1;biotech=3"
attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked")
+ toolspeed = 0.75
/obj/item/wrench/medical/suicide_act(mob/living/user)
user.visible_message("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!")
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index f9a3c96d3dd9..73bbf852c76c 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -17,6 +17,9 @@
return TRUE
return ..()
+/obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
+ return
+
/obj/item/trash/raisins
name = "4no raisins"
icon_state= "4no_raisins"
@@ -117,12 +120,6 @@
name = "bread tube"
icon_state = "tastybread"
-/obj/item/trash/spentcasing
- icon = 'icons/obj/ammo.dmi'
- name = "bullet casing"
- desc = "A spent bullet casing. Smells like cordite."
- icon_state = "gshell"
-
/obj/item/trash/tapetrash
name = "old duct tape"
icon_state = "tape"
@@ -134,5 +131,61 @@
icon_state = "popsicle_stick_s"
desc = "Still tastes sweet."
-/obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
- return
+// Ammo casings
+/obj/item/trash/spentcasing
+ icon = 'icons/obj/ammo.dmi'
+ name = "arbitrary spent casing item"
+ desc = "If you can see this and didn't spawn it, make an issue report on GitHub."
+ icon_state = "gshell"
+
+/obj/item/trash/spentcasing/Initialize(mapload)
+ . = ..()
+ pixel_x = rand(-10, 10)
+ pixel_y = rand(-10, 10)
+ transform = turn(transform, rand(0, 360))
+
+/obj/item/trash/spentcasing/shotgun
+ name = "spent buckshot shell"
+ desc = "A spent shotgun shell. It smells like cordite."
+ icon_state = "gshell"
+
+/obj/item/trash/spentcasing/shotgun/rubbershot
+ name = "spent rubbershot shell"
+ desc = "A spent shotgun shell. It smells like cordite and singed rubber."
+ icon_state = "cshell"
+
+/obj/item/trash/spentcasing/shotgun/beanbag
+ name = "spent beanbag shell"
+ icon_state = "bshell"
+
+/obj/item/trash/spentcasing/shotgun/slug
+ name = "spent slug shell"
+ icon_state = "blshell"
+
+/obj/item/trash/spentcasing/shotgun/dragonsbreath
+ name = "spent dragonsbreath shell"
+ desc = "A spent shotgun shell. It smells like cordite, burnt plastic, and a hint of petroleum."
+ icon_state = "ishell"
+
+/obj/item/trash/spentcasing/shotgun/stun
+ name = "spent stun shell"
+ icon_state = "stunshell"
+
+/obj/item/trash/spentcasing/bullet
+ name = "spent bullet casing"
+ desc = "A spent bullet casing. It smells of brass and cordite."
+ icon_state = "s-casing"
+
+/obj/item/trash/spentcasing/bullet/medium
+ name = "spent large bullet casing"
+ desc = "A spent high-caliber bullet casing. It smells of brass and cordite."
+ icon_state = "762-casing"
+
+/obj/item/trash/spentcasing/bullet/large
+ name = "spent .50 BMG bullet casing"
+ desc = "A spent .50 BMG bullet casing. It smells of brass and cordite."
+ icon_state = ".50"
+
+/obj/item/trash/spentcasing/bullet/lasershot
+ desc = "A spent IK-series single-use lasershot cell. It smells of burnt plastic with a metallic-chemical undertone."
+ icon_state = "lasercasing"
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 5e5a6e874050..741357eb01c1 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -13,7 +13,7 @@
w_class = WEIGHT_CLASS_TINY
var/associated_account_number = 0
- var/list/files = list( )
+ var/list/files = list()
/obj/item/card/proc/get_card_account()
return GLOB.station_money_database.find_user_account(associated_account_number)
@@ -1191,3 +1191,7 @@
return "Thunderdome Green"
else
return capitalize(skin)
+
+/proc/GetNameAndAssignmentFromId(obj/item/card/id/I)
+ // Format currently matches that of newscaster feeds: Registered Name (Assigned Rank)
+ return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name
diff --git a/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm b/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
index a2e480d1e591..ae1300409363 100644
--- a/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
+++ b/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
@@ -30,7 +30,7 @@
/// How many firestacks will our reagent apply
var/canister_fire_applications = 1
/// How much ammo do we use per tile?
- var/ammo_usage = 2
+ var/ammo_usage = 1
/// Is this a syndicate flamethrower
var/syndicate = FALSE
@@ -39,7 +39,7 @@
if(should_start_with_canisters && !length(canisters))
canisters += new /obj/item/chemical_canister
update_canister_stats()
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/chemical_flamethrower/Destroy()
QDEL_LIST_CONTENTS(canisters)
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 06daebbcfeff..4b67c9867856 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -519,6 +519,8 @@
payload_name = "cleaner"
desc = "BLAM!-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas."
stage = READY
+ /// The chemical used to clean things
+ var/cleaning_chem = "cleaner"
/obj/item/grenade/chem_grenade/cleaner/Initialize(mapload)
. = ..()
@@ -526,13 +528,28 @@
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("fluorosurfactant", 40)
- B2.reagents.add_reagent("cleaner", 10)
+ B2.reagents.add_reagent(cleaning_chem, 10)
B2.reagents.add_reagent("water", 40) //when you make pre-designed foam reactions that carry the reagents, always add water last
beakers += B1
beakers += B2
update_icon(UPDATE_ICON_STATE)
+/obj/item/grenade/chem_grenade/cleaner/everything
+ payload_name = "melter"
+ desc = "Inside of this grenade are black-market Syndicate nanites that consume everything they come in cross with. Organs, clothes, consoles, people. Nothing is safe. Now with a new foaming applicator!"
+ cleaning_chem = "admincleaner_all"
+
+/obj/item/grenade/chem_grenade/cleaner/object
+ payload_name = "object dissolving"
+ desc = "Inside of this grenade are black-market Syndicate nanites that curiously only consume objects, leaving living creatures and larger machinery alone. Now with a new foaming applicator!"
+ cleaning_chem = "admincleaner_item"
+
+/obj/item/grenade/chem_grenade/cleaner/organic
+ payload_name = "organic dissolving"
+ desc = "Inside of this grenade are black-market Syndicate nanites that have an appetite for living creatures and their organs, be they silicon or organic, dead or alive. Now with a new foaming applicator!"
+ cleaning_chem = "admincleaner_mob"
+
/obj/item/grenade/chem_grenade/teargas
payload_name = "teargas"
diff --git a/code/game/objects/items/weapons/grenades/clusterbuster.dm b/code/game/objects/items/weapons/grenades/clusterbuster.dm
index 32922e07aff9..054f3f97b7a7 100644
--- a/code/game/objects/items/weapons/grenades/clusterbuster.dm
+++ b/code/game/objects/items/weapons/grenades/clusterbuster.dm
@@ -254,3 +254,14 @@
desc = "Proving once and for all that the maximum bomb explosion radius is just a suggestion."
payload = /obj/item/grenade/clusterbuster/syndieminibomb
+/obj/item/grenade/clusterbuster/admincleaner
+ desc = "For cleaning really big messes."
+ payload = /obj/item/grenade/chem_grenade/cleaner/everything
+
+/obj/item/grenade/clusterbuster/admincleaner/organic
+ desc = "For cleaning remnants of many, many crime scenes."
+ payload = /obj/item/grenade/chem_grenade/cleaner/organic
+
+/obj/item/grenade/clusterbuster/admincleaner/object
+ desc = "For cleaning up after a typical Nanotrasen office party."
+ payload = /obj/item/grenade/chem_grenade/cleaner/object
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index b2e0fee35fdd..212088822e73 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -29,7 +29,7 @@
. += "The fuze is set to [det_time / 10] second\s."
else
. += "[src] is set for instant detonation."
-
+
if(modifiable_timer)
. += "Use a screwdriver to modify the time on the fuze."
else
@@ -125,8 +125,4 @@
if(!HAS_TRAIT(src, TRAIT_CMAGGED))
return
REMOVE_TRAIT(src, TRAIT_CMAGGED, "cmagged grenade")
- var/datum/component/bomberang = GetComponent(/datum/component/boomerang)
- if(!bomberang)
- return
- bomberang.RemoveComponent()
- qdel(bomberang)
+ DeleteComponent(/datum/component/boomerang)
diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm
index f816d7c8dd5e..c6ce59d40b29 100644
--- a/code/game/objects/items/weapons/legcuffs.dm
+++ b/code/game/objects/items/weapons/legcuffs.dm
@@ -102,7 +102,7 @@
return ..()
var/mob/living/L = AM
- if((iscarbon(AM) || isanimal(AM)) && !L.flying)
+ if((iscarbon(AM) || isanimal(AM)) && !HAS_TRAIT(L, TRAIT_FLYING))
spring_trap(AM)
if(ishuman(AM))
diff --git a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm
index 96893ff65c9e..9aeedf0b9d83 100644
--- a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm
+++ b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm
@@ -346,12 +346,17 @@
//////////////////////////////
/obj/item/melee/energy/sword/pirate
name = "energy cutlass"
- desc = "Arrrr matey."
+ desc = "A crude copy of syndicate technology. Favored among space pirates for its small form factor while inactive. Arrrr, matey!"
force_on = 20
+ throwforce_on = 10 // No PvP shenanigans, this is main weapon in PvE explorer gameplay and can be obtained very easy
+ embed_chance = 45
+ embedded_impact_pain_multiplier = 4
+ armour_penetration_percentage = 0
+ armour_penetration_flat = 0
icon_state = "cutlass0"
icon_state_on = "cutlass1"
light_color = LIGHT_COLOR_RED
- origin_tech = "combat=3;magnets=4;syndicate=2"
+ origin_tech = "combat=3;magnets=4"
//////////////////////////////
// MARK: HARDLIGHT BLADE
diff --git a/code/game/objects/items/weapons/melee/melee_misc.dm b/code/game/objects/items/weapons/melee/melee_misc.dm
index 6e03cbd66531..99c3652f28e3 100644
--- a/code/game/objects/items/weapons/melee/melee_misc.dm
+++ b/code/game/objects/items/weapons/melee/melee_misc.dm
@@ -39,6 +39,9 @@
hitsound = 'sound/weapons/rapierhit.ogg'
materials = list(MAT_METAL = 1000)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF // Theft targets should be hard to destroy
+ // values for slapping
+ var/slap_sound = 'sound/effects/woodhit.ogg'
+ COOLDOWN_DECLARE(slap_cooldown)
/obj/item/melee/saber/examine(mob/user)
. = ..()
@@ -58,6 +61,34 @@
AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = NON_PROJECTILE_ATTACKS)
RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(alert_admins_on_destroy))
+/obj/item/melee/saber/attack(mob/living/target, mob/living/user)
+ if(user.a_intent != INTENT_HELP || !ishuman(target))
+ return ..()
+ if(!COOLDOWN_FINISHED(src, slap_cooldown))
+ return
+ var/mob/living/carbon/human/H = target
+ if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
+ user.visible_message("[user] accidentally slaps [user.p_themselves()] with [src]!", \
+ "You accidentally slap yourself with [src]!")
+ slap(user, user)
+ else
+ user.visible_message("[user] slaps [H] with the flat of the blade!", \
+ "You slap [H] with the flat of the blade!")
+ slap(target, user)
+
+/obj/item/melee/saber/proc/slap(mob/living/carbon/human/target, mob/living/user)
+ user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
+ playsound(loc, slap_sound, 50, TRUE, -1)
+ target.AdjustConfused(4 SECONDS, 0, 4 SECONDS)
+ target.apply_damage(10, STAMINA)
+ add_attack_logs(user, target, "Slapped by [src]", ATKLOG_ALL)
+ COOLDOWN_START(src, slap_cooldown, 4 SECONDS)
+
+/obj/item/melee/saber/suicide_act(mob/user)
+ user.visible_message(pick("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku!", \
+ "[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
+ return BRUTELOSS
+
// Traitor Sword
/obj/item/melee/snakesfang
name = "snakesfang"
@@ -143,11 +174,11 @@
/obj/item/melee/breach_cleaver/proc/wield(obj/item/source, mob/living/carbon/human/user)
to_chat(user, "You heave [src] up in both hands.")
user.apply_status_effect(STATUS_EFFECT_BREACH_AND_CLEAVE)
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/melee/breach_cleaver/proc/unwield(obj/item/source, mob/living/carbon/human/user)
user.remove_status_effect(STATUS_EFFECT_BREACH_AND_CLEAVE)
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/melee/breach_cleaver/attack_obj(obj/O, mob/living/user, params)
if(!HAS_TRAIT(src, TRAIT_WIELDED)) // Only works good when wielded
diff --git a/code/game/objects/items/weapons/misc_items.dm b/code/game/objects/items/weapons/misc_items.dm
index bce1df899f20..9722f91518f1 100644
--- a/code/game/objects/items/weapons/misc_items.dm
+++ b/code/game/objects/items/weapons/misc_items.dm
@@ -113,7 +113,10 @@
desc = "A tube... of cardboard."
icon = 'icons/obj/stacks/miscellaneous.dmi'
icon_state = "c_tube"
+ hitsound = 'sound/items/cardboard_tube.ogg'
throwforce = 1
+ force = 1
+ attack_verb = list("bonked", "thunked")
w_class = WEIGHT_CLASS_TINY
throw_speed = 4
throw_range = 5
diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm
index 8151e7fd1c0a..33c96483d5b7 100644
--- a/code/game/objects/items/weapons/powerfist.dm
+++ b/code/game/objects/items/weapons/powerfist.dm
@@ -14,8 +14,9 @@
origin_tech = "combat=5;powerstorage=3;syndicate=3"
var/click_delay = 1.5
var/fisto_setting = 1
- ///base pressure in kpa used by the powerfist per hit
+ /// Base pressure in kpa used by the powerfist per hit
var/gasperfist = 17.5
+
var/obj/item/tank/internals/tank = null //Tank used for the gauntlet's piston-ram.
/obj/item/melee/powerfist/Destroy()
@@ -93,7 +94,7 @@
if(!tank)
to_chat(user, "[src] can't operate without a source of gas!")
return
- if(tank && !tank.air_contents.boolean_remove(((gasperfist * fisto_setting) * tank.air_contents.return_volume()) / (R_IDEAL_GAS_EQUATION * tank.air_contents.temperature())))
+ if(!use_air())
to_chat(user, "[src]'s piston-ram lets out a weak hiss, it needs more gas!")
playsound(loc, 'sound/effects/refill.ogg', 50, 1)
return
@@ -114,3 +115,18 @@
add_attack_logs(user, target, "POWER FISTED with [src]")
user.changeNext_move(CLICK_CD_MELEE * click_delay)
+
+/obj/item/melee/powerfist/proc/use_air()
+ if(!tank)
+ return FALSE
+
+ var/amount_to_remove = gasperfist * fisto_setting
+ var/pressure_in_tank = tank.air_contents.return_pressure()
+
+ // So this check is here to see if the amount of pressure currently in the tank is higher than 10 atmospheres
+ // If it is higher, we instead take 10% out of the tank so it'll deplete a lot faster, but is still a bit more ammo
+ if(pressure_in_tank > (ONE_ATMOSPHERE * 10))
+ amount_to_remove = 0.1 * pressure_in_tank
+
+ var/moles_to_remove = (amount_to_remove * tank.air_contents.volume) / (R_IDEAL_GAS_EQUATION * tank.air_contents.temperature())
+ return tank.air_contents.boolean_remove(moles_to_remove)
diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm
index a66919d4e775..4da6b3284ac0 100644
--- a/code/game/objects/items/weapons/scrolls.dm
+++ b/code/game/objects/items/weapons/scrolls.dm
@@ -21,7 +21,7 @@
. += "Number of uses: [uses]. This scroll will vanish after the final use."
. += "P.S. Don't forget to bring your gear, you'll need it to cast most spells."
-/obj/item/teleportation_scroll/attack_self(mob/user)
+/obj/item/teleportation_scroll/attack_self(mob/living/user)
if(!uses) //somehow?
to_chat(user, "You attempt to read the scroll but it disintegrates in your hand, it appears that is has run out of charges!")
qdel(src)
@@ -59,7 +59,7 @@
return
if(user && user.buckled)
- user.buckled.unbuckle_mob(user, force = TRUE)
+ user.unbuckle(force = TRUE)
if(user?.has_buckled_mobs())
user.unbuckle_all_mobs(force = TRUE)
diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm
index ce0a58932858..7f25b42f7603 100644
--- a/code/game/objects/items/weapons/shards.dm
+++ b/code/game/objects/items/weapons/shards.dm
@@ -72,7 +72,7 @@
/obj/item/shard/Crossed(mob/living/L, oldloc)
if(istype(L) && has_gravity(loc))
- if(L.incorporeal_move || L.flying || L.floating)
+ if(L.incorporeal_move || HAS_TRAIT(L, TRAIT_FLYING) || L.floating)
return
playsound(loc, 'sound/effects/glass_step.ogg', 50, TRUE)
return ..()
diff --git a/code/game/objects/items/weapons/staff.dm b/code/game/objects/items/weapons/staff.dm
index 255b2d4cfe12..8da6c38f2d79 100644
--- a/code/game/objects/items/weapons/staff.dm
+++ b/code/game/objects/items/weapons/staff.dm
@@ -34,7 +34,7 @@
user.update_inv_l_hand()
user.update_inv_r_hand()
if(iswizard(user))
- user.flying = TRUE
+ ADD_TRAIT(user, TRAIT_FLYING, "broomstick")
user.say("QUID 'ITCH")
animate(user, pixel_y = pixel_y + 10 , time = 10, loop = 1, easing = SINE_EASING)
to_chat(user, "You hold [src] between your legs.")
@@ -44,6 +44,7 @@
user.update_inv_l_hand()
user.update_inv_r_hand()
if(iswizard(user))
+ REMOVE_TRAIT(user, TRAIT_FLYING, "broomstick")
animate(user, pixel_y = pixel_y + 10 , time = 1, loop = 1)
animate(user, pixel_y = pixel_y, time = 10, loop = 1, easing = SINE_EASING)
animate(user)
@@ -58,8 +59,7 @@
..()
/obj/item/staff/broom/dropped(mob/user)
- if(iswizard(user) && user.flying)
- user.flying = FALSE
+ REMOVE_TRAIT(user, TRAIT_FLYING, "broomstick")
..()
/obj/item/staff/broom/horsebroom
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 6ec53ab55e5f..fadff4057acd 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -431,7 +431,7 @@
slowdown = 1
if(antidrop_on_zip)
flags ^= NODROP
- update_icon_state(UPDATE_ICON_STATE)
+ update_icon(UPDATE_ICON_STATE)
return
slowdown = 0
@@ -440,7 +440,7 @@
container.hide_from_all() // Hide everything inside the bag too
if(antidrop_on_zip)
flags |= NODROP
- update_icon_state(UPDATE_ICON_STATE)
+ update_icon(UPDATE_ICON_STATE)
/obj/item/storage/backpack/duffel/update_icon_state()
. = ..()
@@ -805,6 +805,7 @@
desc = "Stimulate your senses."
list_reagents = list("nutriment" = 5, "stimulants" = 25)
bitesize = 100
+ goal_difficulty = FOOD_GOAL_SKIP
/obj/item/food/plum_pie
name = "perfect plum pie"
@@ -909,30 +910,30 @@
//Commander
/obj/item/storage/backpack/ert/commander
name = "emergency response team commander backpack"
- desc = "A spacious backpack with lots of pockets, worn by the commander of a Nanotrasen Emergency Response Team."
+ desc = "A spacious blue-striped combat backpack with plenty of easily-accessible pockets."
//Security
/obj/item/storage/backpack/ert/security
name = "emergency response team security backpack"
- desc = "A spacious backpack with lots of pockets, worn by security members of a Nanotrasen Emergency Response Team."
+ desc = "A spacious red-striped combat backpack with plenty of easily-accessible pockets."
icon_state = "ert_security"
//Engineering
/obj/item/storage/backpack/ert/engineer
name = "emergency response team engineer backpack"
- desc = "A spacious backpack with lots of pockets, worn by engineering members of a Nanotrasen Emergency Response Team."
+ desc = "A spacious orange-striped combat backpack with plenty of easily-accessible pockets."
icon_state = "ert_engineering"
//Medical
/obj/item/storage/backpack/ert/medical
name = "emergency response team medical backpack"
- desc = "A spacious backpack with lots of pockets, worn by medical members of a Nanotrasen Emergency Response Team."
+ desc = "A spacious white-striped combat backpack with plenty of easily-accessible pockets."
icon_state = "ert_medical"
//Janitorial
/obj/item/storage/backpack/ert/janitor
name = "emergency response team janitor backpack"
- desc = "A spacious backpack with lots of pockets, worn by janitorial members of a Nanotrasen Emergency Response Team."
+ desc = "A spacious purple-striped combat backpack with plenty of easily-accessible pockets."
icon_state = "ert_janitor"
//Solgov
@@ -943,6 +944,6 @@
/obj/item/storage/backpack/ert/deathsquad
name = "Deathsquad backpack"
- desc = "A spacious backpack with lots of pockets, worn by those working in Special Operations."
+ desc = "A spacious red & black combat rucksack made of lightweight nanomesh. Likely the most intimidating backpack one will ever see."
icon_state = "ert_security"
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 1c1f589b1978..e58bb74b023d 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -107,7 +107,9 @@
/obj/item/extinguisher/mini,
/obj/item/holosign_creator,
/obj/item/stack/nanopaste,
- /obj/item/robotanalyzer)
+ /obj/item/robotanalyzer,
+ /obj/item/rpd/bluespace
+ )
/obj/item/storage/belt/utility/full/populate_contents()
new /obj/item/screwdriver(src)
@@ -182,6 +184,11 @@
new /obj/item/stack/cable_coil(src, 30, COLOR_BLUE)
update_icon()
+/obj/item/storage/belt/utility/expedition/vendor
+
+/obj/item/storage/belt/utility/expedition/vendor/populate_contents()
+ return // only cool-looking belt, nothing more
+
/obj/item/storage/belt/medical
name = "medical belt"
desc = "Can hold various medical equipment."
@@ -292,6 +299,7 @@
max_w_class = WEIGHT_CLASS_NORMAL
use_item_overlays = TRUE
can_hold = list(
+ /obj/item/radio,
/obj/item/grenade/flashbang,
/obj/item/grenade/chem_grenade/teargas,
/obj/item/reagent_containers/spray/pepper,
@@ -342,29 +350,9 @@
icon_state = "securitywebbing"
item_state = "securitywebbing"
storage_slots = 6
+ max_combined_w_class = 15
use_item_overlays = FALSE
layer_over_suit = TRUE
- can_hold = list(
- /obj/item/grenade/flashbang,
- /obj/item/grenade/chem_grenade/teargas,
- /obj/item/reagent_containers/spray/pepper,
- /obj/item/restraints/handcuffs,
- /obj/item/flash,
- /obj/item/clothing/glasses,
- /obj/item/ammo_casing/shotgun,
- /obj/item/ammo_box,
- /obj/item/food/donut,
- /obj/item/kitchen/knife/combat,
- /obj/item/melee/baton,
- /obj/item/melee/classic_baton,
- /obj/item/flashlight/seclite,
- /obj/item/holosign_creator/security,
- /obj/item/melee/classic_baton/telescopic,
- /obj/item/restraints/legcuffs/bola,
- /obj/item/clothing/mask/gas/sechailer,
- /obj/item/detective_scanner,
- /obj/item/ammo_box/magazine/wt550m9
- )
/obj/item/storage/belt/soulstone
name = "soul stone belt"
@@ -409,7 +397,8 @@
/obj/item/weldingtool,
/obj/item/wirecutters,
/obj/item/wrench,
- /obj/item/multitool
+ /obj/item/multitool,
+ /obj/item/rpd/bluespace
)
/obj/item/storage/belt/military/sst
@@ -482,6 +471,24 @@
icon_state = "assaultbelt"
item_state = "assault"
storage_slots = 6
+ w_class_override = list(
+ /obj/item/crowbar,
+ /obj/item/screwdriver,
+ /obj/item/weldingtool,
+ /obj/item/wirecutters,
+ /obj/item/wrench,
+ /obj/item/multitool,
+ /obj/item/ammo_box,
+ /obj/item/melee/baton,
+ /obj/item/melee/classic_baton,
+ /obj/item/detective_scanner
+ )
+
+/obj/item/storage/belt/military/assault/attackby(obj/item/I, mob/user)
+ if(I.w_class > WEIGHT_CLASS_NORMAL)
+ to_chat(user, "[I] is too big for [src].")
+ return
+ return ..()
/obj/item/storage/belt/military/assault/marines/full/populate_contents()
new /obj/item/ammo_box/magazine/m12g(src)
@@ -561,7 +568,7 @@
/obj/item/storage/belt/lazarus
name = "trainer's belt"
desc = "For the mining master, holds your lazarus capsules."
- icon_state = "lazarusbelt"
+ icon_state = "lazarusbelt_0"
item_state = "lazbelt"
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_TINY
@@ -575,7 +582,7 @@
update_icon()
/obj/item/storage/belt/lazarus/update_icon_state()
- icon_state = "[initial(icon_state)]_[length(contents)]"
+ icon_state = "lazarusbelt_[length(contents)]"
/obj/item/storage/belt/lazarus/attackby(obj/item/I, mob/user)
var/amount = length(contents)
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 31e29968b4d0..cb423ae1cad2 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -320,6 +320,8 @@
desc = "A full set of labelled components for assembling an R&D setup with. There are wordless picrographs of how to assemble everything on the back."
/obj/item/storage/box/large/rnd_parts/populate_contents()
+ new /obj/item/circuitboard/rnd_network_controller(src)
+ new /obj/item/circuitboard/rdserver(src)
new /obj/item/circuitboard/rdconsole(src)
new /obj/item/circuitboard/protolathe(src)
new /obj/item/circuitboard/destructive_analyzer(src)
@@ -332,6 +334,7 @@
new /obj/item/stock_parts/matter_bin(src)
new /obj/item/stock_parts/matter_bin(src)
new /obj/item/stock_parts/scanning_module(src)
+ new /obj/item/stock_parts/scanning_module(src)
new /obj/item/stock_parts/micro_laser(src)
new /obj/item/reagent_containers/glass/beaker(src)
new /obj/item/reagent_containers/glass/beaker(src)
@@ -340,6 +343,7 @@
new /obj/item/stack/sheet/glass/fifty(src)
new /obj/item/stack/sheet/metal/fifty(src)
new /obj/item/stack/cable_coil(src)
+ new /obj/item/stack/cable_coil(src)
/obj/item/storage/box/large/glowstick/emergency
name = "emergency glowstick box"
@@ -699,77 +703,83 @@
////////////////
/* Ammo Boxes */
////////////////
-/obj/item/storage/box/slug
- name = "ammunition box (Slug)"
+
+/obj/item/storage/fancy/shell
+ icon = 'icons/obj/shell_boxes.dmi'
+ storage_slots = 8
+ appearance_flags = parent_type::appearance_flags | KEEP_TOGETHER
+ can_hold = list(/obj/item/ammo_casing/shotgun)
+ /// What shell do we fill the box with
+ var/shell_type
+
+/obj/item/storage/fancy/shell/update_icon_state()
+ icon_state = "open"
+
+/obj/item/storage/fancy/shell/populate_contents()
+ if(!shell_type)
+ return
+ for(var/i in 1 to storage_slots)
+ new shell_type(src)
+
+/obj/item/storage/fancy/shell/update_overlays()
+ . = ..()
+ var/list/cached_contents = contents
+ for(var/index in 1 to length(cached_contents))
+ var/obj/shell = cached_contents[index]
+ var/image/I = image(icon, src, initial(shell.icon_state))
+ I.pixel_x = 3 * (round((index - 1) / 2))
+ I.pixel_y = -4 * ((index + 1) % 2)
+ . += I
+
+ . += "shell_box_front" // need to add another overlay to prevent from other overlays from showing on top
+
+/obj/item/storage/fancy/shell/tranquilizer
+ name = "ammunition box (Tranquilizer darts)"
desc = "A small box capable of holding seven shotgun shells."
- icon_state = "slug_box"
+ icon_state = "tranqbox"
+ shell_type = /obj/item/ammo_casing/shotgun/tranquilizer
-/obj/item/storage/box/slug/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/ammo_casing/shotgun(src)
+/obj/item/storage/fancy/shell/slug
+ name = "ammunition box (Slug)"
+ desc = "A small box capable of holding seven shotgun shells."
+ icon_state = "slugbox"
+ shell_type = /obj/item/ammo_casing/shotgun
-/obj/item/storage/box/buck
+/obj/item/storage/fancy/shell/buck
name = "ammunition box (Buckshot)"
desc = "A small box capable of holding seven shotgun shells."
- icon_state = "buckshot_box"
+ icon_state = "buckbox"
+ shell_type = /obj/item/ammo_casing/shotgun/buckshot
-/obj/item/storage/box/buck/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/ammo_casing/shotgun/buckshot(src)
-
-/obj/item/storage/box/dragonsbreath
+/obj/item/storage/fancy/shell/dragonsbreath
name = "ammunition box (Dragonsbreath)"
desc = "A small box capable of holding seven shotgun shells."
- icon_state = "dragonsbreath_box"
+ icon_state = "dragonsbox"
+ shell_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
-/obj/item/storage/box/dragonsbreath/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath(src)
-
-/obj/item/storage/box/stun
+/obj/item/storage/fancy/shell/stun
name = "ammunition box (Stun shells)"
desc = "A small box capable of holding seven shotgun shells."
- icon_state = "stun_box"
+ icon_state = "stunbox"
+ shell_type = /obj/item/ammo_casing/shotgun/stunslug
-/obj/item/storage/box/stun/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/ammo_casing/shotgun/stunslug(src)
-
-/obj/item/storage/box/beanbag
+/obj/item/storage/fancy/shell/beanbag
name = "ammunition box (Beanbag shells)"
desc = "A small box capable of holding seven shotgun shells."
- icon_state = "beanbag_box"
-
-/obj/item/storage/box/beanbag/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/ammo_casing/shotgun/beanbag(src)
+ icon_state = "beanbox"
+ shell_type = /obj/item/ammo_casing/shotgun/beanbag
-/obj/item/storage/box/rubbershot
+/obj/item/storage/fancy/shell/rubbershot
name = "ammunition box (Rubbershot shells)"
desc = "A small box capable of holding seven shotgun shells."
- icon_state = "rubbershot_box"
+ icon_state = "rubberbox"
+ shell_type = /obj/item/ammo_casing/shotgun/rubbershot
-/obj/item/storage/box/rubbershot/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/ammo_casing/shotgun/rubbershot(src)
-
-/obj/item/storage/box/tranquilizer
- name = "ammunition box (Tranquilizer darts)"
- desc = "A small box capable of holding seven shotgun shells."
- icon_state = "tranq_box"
-
-/obj/item/storage/box/tranquilizer/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/ammo_casing/shotgun/tranquilizer(src)
-
-/obj/item/storage/box/holy
+/obj/item/storage/fancy/shell/holy
name = "ammunition box (Holy Water darts)"
desc = "A small box capable of holding seven shotgun shells."
icon_state = "hshell_box"
-
-/obj/item/storage/box/holy/populate_contents()
- for(var/I in 1 to 7)
- new /obj/item/ammo_casing/shotgun/holy(src)
+ shell_type = /obj/item/ammo_casing/shotgun/holy
////////////////
/* Donk Boxes */
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 49f940b18350..4d81698c757c 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -103,8 +103,9 @@
throwforce = 2
slot_flags = SLOT_FLAG_BELT
-/obj/item/storage/fancy/candle_box/full
- icon_state = "candlebox5"
+/obj/item/storage/fancy/candle_box/Initialize(mapload)
+ . = ..()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/storage/fancy/candle_box/full/populate_contents()
for(var/I in 1 to storage_slots)
diff --git a/code/game/objects/items/weapons/storage/storage_base.dm b/code/game/objects/items/weapons/storage/storage_base.dm
index 9ae621d46932..9130e81e6f30 100644
--- a/code/game/objects/items/weapons/storage/storage_base.dm
+++ b/code/game/objects/items/weapons/storage/storage_base.dm
@@ -464,7 +464,8 @@
if(observer.client && observer.s_active != src)
observer.client.screen -= I
I.dropped(user, TRUE)
- add_fingerprint(user)
+ if(user)
+ add_fingerprint(user)
if(!prevent_warning)
// all mobs with clients attached, sans the item's user
@@ -481,10 +482,10 @@
// restrict player list to include only those in view
for(var/mob/M in oviewers(7, user))
M.show_message("[user] puts [I] into [src].")
-
orient2hud(user)
- if(user.s_active)
- user.s_active.show_to(user)
+ if(user)
+ if(user.s_active)
+ user.s_active.show_to(user)
I.mouse_opacity = MOUSE_OPACITY_OPAQUE //So you can click on the area around the item to equip it, instead of having to pixel hunt
I.in_inventory = TRUE
@@ -531,6 +532,7 @@
if(I.maptext)
I.maptext = ""
I.on_exit_storage(src)
+ I.mouse_opacity = initial(I.mouse_opacity)
update_icon()
return TRUE
diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index 748c7a1d54f1..e33a4d681fca 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -52,14 +52,14 @@
if(!current_location||!is_teleport_allowed(current_location.z))//If turf was not found or they're somewhere teleproof
to_chat(user, "\The [src] is malfunctioning.")
return
- var/list/L = list( )
+ var/list/L = list()
for(var/obj/machinery/computer/teleporter/com in GLOB.machines)
if(com.target)
if(com.power_station && com.power_station.teleporter_hub && com.power_station.engaged)
L["[com.id] (Active)"] = com.target
else
L["[com.id] (Inactive)"] = com.target
- var/list/turfs = list( )
+ var/list/turfs = list()
var/area/A
for(var/turf/T in orange(10))
if(T.x>world.maxx-8 || T.x<8)
diff --git a/code/game/objects/items/weapons/thurible.dm b/code/game/objects/items/weapons/thurible.dm
new file mode 100644
index 000000000000..8c79b2cd0dcf
--- /dev/null
+++ b/code/game/objects/items/weapons/thurible.dm
@@ -0,0 +1,174 @@
+/obj/item/thurible
+ name = "thurible"
+ desc = "A religious artifact used to burn and spread incense when swung from the attached chain."
+ icon = 'icons/obj/weapons/magical_weapons.dmi'
+ lefthand_file = 'icons/mob/inhands/religion_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/religion_righthand.dmi'
+ icon_state = "thurible"
+ item_state = "thurible"
+ force = 10
+ throwforce = 7
+ w_class = WEIGHT_CLASS_NORMAL
+ flags = CONDUCT
+ container_type = REFILLABLE
+ /// Whether or not the thurible can be loaded with harmful chems
+ var/corrupted = FALSE
+ /// Has the thurible been ignited?
+ var/lit = FALSE
+ /// List of chemicals considered safe for the thurible
+ var/static/list/safe_chem_list = list("antihol", "charcoal", "epinephrine", "insulin", "teporone", "salbutamol", "omnizine",
+ "weak_omnizine", "godblood", "potass_iodide", "oculine", "mannitol", "spaceacillin", "salglu_solution",
+ "sal_acid", "cryoxadone", "sugar", "hydrocodone", "mitocholide", "rezadone", "menthol",
+ "mutadone", "sanguine_reagent", "iron", "ephedrine", "heparin", "corazone", "sodiumchloride",
+ "lavaland_extract", "synaptizine", "bicaridine", "kelotane", "water", "holywater", "lsd", "thc", "happiness",
+ "cbd", "space_drugs", "nicotine", "jestosterone", "nothing")
+ /// How many reagents are consumed with each swing?
+ var/swing_reagents_consumed = 2
+
+/obj/item/thurible/Initialize(mapload)
+ . = ..()
+ create_reagents(50)
+ reagents.set_reacting(FALSE)
+
+/obj/item/thurible/Destroy()
+ STOP_PROCESSING(SSobj, src)
+ QDEL_NULL(reagents)
+ return ..()
+
+/obj/item/thurible/examine(mob/user)
+ . = ..()
+ . += "[src] can hold up to [reagents.maximum_volume] units."
+ . += "Contains [reagents.total_volume] units of various reagents."
+
+/obj/item/thurible/process()
+ swing()
+
+/obj/item/thurible/update_appearance()
+ if(lit)
+ icon_state = "thurible-lit"
+ item_state = "thurible-lit"
+ else
+ icon_state = "thurible"
+ item_state = "thurible"
+ if(ishuman(loc))
+ var/mob/living/carbon/human/H = loc
+ if(H.r_hand == src || H.l_hand == src)
+ H.update_inv_l_hand()
+ H.update_inv_r_hand()
+ return ..()
+
+/obj/item/thurible/attackby(obj/item/fire_source, mob/user, params)
+ . = ..()
+ if(fire_source.get_heat())
+ user.visible_message(
+ "[user] lights [src] with [fire_source].",
+ "You light [src] with [fire_source].",
+ "You hear a low whoosh."
+ )
+ light(user)
+
+/obj/item/thurible/attack_self(mob/user)
+ if(lit)
+ to_chat(user, "You extinguish [src].")
+ put_out(user)
+ return ..()
+
+/obj/item/thurible/can_enter_storage(obj/item/storage/S, mob/user)
+ if(lit)
+ to_chat(user, "[S] can't hold \the [initial(name)] while it's lit!") // initial(name) so it doesn't say "lit" twice in a row
+ return FALSE
+ return TRUE
+
+/obj/item/thurible/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
+ . = ..()
+ light()
+
+/obj/item/thurible/on_reagent_change()
+ . = ..()
+ if(corrupted)
+ return
+ var/found_forbidden_reagent = FALSE
+ for(var/datum/reagent/R as anything in reagents.reagent_list)
+ if(R.id == "unholywater")
+ corrupted = TRUE
+ visible_message(
+ "You corrupt [src] with unholy water!",
+ "You hear a strange gurgling."
+ )
+ return
+ if(!safe_chem_list.Find(R.id))
+ reagents.del_reagent(R.id)
+ found_forbidden_reagent = TRUE
+ if(found_forbidden_reagent)
+ visible_message(
+ "[src] banishes an unholy substance!",
+ "You hear a strange fizzing."
+ )
+
+/// Lights the thurible and starts processing reagents
+/obj/item/thurible/proc/light(mob/user)
+ if(lit)
+ to_chat(user, "[src] is already lit!")
+ return
+
+ if(!reagents.total_volume)
+ to_chat(user, "[src] is out of fuel!")
+ return
+
+ // Plasma explodes when exposed to fire.
+ if(reagents.get_reagent_amount("plasma"))
+ var/datum/effect_system/reagents_explosion/E = new()
+ E.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0)
+ E.start()
+ return
+
+ // Fuel explodes, too, but much less violently.
+ if(reagents.get_reagent_amount("fuel"))
+ var/datum/effect_system/reagents_explosion/E = new()
+ E.set_up(round(reagents.get_reagent_amount("fuel") / 5, 1), get_turf(src), 0, 0)
+ E.start()
+ return
+
+ // And black powder... but more violently.
+ if(reagents.get_reagent_amount("blackpowder"))
+ var/datum/effect_system/reagents_explosion/E = new()
+ E.set_up(round(reagents.get_reagent_amount("blackpowder") / 2, 1), get_turf(src), 0, 0)
+ E.start()
+ return
+
+ lit = TRUE
+ reagents.set_reacting(TRUE)
+ reagents.handle_reactions()
+ START_PROCESSING(SSobj, src)
+ set_light(2, 0.3, "#E38F46")
+ update_appearance()
+ return TRUE
+
+/// Extinguishes the thurible and stops processing
+/obj/item/thurible/proc/put_out(mob/user)
+ lit = FALSE
+ STOP_PROCESSING(SSobj, src)
+ set_light(0)
+ update_appearance()
+ return TRUE
+
+/// Spreads reagents in a 3x3 area centered on the thurible
+/obj/item/thurible/proc/swing()
+ var/obj/released_reagents = new
+ released_reagents.create_reagents(2)
+ reagents.trans_to(released_reagents, swing_reagents_consumed)
+ var/list/mobs_to_smoke = list()
+ for(var/atom/A in view(1, get_turf(src)))
+ released_reagents.reagents.reaction(A)
+ if(iscarbon(A))
+ var/mob/living/carbon/C = A
+ if(C.can_breathe_gas())
+ mobs_to_smoke += C
+ if(length(mobs_to_smoke))
+ var/percentage_to_add = released_reagents.reagents.total_volume / length(mobs_to_smoke) // Divide the amount of reagents spread around by the number of people inhaling it
+
+ for(var/mob/living/carbon/smoker as anything in mobs_to_smoke)
+ released_reagents.reagents.copy_to(smoker, percentage_to_add)
+
+ if(reagents.total_volume <= 0)
+ put_out()
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 6848767af43f..3d11a5dff23b 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -34,10 +34,11 @@
var/emagged = FALSE
// Access-related fields
+
+ /// A list of accesses as defined by `code/__DEFINES/access_defines.dm`. All accesses are required when checking.
var/list/req_access = null
- var/req_access_txt = "0"
+ /// A list of accesses as defined by `code/__DEFINES/access_defines.dm`. At least one access is required when checking.
var/list/req_one_access = null
- var/req_one_access_txt = "0"
/obj/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index 41affd7a4fc4..80e9ae91f701 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -524,7 +524,8 @@
icon_state = "egg_hatched"
flick("egg_opening", src)
status = BURSTING
- qdel(GetComponent(/datum/component/proximity_monitor))
+ DeleteComponent(/datum/component/proximity_monitor)
+
addtimer(CALLBACK(src, PROC_REF(hatch)), 1.5 SECONDS)
///We now check HOW the hugger is hatching, kill carried from Burst() and obj_break()
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index c6a04c649cbb..8a6331b5d69d 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -9,7 +9,10 @@
armor = list(MELEE = 20, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 10, RAD = 0, FIRE = 70, ACID = 60)
var/icon_closed
var/icon_opened
- var/open_door_sprite = "generic_door"
+ /// Overwrites icon_state for the opened door sprite. Only necessary if the opened door sprite has a different name than the icon_state.
+ var/opened_door_sprite
+ /// Overwrites icon_state for the closed door sprite. Only necessary if the closed door sprite has a different name than the icon_state.
+ var/closed_door_sprite
var/opened = FALSE
var/welded = FALSE
var/locked = FALSE
@@ -25,13 +28,30 @@
var/material_drop = /obj/item/stack/sheet/metal
var/material_drop_amount = 2
var/transparent
+ var/secure = FALSE
+
+ /// The overlay for the closet's door
+ var/obj/effect/overlay/closet_door/door_obj
+ /// Whether or not this door is being animated
+ var/is_animating_door = FALSE
+ /// Vertical squish of the door
+ var/door_anim_squish = 0.30
+ /// The maximum angle the door will be drawn at
+ var/door_anim_angle = 136
+ /// X position of the closet door hinge
+ var/door_hinge_x = -6.5
+ /// Amount of time it takes for the door animation to play
+ var/door_anim_time = 2.0 // set to 0 to make the door not animate at all
+ /// Whether this closet uses a door overlay at all. If FALSE, it'll switch to a system where the entire icon_state is replaced with [icon_state]_open instead.
+ var/enable_door_overlay = TRUE
+ /// Whether this closet uses a door overlay for when it is opened
+ var/has_opened_overlay = TRUE
+ /// Whether this closet uses a door overlay for when it is closed
+ var/has_closed_overlay = TRUE
// Please dont override this unless you absolutely have to
/obj/structure/closet/Initialize(mapload)
. = ..()
- icon_closed = "[icon_state]"
- if(!icon_opened)
- icon_opened = "[icon_state]_open"
if(mapload && !opened)
// Youre probably asking, why is this a 0 seconds timer AA?
// Well, I will tell you. One day, all /obj/effect/spawner will use Initialize
@@ -42,6 +62,88 @@
populate_contents() // Spawn all its stuff
update_icon() // Set it to the right icon if needed
+/obj/structure/closet/update_icon()
+ . = ..()
+ if(!enable_door_overlay)
+ if(opened)
+ icon_state = "[initial(icon_state)]_open"
+ else
+ icon_state = initial(icon_state)
+
+/obj/structure/closet/proc/closet_update_overlays(list/new_overlays)
+ . = new_overlays
+ if(enable_door_overlay && !is_animating_door)
+ if(opened && has_opened_overlay)
+ var/mutable_appearance/door_overlay = mutable_appearance(icon, "[opened_door_sprite || icon_state]_opened", alpha = src.alpha)
+ . += door_overlay
+ door_overlay.overlays += emissive_blocker(door_overlay.icon, door_overlay.icon_state, alpha = door_overlay.alpha) // If we don't do this the door doesn't block emissives and it looks weird.
+ else if(!opened && has_closed_overlay)
+ . += "[closed_door_sprite || icon_state]_closed"
+
+ if(opened)
+ return
+
+ if(welded)
+ . += "welded"
+
+ if(broken || !secure || is_animating_door)
+ return
+
+ //Overlay is similar enough for both that we can use the same mask for both
+ . += emissive_appearance(icon, "locked", alpha = src.alpha)
+ . += locked ? "locked" : "unlocked"
+
+/// Animates the closet door opening and closing
+/obj/structure/closet/proc/animate_door(closing = FALSE)
+ if(!door_anim_time)
+ return
+ if(!door_obj)
+ door_obj = new
+ var/default_door_icon = "[closed_door_sprite || icon_state]_closed"
+ vis_contents += door_obj
+ door_obj.icon = icon
+ door_obj.icon_state = default_door_icon
+ is_animating_door = TRUE
+ var/num_steps = door_anim_time / world.tick_lag
+
+ for(var/step in 0 to num_steps)
+ var/angle = door_anim_angle * (closing ? 1 - (step / num_steps) : (step / num_steps))
+ var/matrix/door_transform = get_door_transform(angle)
+ var/door_state
+ var/door_layer
+
+ if(angle >= 90)
+ door_state = "[opened_door_sprite || icon_state]_back"
+ door_layer = FLOAT_LAYER
+ else
+ door_state = "[closed_door_sprite || icon_state]_closed"
+ door_layer = ABOVE_MOB_LAYER
+
+ if(step == 0)
+ door_obj.transform = door_transform
+ door_obj.icon_state = door_state
+ door_obj.layer = door_layer
+ else if(step == 1)
+ animate(door_obj, transform = door_transform, icon_state = door_state, layer = door_layer, time = world.tick_lag, flags = ANIMATION_END_NOW)
+ else
+ animate(transform = door_transform, icon_state = door_state, layer = door_layer, time = world.tick_lag)
+ addtimer(CALLBACK(src, PROC_REF(end_door_animation)), door_anim_time, TIMER_UNIQUE|TIMER_OVERRIDE)
+
+/// Ends the door animation and removes the animated overlay
+/obj/structure/closet/proc/end_door_animation()
+ is_animating_door = FALSE
+ vis_contents -= door_obj
+ update_icon()
+ COMPILE_OVERLAYS(src)
+
+/// Calculates the matrix to be applied to the animated door overlay
+/obj/structure/closet/proc/get_door_transform(angle)
+ var/matrix/door_matrix = matrix()
+ door_matrix.Translate(-door_hinge_x, 0)
+ door_matrix.Multiply(matrix(cos(angle), 0, 0, -sin(angle) * door_anim_squish, 1, 0))
+ door_matrix.Translate(door_hinge_x, 0)
+ return door_matrix
+
// Override this to spawn your things in. This lets you use probabilities, and also doesnt cause init overrides
/obj/structure/closet/proc/populate_contents()
return
@@ -60,6 +162,7 @@
/obj/structure/closet/Destroy(force)
if(!force)
dump_contents()
+ QDEL_NULL(door_obj)
return ..()
/obj/structure/closet/CanPass(atom/movable/mover, turf/target)
@@ -76,7 +179,6 @@
for(var/obj/structure/closet/closet in get_turf(src))
if(closet != src && closet.anchored != 1)
return FALSE
-
return TRUE
/obj/structure/closet/proc/dump_contents()
@@ -96,19 +198,20 @@
for(var/atom/A in contents)
A.extinguish_light(force)
-/obj/structure/closet/proc/open()
- if(opened)
- return FALSE
-
+/obj/structure/closet/proc/open(mob/user)
if(!can_open())
- return FALSE
-
- dump_contents()
-
- opened = TRUE
- update_icon()
+ return
+ if(opened)
+ return
+ welded = FALSE
+ locked = FALSE
playsound(loc, open_sound, open_sound_volume, TRUE, -3)
+ opened = TRUE
density = FALSE
+ dump_contents()
+ if(enable_door_overlay)
+ animate_door(FALSE)
+ update_appearance()
return TRUE
/obj/structure/closet/proc/close()
@@ -147,11 +250,14 @@
M.forceMove(src)
itemcount++
-
opened = FALSE
- update_icon()
+ playsound(loc, close_sound, close_sound_volume, TRUE, -3)
+ if(enable_door_overlay)
+ animate_door(TRUE)
+ update_appearance()
playsound(loc, close_sound, close_sound_volume, TRUE, -3)
density = TRUE
+
return TRUE
/obj/structure/closet/proc/toggle(mob/user)
@@ -313,22 +419,9 @@
add_fingerprint(user)
toggle(user)
-/obj/structure/closet/update_icon_state()
- if(!opened)
- icon_state = "[icon_closed][transparent ? "_trans" : ""]"
- else
- icon_state = "[icon_opened][transparent ? "_trans" : ""]"
-
/obj/structure/closet/update_overlays()
. = ..()
- if(transparent && opened)
- . += "[open_door_sprite]_trans"
- return
- if(opened)
- . += open_door_sprite
- return
- if(welded)
- . += "welded"
+ closet_update_overlays(.)
// Objects that try to exit a locker by stepping were doing so successfully,
// and due to an oversight in turf/Enter() were going through walls. That
@@ -414,13 +507,11 @@
return ..()
-
/obj/structure/closet/bluespace
name = "bluespace closet"
desc = "A storage unit that moves and stores through the fourth dimension."
density = FALSE
icon_state = "bluespace"
- open_door_sprite = "bluespace_door"
storage_capacity = 60
var/materials = list(MAT_METAL = 5000, MAT_PLASMA = 2500, MAT_TITANIUM = 500, MAT_BLUESPACE = 500)
@@ -433,13 +524,15 @@
for(var/atom/A in location)
if(A.density && A != src && A != AM)
transparent = TRUE
- break
+ alpha = 180
+ update_icon()
+ return
+ alpha = 255
update_icon()
/obj/structure/closet/bluespace/Crossed(atom/movable/AM, oldloc)
if(AM.density)
- transparent = TRUE
- update_icon()
+ UpdateTransparency(location = loc)
/obj/structure/closet/bluespace/Move(NewLoc, direct) // Allows for "phasing" throug objects but doesn't allow you to stuff your EOC homebois in one of these and push them through walls.
var/turf/T = get_turf(NewLoc)
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index 5ebf91d6272e..fb8aaf79bbe8 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -3,7 +3,8 @@
desc = "Just a box..."
icon = 'icons/obj/cardboard_boxes.dmi'
icon_state = "cardboard"
- open_door_sprite = null
+ enable_door_overlay = FALSE
+ door_anim_time = 0
resistance_flags = FLAMMABLE
max_integrity = 70
integrity_failure = 0
diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm
index bfd0bb4e0bd0..e1651a81746f 100644
--- a/code/game/objects/structures/crates_lockers/closets/coffin.dm
+++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm
@@ -2,7 +2,8 @@
name = "coffin"
desc = "It's a burial receptacle for the dearly departed."
icon_state = "coffin"
- open_door_sprite = null
+ enable_door_overlay = FALSE
+ door_anim_time = 0
resistance_flags = FLAMMABLE
max_integrity = 70
material_drop = /obj/item/stack/sheet/wood
@@ -11,15 +12,6 @@
open_sound_volume = 25
close_sound_volume = 50
-/obj/structure/closet/coffin/update_icon_state()
- if(!opened)
- icon_state = icon_closed
- else
- icon_state = icon_opened
-
-/obj/structure/closet/coffin/update_overlays()
- return list()
-
/obj/structure/closet/coffin/sarcophagus
name = "sarcophagus"
icon_state = "sarc"
diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm
index cb5bd4a3c777..bf9c8fc54ef2 100644
--- a/code/game/objects/structures/crates_lockers/closets/fitness.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm
@@ -1,9 +1,8 @@
/obj/structure/closet/athletic_mixed
name = "athletic wardrobe"
desc = "It's a storage unit for athletic wear."
- icon_state = "mixed"
- icon_opened = "generic_open"
- open_door_sprite = "generic_door"
+ icon_state = "generic"
+ closed_door_sprite = "mixed"
/obj/structure/closet/athletic_mixed/populate_contents()
new /obj/item/clothing/under/pants/shorts/grey(src)
@@ -21,8 +20,6 @@
/obj/structure/closet/boxinggloves
name = "boxing gloves"
desc = "It's a storage unit for gloves for use in the boxing ring."
- icon_opened = "generic_open"
- open_door_sprite = "generic_door"
/obj/structure/closet/boxinggloves/populate_contents()
new /obj/item/clothing/gloves/boxing/blue(src)
@@ -34,8 +31,6 @@
/obj/structure/closet/masks
name = "mask closet"
desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!"
- icon_opened = "generic_open"
- open_door_sprite = "generic_door"
/obj/structure/closet/masks/populate_contents()
new /obj/item/clothing/mask/luchador(src)
@@ -46,9 +41,8 @@
/obj/structure/closet/lasertag/red
name = "red laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
- icon_state = "red"
- icon_opened = "generic_open"
- open_door_sprite = "generic_door"
+ icon_state = "generic"
+ closed_door_sprite = "red"
/obj/structure/closet/lasertag/red/populate_contents()
new /obj/item/beach_ball/dodgeball(src)
@@ -63,9 +57,8 @@
/obj/structure/closet/lasertag/blue
name = "blue laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
- icon_state = "blue"
- icon_opened = "generic_open"
- open_door_sprite = "generic_door"
+ icon_state = "generic"
+ closed_door_sprite = "blue"
/obj/structure/closet/lasertag/blue/populate_contents()
new /obj/item/beach_ball/dodgeball(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index dc3c521b27b3..7d35647dcac2 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -2,7 +2,7 @@
name = "cabinet"
desc = "Old will forever be in fashion."
icon_state = "cabinet"
- open_door_sprite = "cabinet_door"
+ door_anim_time = 0
resistance_flags = FLAMMABLE
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
@@ -29,22 +29,19 @@
name = "strange closet"
desc = "It looks alien!"
icon_state = "alien"
- open_door_sprite = "alien_door"
/obj/structure/closet/gimmick
name = "administrative supply closet"
desc = "It's a storage unit for things that have no right being here."
icon_state = "syndicate1"
- open_door_sprite = "syndicate1_door"
anchored = FALSE
-/obj/structure/closet/gimmick/russian
- name = "russian surplus closet"
- desc = "It's a storage unit for Russian standard-issue surplus."
+/obj/structure/closet/gimmick/soviet
+ name = "soviet surplus closet"
+ desc = "A storage unit for surplus USSP equipment."
icon_state = "syndicate1"
- open_door_sprite = "syndicate1_door"
-/obj/structure/closet/gimmick/russian/populate_contents()
+/obj/structure/closet/gimmick/soviet/populate_contents()
new /obj/item/clothing/head/sovietsidecap(src)
new /obj/item/clothing/head/sovietsidecap(src)
new /obj/item/clothing/head/sovietsidecap(src)
@@ -60,8 +57,6 @@
/obj/structure/closet/gimmick/tacticool
name = "tacticool gear closet"
desc = "It's a storage unit for Tacticool gear."
- icon_state = "syndicate1"
- open_door_sprite = "syndicate1_door"
/obj/structure/closet/gimmick/tacticool/populate_contents()
new /obj/item/clothing/glasses/eyepatch(src)
@@ -84,7 +79,8 @@
name = "\improper Thunderdome closet"
desc = "Everything you need!"
icon_state = "syndicate"
- open_door_sprite = "syndicate_door"
+ opened_door_sprite = "syndicate"
+ closed_door_sprite = "syndicate"
anchored = TRUE
/obj/structure/closet/thunderdome/tdred
@@ -113,7 +109,8 @@
/obj/structure/closet/thunderdome/tdgreen
name = "green-team Thunderdome closet"
icon_state = "syndicate1"
- open_door_sprite = "syndicate1_door"
+ opened_door_sprite = "syndicate1"
+ closed_door_sprite = "syndicate1"
/obj/structure/closet/thunderdome/tdgreen/populate_contents()
new /obj/item/clothing/suit/armor/tdome/green(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index fedd1979d410..c46170d51ad3 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -12,9 +12,8 @@
/obj/structure/closet/gmcloset
name = "formal closet"
desc = "It's a storage unit for formal clothing."
- icon_state = "black"
- icon_opened = "generic_open"
- open_door_sprite = "generic_door"
+ icon_state = "generic"
+ closed_door_sprite = "black"
/obj/structure/closet/gmcloset/populate_contents()
new /obj/item/clothing/head/that(src)
@@ -40,9 +39,9 @@
/obj/structure/closet/chefcloset
name = "chef's closet"
desc = "It's a storage unit for foodservice garments."
- icon_state = "black"
- icon_opened = "generic_open"
- open_door_sprite = "generic_door"
+ icon_state = "generic"
+ closed_door_sprite = "black"
+
/obj/structure/closet/chefcloset/populate_contents()
new /obj/item/clothing/under/misc/waiter(src)
@@ -68,9 +67,9 @@
/obj/structure/closet/jcloset
name = "custodial closet"
desc = "It's a storage unit for janitorial clothes and gear."
- icon_state = "mixed"
- icon_opened = "generic_open"
- open_door_sprite = "generic_door"
+ icon_state = "generic"
+ closed_door_sprite = "mixed"
+
/obj/structure/closet/jcloset/populate_contents()
new /obj/item/flashlight(src)
@@ -104,9 +103,9 @@
/obj/structure/closet/paramedic
name = "paramedic wardrobe"
desc = "It's a storage unit for paramedic equipment."
- icon_state = "blue"
- icon_opened = "generic_open"
- open_door_sprite = "generic_door"
+ icon_state = "generic"
+ closed_door_sprite = "blue"
+
/obj/structure/closet/paramedic/populate_contents()
diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
index fe93f4700a56..adc99a596fed 100644
--- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
@@ -2,7 +2,6 @@
name = "level-3 biohazard suit closet"
desc = "It's a storage unit for level-3 biohazard gear."
icon_state = "bio"
- open_door_sprite = "bio_door"
/obj/structure/closet/l3closet/populate_contents()
new /obj/item/storage/bag/bio( src )
@@ -17,7 +16,6 @@
/obj/structure/closet/l3closet/virology
icon_state = "bio_viro"
- open_door_sprite = "bio_viro_door"
/obj/structure/closet/l3closet/virology/populate_contents()
new /obj/item/storage/bag/bio( src )
@@ -28,7 +26,6 @@
/obj/structure/closet/l3closet/security
icon_state = "bio_sec"
- open_door_sprite = "bio_sec_door"
/obj/structure/closet/l3closet/security/populate_contents()
new /obj/item/clothing/suit/bio_suit/security( src )
@@ -36,15 +33,12 @@
/obj/structure/closet/l3closet/janitor
icon_state = "bio_jan"
- open_door_sprite = "bio_jan_door"
/obj/structure/closet/l3closet/janitor/populate_contents()
new /obj/item/clothing/suit/bio_suit/janitor( src )
new /obj/item/clothing/head/bio_hood/janitor( src )
/obj/structure/closet/l3closet/scientist
- icon_state = "bio"
- open_door_sprite = "bio_door"
/obj/structure/closet/l3closet/scientist/populate_contents()
new /obj/item/storage/bag/bio( src )
diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm
index fb834c86d951..5665c22e2349 100644
--- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm
+++ b/code/game/objects/structures/crates_lockers/closets/malfunction.dm
@@ -2,7 +2,6 @@
/obj/structure/closet/malf/suits
desc = "It's a storage unit for operational gear."
icon_state = "syndicate"
- open_door_sprite = "syndicate_door"
/obj/structure/closet/malf/suits/populate_contents()
new /obj/item/tank/jetpack/void(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
index 0cf7d24743a1..cb7b14245c3b 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
@@ -2,7 +2,7 @@
name = "Booze cabinet"
req_access = list(ACCESS_BAR)
icon_state = "cabinet"
- open_door_sprite = "cabinet_door"
+ door_anim_time = 0
resistance_flags = FLAMMABLE
max_integrity = 70
open_sound = 'sound/machines/wooden_closet_open.ogg'
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
index 4c7538a47569..b7d77603e542 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
@@ -2,7 +2,6 @@
name = "cargo technician's locker"
req_access = list(ACCESS_CARGO)
icon_state = "cargo"
- open_door_sprite = "mining_door"
/obj/structure/closet/secure_closet/cargotech/populate_contents()
new /obj/item/clothing/under/rank/cargo/tech(src)
@@ -17,11 +16,13 @@
name = "explorer's locker"
req_access = list(ACCESS_EXPEDITION)
icon_state = "explorer"
- open_door_sprite = "mining_door"
+ opened_door_sprite = "cargo"
+
/obj/structure/closet/secure_closet/explorer/populate_contents()
new /obj/item/radio/headset/headset_cargo/expedition(src)
new /obj/item/gun/energy/kinetic_accelerator/pistol(src)
+ new /obj/item/clothing/suit/hooded/explorer(src)
new /obj/item/storage/firstaid/regular(src)
new /obj/item/clothing/accessory/holster(src)
new /obj/item/beacon(src)
@@ -35,7 +36,7 @@
name = "quartermaster's locker"
req_access = list(ACCESS_QM)
icon_state = "qm"
- open_door_sprite = "mining_door"
+ opened_door_sprite = "cargo"
/obj/structure/closet/secure_closet/quartermaster/populate_contents()
new /obj/item/radio/headset/heads/qm(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
index ba3921954fcf..396429ac01a8 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
@@ -3,7 +3,9 @@
desc = "A lockable storage unit for Nanotrasen-approved religious attire."
req_access = list(ACCESS_CHAPEL_OFFICE)
icon_state = "chaplain"
- open_door_sprite = "chaplain_door"
+ opened_door_sprite = "chaplain"
+ closed_door_sprite = "chaplain"
+
/obj/structure/closet/secure_closet/chaplain/populate_contents()
new /obj/item/storage/bag/garment/chaplain(src)
@@ -12,3 +14,4 @@
new /obj/item/storage/fancy/candle_box/eternal(src)
new /obj/item/storage/fancy/candle_box/eternal(src)
new /obj/item/storage/fancy/candle_box/eternal(src)
+ new /obj/item/thurible(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm
index cd5bc0a40ccb..da1de586b792 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm
@@ -2,7 +2,7 @@
name = "chief engineer's locker"
req_access = list(ACCESS_CE)
icon_state = "ce"
- open_door_sprite = "white_secure_door"
+ opened_door_sprite = "white_secure"
/obj/structure/closet/secure_closet/engineering_chief/populate_contents()
if(prob(50))
@@ -36,9 +36,8 @@
/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies locker"
req_access = list(ACCESS_ENGINE_EQUIP)
- icon_state = "eng_elec"
- open_door_sprite = "eng_door"
- icon_opened = "eng_open"
+ icon_state = "eng"
+ closed_door_sprite = "eng_elec"
/obj/structure/closet/secure_closet/engineering_electrical/populate_contents()
new /obj/item/clothing/gloves/color/yellow(src)
@@ -58,9 +57,8 @@
/obj/structure/closet/secure_closet/engineering_welding
name = "welding supplies locker"
req_access = list(ACCESS_ENGINE_EQUIP)
- icon_state = "eng_weld"
- open_door_sprite = "eng_door"
- icon_opened = "eng_open"
+ icon_state = "eng"
+ closed_door_sprite = "eng_weld"
/obj/structure/closet/secure_closet/engineering_welding/populate_contents()
new /obj/item/clothing/head/welding(src)
@@ -74,8 +72,8 @@
/obj/structure/closet/secure_closet/engineering_personal
name = "engineer's locker"
req_access = list(ACCESS_ENGINE_EQUIP)
- icon_state = "eng_secure"
- open_door_sprite = "eng_secure_door"
+ icon_state = "eng"
+ closed_door_sprite = "eng_secure"
/obj/structure/closet/secure_closet/engineering_personal/populate_contents()
if(prob(50))
@@ -100,7 +98,7 @@
name = "technician's locker"
req_access = list(ACCESS_ATMOSPHERICS)
icon_state = "atmos"
- open_door_sprite = "eng_secure_door"
+ opened_door_sprite = "eng_secure"
/obj/structure/closet/secure_closet/atmos_personal/populate_contents()
new /obj/item/radio/headset/headset_eng(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index 8eead41d2096..b057e49c04d0 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -1,5 +1,8 @@
/obj/structure/closet/secure_closet/freezer
desc = "It's a card-locked refrigerative storage unit. This one is lead-lined."
+ door_anim_squish = 0.22
+ door_anim_angle = 123
+ door_anim_time = 2.50
/obj/structure/closet/secure_closet/freezer/ex_act(severity)
// IF INDIANA JONES CAN DO IT SO CAN YOU
@@ -40,7 +43,6 @@
/obj/structure/closet/secure_closet/freezer/meat
name = "meat fridge"
icon_state = "freezer"
- open_door_sprite = "freezer_door"
/obj/structure/closet/secure_closet/freezer/meat/populate_contents()
for(var/i in 1 to 4)
@@ -53,7 +55,6 @@
/obj/structure/closet/secure_closet/freezer/fridge
name = "refrigerator"
icon_state = "freezer"
- open_door_sprite = "freezer_door"
/obj/structure/closet/secure_closet/freezer/fridge/populate_contents()
for(var/i in 1 to 5)
@@ -69,7 +70,6 @@
/obj/structure/closet/secure_closet/freezer/money
name = "freezer"
icon_state = "freezer"
- open_door_sprite = "freezer_door"
req_access = list(ACCESS_HEADS_VAULT)
/obj/structure/closet/secure_closet/freezer/money/populate_contents()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
index 5ceea3aadf7d..6d9594370699 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
@@ -2,6 +2,7 @@
name = "gun cabinet"
req_access = list(ACCESS_ARMORY)
icon = 'icons/obj/guncabinet.dmi'
+ door_anim_time = 0
icon_state = "base"
anchored = TRUE
@@ -45,12 +46,9 @@
gun.pixel_x = i*4
. += gun
-
- . += "door"
if(broken)
. += "off"
- else if(locked)
- . += "locked"
+ . += ..() // Parent call at the end instead of the beginning because we need the gun overlays to be drawn first, then the door.
/obj/structure/closet/secure_closet/guncabinet/cc
req_access = list(ACCESS_CENT_SPECOPS_COMMANDER)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics_closets.dm
index 7e23e79e0d5a..bd885e2eaefe 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics_closets.dm
@@ -2,7 +2,6 @@
name = "botanist's locker"
req_access = list(ACCESS_HYDROPONICS)
icon_state = "hydro"
- open_door_sprite = "hydro_door"
/obj/structure/closet/secure_closet/hydroponics/populate_contents()
switch(rand(1,2))
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm
index dddf8e330afb..4deaab7a3af1 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm
@@ -2,8 +2,6 @@
name = "medicine closet"
desc = "Filled with medical junk."
icon_state = "med"
- open_door_sprite = "med_door"
- icon_opened = "med_open"
req_access = list(ACCESS_MEDICAL)
/obj/structure/closet/secure_closet/medical1/populate_contents()
@@ -25,8 +23,6 @@
name = "anesthetic locker"
desc = "Used to knock people out."
icon_state = "med"
- open_door_sprite = "med_door"
- icon_opened = "med_open"
req_access = list(ACCESS_SURGERY)
/obj/structure/closet/secure_closet/medical2/populate_contents()
@@ -42,7 +38,7 @@
name = "medical doctor's locker"
req_access = list(ACCESS_MEDICAL)
icon_state = "med_secure"
- open_door_sprite = "white_secure_door"
+ opened_door_sprite = "white_secure"
/obj/structure/closet/secure_closet/medical3/populate_contents()
if(prob(50))
@@ -68,8 +64,6 @@
name = "exam room closet"
desc = "Filled with exam room materials."
icon_state = "med"
- open_door_sprite = "med_door"
- icon_opened = "med_open"
req_access = list(ACCESS_MEDICAL)
/obj/structure/closet/secure_closet/exam/populate_contents()
@@ -121,7 +115,7 @@
name = "psychiatrist's locker"
req_access = list(ACCESS_PSYCHIATRIST)
icon_state = "med_secure"
- open_door_sprite = "white_secure_door"
+ opened_door_sprite = "white_secure"
/obj/structure/closet/secure_closet/psychiatrist/populate_contents()
new /obj/item/storage/bag/garment/psychologist(src)
@@ -142,7 +136,6 @@
name = "chief medical officer's locker"
req_access = list(ACCESS_CMO)
icon_state = "cmo"
- open_door_sprite = "cmo_door"
/obj/structure/closet/secure_closet/CMO/populate_contents()
if(prob(50))
@@ -183,9 +176,7 @@
/obj/structure/closet/secure_closet/chemical
name = "chemical closet"
desc = "Store dangerous chemicals in here."
- icon_state = "chemical"
- open_door_sprite = "med_door"
- icon_opened = "med_open"
+ icon_state = "med"
req_access = list(ACCESS_CHEMISTRY)
/obj/structure/closet/secure_closet/chemical/populate_contents()
@@ -198,8 +189,6 @@
name = "paramedic EVA gear"
desc = "A locker with a Rescue MODsuit."
icon_state = "med"
- open_door_sprite = "med_door"
- icon_opened = "med_open"
req_access = list(ACCESS_PARAMEDIC)
/obj/structure/closet/secure_closet/paramedic/populate_contents()
@@ -220,9 +209,8 @@
/obj/structure/closet/secure_closet/reagents
name = "chemical storage closet"
desc = "Store dangerous chemicals in here."
- icon_state = "chemical"
- open_door_sprite = "med_door"
- icon_opened = "med_open"
+ icon_state = "med"
+ closed_door_sprite = "chemical"
req_access = list(ACCESS_CHEMISTRY)
/obj/structure/closet/secure_closet/reagents/populate_contents()
@@ -236,9 +224,8 @@
/obj/structure/closet/secure_closet/genetics
name = "genetics test subject locker"
desc = "Storage for lesser form cubes."
- icon_state = "genetics"
- open_door_sprite = "med_door"
- icon_opened = "med_open"
+ icon_state = "med"
+ closed_door_sprite = "genetics"
req_access = list(ACCESS_GENETICS)
/obj/structure/closet/secure_closet/genetics/populate_contents()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
index abcc17d19198..d5c3db2497d2 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
@@ -2,7 +2,6 @@
name = "clown's locker"
req_access = list(ACCESS_CLOWN)
icon_state = "clown"
- open_door_sprite = "clown_door"
/obj/structure/closet/secure_closet/clown/populate_contents()
new /obj/item/storage/backpack/clown(src)
@@ -28,7 +27,6 @@
name = "mime's locker"
req_access = list(ACCESS_MIME)
icon_state = "mime"
- open_door_sprite = "mime_door"
// It's silent!
open_sound = null
close_sound = null
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 7cf47a65ec15..d63ed5eba740 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -23,7 +23,7 @@
/obj/structure/closet/secure_closet/personal/cabinet
icon_state = "cabinet"
- open_door_sprite = "cabinet_door"
+ door_anim_time = 0
resistance_flags = FLAMMABLE
max_integrity = 70
open_sound = 'sound/machines/wooden_closet_open.ogg'
@@ -39,10 +39,6 @@
if(opened || !istype(W, /obj/item/card/id))
return ..()
- if(broken)
- to_chat(user, "It appears to be broken.")
- return
-
if(istype(W, /obj/item/card/id/guest))
to_chat(user, "Invalid identification card.")
return
@@ -51,24 +47,16 @@
if(!I || !I.registered_name)
return
- if(src == user.loc)
- to_chat(user, "You can't reach the lock from inside.")
-
else if(allowed(user) || !registered_name || (istype(I) && (registered_name == I.registered_name)))
- cut_overlays()
-
//they can open all lockers, or nobody owns this, or they own this locker
- locked = !locked
- if(locked)
- add_overlay("locked")
- else
- add_overlay("unlocked")
- icon_state = icon_closed
+ togglelock(user)
+ if(!locked)
registered_name = null
desc = initial(desc)
if(!registered_name && locked)
registered_name = I.registered_name
- desc = "Owned by [I.registered_name]."
+ desc = "Owned by [I.registered_name]."
+
else
to_chat(user, "Access denied.")
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index 85cf3434504a..08b9bfc951a0 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -2,7 +2,7 @@
name = "scientist's locker"
req_access = list(ACCESS_TOX_STORAGE)
icon_state = "science"
- open_door_sprite = "white_secure_door"
+ opened_door_sprite = "white_secure"
/obj/structure/closet/secure_closet/scientist/populate_contents()
new /obj/item/storage/backpack/science(src)
@@ -22,7 +22,6 @@
name = "roboticist's locker"
req_access = list(ACCESS_ROBOTICS)
icon_state = "robotics"
- open_door_sprite = "robotics_door"
/obj/structure/closet/secure_closet/roboticist/populate_contents()
new /obj/item/mod/core/standard(src)
@@ -43,7 +42,7 @@
name = "research director's locker"
req_access = list(ACCESS_RD)
icon_state = "rd"
- open_door_sprite = "rd_door"
+
/obj/structure/closet/secure_closet/RD/populate_contents()
new /obj/item/storage/bag/garment/research_director(src)
@@ -65,9 +64,8 @@
/obj/structure/closet/secure_closet/research_reagents
name = "research chemical storage closet"
desc = "Store dangerous chemicals in here."
- icon_state = "rchemical"
- open_door_sprite = "med_door"
- icon_opened = "med_open"
+ icon_state = "med"
+ closed_door_sprite = "rchemical"
req_access = list(ACCESS_TOX_STORAGE)
/obj/structure/closet/secure_closet/research_reagents/populate_contents()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index 88103ce801b1..31c8b8e53641 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -3,9 +3,9 @@
desc = "It's an immobile card-locked storage unit."
icon = 'icons/obj/closet.dmi'
icon_state = "secure"
- open_door_sprite = "secure_door"
opened = FALSE
locked = TRUE
+ secure = TRUE
can_be_emaged = TRUE
max_integrity = 250
armor = list(MELEE = 30, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 0, RAD = 0, FIRE = 80, ACID = 80)
@@ -18,14 +18,6 @@
return FALSE
return ..()
-/obj/structure/closet/secure_closet/close()
- if(..())
- if(broken)
- update_icon()
- return TRUE
- else
- return FALSE
-
/obj/structure/closet/secure_closet/emp_act(severity)
for(var/obj/O in src)
O.emp_act(severity)
@@ -71,9 +63,9 @@
if(!broken)
broken = TRUE
locked = FALSE
- add_overlay("sparking")
+ flick_overlay_view(image(icon, src, "sparking"), src, 1 SECONDS)
to_chat(user, "You break the lock on [src].")
- addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS) // Update the icon so the lock actually appears broken
return TRUE
/obj/structure/closet/secure_closet/attack_hand(mob/user)
@@ -83,20 +75,6 @@
else
toggle(user)
-/obj/structure/closet/secure_closet/update_overlays() //Putting the welded stuff in update_overlays() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
- cut_overlays()
- if(opened)
- add_overlay(open_door_sprite)
- return
- if(welded)
- add_overlay("welded")
- if(broken)
- return
- if(locked)
- add_overlay("locked")
- else
- add_overlay("unlocked")
-
/obj/structure/closet/secure_closet/container_resist(mob/living/L)
var/breakout_time = 2 MINUTES
if(opened)
@@ -113,7 +91,7 @@
spawn(0)
- if(do_after(usr, breakout_time, target = src, allow_moving = TRUE, allow_moving_target = TRUE))
+ if(do_after(usr, breakout_time, target = src, allow_moving = TRUE, allow_moving_target = TRUE))
if(!src || !L || L.stat != CONSCIOUS || L.loc != src || opened) //closet/user destroyed OR user dead/unconcious OR user no longer in closet OR closet opened
return
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
index 6d96d6e054e3..4b077715daf6 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
@@ -2,7 +2,6 @@
name = "captain's locker"
req_access = list(ACCESS_CAPTAIN)
icon_state = "cap"
- open_door_sprite = "cap_door"
/obj/structure/closet/secure_closet/captains/populate_contents()
if(prob(50))
@@ -25,7 +24,6 @@
name = "head of personnel's locker"
req_access = list(ACCESS_HOP)
icon_state = "hop"
- open_door_sprite = "hop_door"
/obj/structure/closet/secure_closet/hop/populate_contents()
new /obj/item/cartridge/hop(src)
@@ -43,7 +41,6 @@
name = "head of security's locker"
req_access = list(ACCESS_HOS)
icon_state = "hos"
- open_door_sprite = "hos_door"
/obj/structure/closet/secure_closet/hos/populate_contents()
if(prob(50))
@@ -72,7 +69,7 @@
name = "warden's locker"
req_access = list(ACCESS_ARMORY)
icon_state = "warden"
- open_door_sprite = "sec_door"
+ opened_door_sprite = "sec"
/obj/structure/closet/secure_closet/warden/populate_contents()
if(prob(50))
@@ -94,7 +91,6 @@
name = "security officer's locker"
req_access = list(ACCESS_SECURITY)
icon_state = "sec"
- open_door_sprite = "sec_door"
/obj/structure/closet/secure_closet/security/populate_contents()
if(prob(50))
@@ -123,9 +119,8 @@
/obj/structure/closet/secure_closet/blueshield
name = "blueshield's locker"
req_access = list(ACCESS_BLUESHIELD)
- icon_state = "bs"
- open_door_sprite = "hop_door"
- icon_opened = "hop_open"
+ icon_state = "hop"
+ closed_door_sprite = "bs"
/obj/structure/closet/secure_closet/blueshield/populate_contents()
new /obj/item/storage/backpack/blueshield(src)
@@ -145,9 +140,8 @@
/obj/structure/closet/secure_closet/ntrep
name = "\improper Nanotrasen Representative's locker"
req_access = list(ACCESS_NTREP)
- icon_state = "ntr"
- open_door_sprite = "hop_door"
- icon_opened = "hop_open"
+ icon_state = "hop"
+ closed_door_sprite = "ntr"
/obj/structure/closet/secure_closet/ntrep/populate_contents()
new /obj/item/book/manual/wiki/faxes(src)
@@ -188,7 +182,7 @@
name = "detective's cabinet"
req_access = list(ACCESS_FORENSICS_LOCKERS)
icon_state = "cabinet"
- open_door_sprite = "cabinet_door"
+ door_anim_time = 0
resistance_flags = FLAMMABLE
max_integrity = 70
open_sound = 'sound/machines/wooden_closet_open.ogg'
@@ -225,6 +219,7 @@
/obj/structure/closet/secure_closet/brig/populate_contents()
new /obj/item/clothing/under/color/orange/prison(src)
+ new /obj/item/clothing/under/color/jumpskirt/orange/prison(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/card/id/prisoner/random(src)
new /obj/item/radio/headset(src)
@@ -305,7 +300,7 @@
name = "\improper Magistrate's locker"
req_access = list(ACCESS_MAGISTRATE)
icon_state = "magi"
- open_door_sprite = "chaplain_door"
+ opened_door_sprite = "chaplain"
/obj/structure/closet/secure_closet/magistrate/populate_contents()
new /obj/item/book/manual/wiki/faxes(src)
@@ -322,9 +317,9 @@
/obj/structure/closet/secure_closet/iaa
name = "internal affairs locker"
req_access = list(ACCESS_INTERNAL_AFFAIRS)
- icon_opened = "magi_open"
- icon_state = "iaa"
- open_door_sprite = "chaplain_door"
+ icon_state = "magi"
+ opened_door_sprite = "chaplain"
+ closed_door_sprite = "iaa"
/obj/structure/closet/secure_closet/iaa/populate_contents()
new /obj/item/book/manual/wiki/faxes(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate_lockers.dm b/code/game/objects/structures/crates_lockers/closets/syndicate_lockers.dm
index 83aa4880511f..c542218bbc37 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate_lockers.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate_lockers.dm
@@ -2,7 +2,8 @@
name = "armoury closet"
desc = "Why is this here?"
icon_state = "syndicate"
- open_door_sprite = "syndicate_door"
+ opened_door_sprite = "syndicate"
+ closed_door_sprite = "syndicate"
/obj/structure/closet/syndicate/personal
desc = "It's a storage unit for operative gear."
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index 500b4adb1011..ca2feacb1a3e 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -16,7 +16,6 @@
name = "emergency closet"
desc = "It's a storage unit for emergency breathmasks and o2 tanks."
icon_state = "emergency"
- open_door_sprite = "emergency_door"
/obj/structure/closet/emcloset/anchored
anchored = TRUE
@@ -60,7 +59,6 @@
name = "fire-safety closet"
desc = "It's a storage unit for fire-fighting supplies."
icon_state = "fire"
- open_door_sprite = "fire_door"
/obj/structure/closet/firecloset/populate_contents()
new /obj/item/extinguisher(src)
@@ -84,9 +82,8 @@
/obj/structure/closet/toolcloset
name = "tool closet"
desc = "It's a storage unit for tools."
- icon_state = "eng_tool"
- open_door_sprite = "eng_door"
- icon_opened = "eng_open"
+ icon_state = "eng"
+ closed_door_sprite = "eng_tool"
/obj/structure/closet/toolcloset/populate_contents()
if(prob(40))
@@ -127,9 +124,8 @@
/obj/structure/closet/radiation
name = "radiation suit closet"
desc = "It's a storage unit for rad-protective suits."
- icon_state = "eng_rad"
- open_door_sprite = "eng_door"
- icon_opened = "eng_open"
+ icon_state = "eng"
+ closed_door_sprite = "eng_rad"
/obj/structure/closet/radiation/populate_contents()
new /obj/item/geiger_counter(src)
@@ -143,7 +139,6 @@
name = "\improper EOD closet"
desc = "It's a storage unit for explosion-protective suits."
icon_state = "bomb"
- open_door_sprite = "bomb_door"
/obj/structure/closet/bombcloset/populate_contents()
new /obj/item/clothing/suit/bomb_suit( src )
@@ -156,7 +151,6 @@
name = "\improper EOD closet"
desc = "It's a storage unit for explosion-protective suits."
icon_state = "bomb"
- open_door_sprite = "bomb_door"
/obj/structure/closet/bombclosetsecurity/populate_contents()
new /obj/item/clothing/suit/bomb_suit/security( src )
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 5a886277cb63..cab056f24be0 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -1,9 +1,9 @@
/obj/structure/closet/wardrobe
name = "wardrobe"
desc = "It's a storage unit for standard-issue Nanotrasen attire."
- icon_opened = "generic_open"
- open_door_sprite = "generic_door"
- icon_state = "blue"
+ icon_state = "generic"
+ closed_door_sprite = "blue"
+
/obj/structure/closet/wardrobe/generic
// Identical to the base wardrobe, aside from containing some stuff.
@@ -12,6 +12,9 @@
new /obj/item/clothing/under/color/blue(src)
new /obj/item/clothing/under/color/blue(src)
new /obj/item/clothing/under/color/blue(src)
+ new /obj/item/clothing/under/color/jumpskirt/blue(src)
+ new /obj/item/clothing/under/color/jumpskirt/blue(src)
+ new /obj/item/clothing/under/color/jumpskirt/blue(src)
new /obj/item/clothing/mask/bandana/blue(src)
new /obj/item/clothing/mask/bandana/blue(src)
new /obj/item/clothing/mask/bandana/blue(src)
@@ -22,7 +25,8 @@
/obj/structure/closet/wardrobe/red
name = "security wardrobe"
- icon_state = "red"
+ closed_door_sprite = "red"
+
/obj/structure/closet/wardrobe/populate_contents()
new /obj/item/storage/backpack/duffel/security(src)
@@ -57,7 +61,7 @@
/obj/structure/closet/redcorp
name = "corporate security wardrobe"
- icon_state = "red"
+ closed_door_sprite = "red"
/obj/structure/closet/redcorp/populate_contents()
new /obj/item/clothing/under/rank/security/officer/corporate(src)
@@ -69,24 +73,30 @@
/obj/structure/closet/wardrobe/pink
name = "pink wardrobe"
- icon_state = "pink"
+ closed_door_sprite = "pink"
/obj/structure/closet/wardrobe/pink/populate_contents()
new /obj/item/clothing/under/color/pink(src)
new /obj/item/clothing/under/color/pink(src)
new /obj/item/clothing/under/color/pink(src)
+ new /obj/item/clothing/under/color/jumpskirt/pink(src)
+ new /obj/item/clothing/under/color/jumpskirt/pink(src)
+ new /obj/item/clothing/under/color/jumpskirt/pink(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/brown(src)
/obj/structure/closet/wardrobe/black
name = "black wardrobe"
- icon_state = "black"
+ closed_door_sprite = "black"
/obj/structure/closet/wardrobe/black/populate_contents()
new /obj/item/clothing/under/color/black(src)
new /obj/item/clothing/under/color/black(src)
new /obj/item/clothing/under/color/black(src)
+ new /obj/item/clothing/under/color/jumpskirt/black(src)
+ new /obj/item/clothing/under/color/jumpskirt/black(src)
+ new /obj/item/clothing/under/color/jumpskirt/black(src)
if(prob(25))
new /obj/item/clothing/suit/jacket/leather(src)
new /obj/item/clothing/shoes/black(src)
@@ -101,19 +111,22 @@
/obj/structure/closet/wardrobe/green
name = "green wardrobe"
- icon_state = "green"
+ closed_door_sprite = "green"
/obj/structure/closet/wardrobe/green/populate_contents()
new /obj/item/clothing/under/color/green(src)
new /obj/item/clothing/under/color/green(src)
new /obj/item/clothing/under/color/green(src)
+ new /obj/item/clothing/under/color/jumpskirt/green(src)
+ new /obj/item/clothing/under/color/jumpskirt/green(src)
+ new /obj/item/clothing/under/color/jumpskirt/green(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
/obj/structure/closet/wardrobe/xenos
name = "xenos wardrobe"
- icon_state = "green"
+ closed_door_sprite = "green"
/obj/structure/closet/wardrobe/xenos/populate_contents()
new /obj/item/clothing/suit/unathi/mantle(src)
@@ -130,12 +143,15 @@
/obj/structure/closet/wardrobe/orange
name = "orange wardrobe"
- icon_state = "orange"
+ closed_door_sprite = "orange"
/obj/structure/closet/wardrobe/orange/populate_contents()
new /obj/item/clothing/under/color/orange(src)
new /obj/item/clothing/under/color/orange(src)
new /obj/item/clothing/under/color/orange(src)
+ new /obj/item/clothing/under/color/jumpskirt/orange(src)
+ new /obj/item/clothing/under/color/jumpskirt/orange(src)
+ new /obj/item/clothing/under/color/jumpskirt/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
@@ -148,18 +164,24 @@
new /obj/item/clothing/under/color/orange/prison(src)
new /obj/item/clothing/under/color/orange/prison(src)
new /obj/item/clothing/under/color/orange/prison(src)
+ new /obj/item/clothing/under/color/jumpskirt/orange/prison(src)
+ new /obj/item/clothing/under/color/jumpskirt/orange/prison(src)
+ new /obj/item/clothing/under/color/jumpskirt/orange/prison(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
/obj/structure/closet/wardrobe/yellow
name = "yellow wardrobe"
- icon_state = "yellow"
+ closed_door_sprite = "yellow"
/obj/structure/closet/wardrobe/yellow/populate_contents()
new /obj/item/clothing/under/color/yellow(src)
new /obj/item/clothing/under/color/yellow(src)
new /obj/item/clothing/under/color/yellow(src)
+ new /obj/item/clothing/under/color/jumpskirt/yellow(src)
+ new /obj/item/clothing/under/color/jumpskirt/yellow(src)
+ new /obj/item/clothing/under/color/jumpskirt/yellow(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
@@ -167,7 +189,7 @@
/obj/structure/closet/wardrobe/atmospherics_yellow
name = "atmospherics wardrobe"
- icon_state = "atmos_wardrobe"
+ closed_door_sprite = "atmos_wardrobe"
/obj/structure/closet/wardrobe/atmospherics_yellow/populate_contents()
new /obj/item/clothing/under/rank/engineering/atmospheric_technician(src)
@@ -190,7 +212,7 @@
/obj/structure/closet/wardrobe/engineering_yellow
name = "engineering wardrobe"
- icon_state = "yellow"
+ closed_door_sprite = "yellow"
/obj/structure/closet/wardrobe/engineering_yellow/populate_contents()
new /obj/item/clothing/under/rank/engineering/engineer(src)
@@ -212,19 +234,22 @@
/obj/structure/closet/wardrobe/white
name = "white wardrobe"
- icon_state = "white"
+ closed_door_sprite = "white"
/obj/structure/closet/wardrobe/white/populate_contents()
new /obj/item/clothing/under/color/white(src)
new /obj/item/clothing/under/color/white(src)
new /obj/item/clothing/under/color/white(src)
+ new /obj/item/clothing/under/color/jumpskirt/white(src)
+ new /obj/item/clothing/under/color/jumpskirt/white(src)
+ new /obj/item/clothing/under/color/jumpskirt/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
/obj/structure/closet/wardrobe/medical_white
name = "medical doctor's wardrobe"
- icon_state = "white"
+ closed_door_sprite = "white"
/obj/structure/closet/wardrobe/medical_white/populate_contents()
new /obj/item/clothing/under/rank/medical/nursesuit (src)
@@ -252,7 +277,7 @@
/obj/structure/closet/wardrobe/pjs
name = "Pajama wardrobe"
- icon_state = "white"
+ closed_door_sprite = "white"
/obj/structure/closet/wardrobe/pjs/populate_contents()
new /obj/item/clothing/under/misc/pj/red(src)
@@ -267,7 +292,7 @@
/obj/structure/closet/wardrobe/toxins_white
name = "toxins wardrobe"
- icon_state = "white"
+ closed_door_sprite = "white"
/obj/structure/closet/wardrobe/toxins_white/populate_contents()
new /obj/item/clothing/under/rank/rnd/scientist(src)
@@ -289,7 +314,7 @@
/obj/structure/closet/wardrobe/robotics_black
name = "robotics wardrobe"
- icon_state = "black"
+ closed_door_sprite = "black"
/obj/structure/closet/wardrobe/robotics_black/populate_contents()
new /obj/item/clothing/under/rank/rnd/roboticist(src)
@@ -306,7 +331,7 @@
/obj/structure/closet/wardrobe/chemistry_white
name = "chemistry wardrobe"
- icon_state = "white"
+ closed_door_sprite = "white"
/obj/structure/closet/wardrobe/chemistry_white/populate_contents()
new /obj/item/clothing/under/rank/medical/chemist(src)
@@ -329,7 +354,7 @@
/obj/structure/closet/wardrobe/genetics_white
name = "genetics wardrobe"
- icon_state = "white"
+ closed_door_sprite = "white"
/obj/structure/closet/wardrobe/genetics_white/populate_contents()
new /obj/item/clothing/under/rank/rnd/geneticist(src)
@@ -346,7 +371,7 @@
/obj/structure/closet/wardrobe/virology_white
name = "virology wardrobe"
- icon_state = "white"
+ closed_door_sprite = "white"
/obj/structure/closet/wardrobe/virology_white/populate_contents()
new /obj/item/clothing/under/rank/medical/virologist(src)
@@ -367,7 +392,7 @@
/obj/structure/closet/wardrobe/medic_white
name = "medical wardrobe"
- icon_state = "white"
+ closed_door_sprite = "white"
/obj/structure/closet/wardrobe/medic_white/populate_contents()
new /obj/item/clothing/under/rank/medical/doctor(src)
@@ -393,12 +418,15 @@
/obj/structure/closet/wardrobe/grey
name = "grey wardrobe"
- icon_state = "grey"
+ closed_door_sprite = "grey"
/obj/structure/closet/wardrobe/grey/populate_contents()
new /obj/item/clothing/under/color/grey(src)
new /obj/item/clothing/under/color/grey(src)
new /obj/item/clothing/under/color/grey(src)
+ new /obj/item/clothing/under/color/jumpskirt/grey(src)
+ new /obj/item/clothing/under/color/jumpskirt/grey(src)
+ new /obj/item/clothing/under/color/jumpskirt/grey(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
@@ -415,7 +443,7 @@
/obj/structure/closet/wardrobe/mixed
name = "mixed wardrobe"
- icon_state = "mixed"
+ closed_door_sprite = "mixed"
/obj/structure/closet/wardrobe/mixed/populate_contents()
new /obj/item/clothing/under/color/blue(src)
@@ -423,9 +451,11 @@
new /obj/item/clothing/under/color/green(src)
new /obj/item/clothing/under/color/orange(src)
new /obj/item/clothing/under/color/pink(src)
- new /obj/item/clothing/under/dress/plaid_blue(src)
- new /obj/item/clothing/under/dress/plaid_red(src)
- new /obj/item/clothing/under/dress/plaid_purple(src)
+ new /obj/item/clothing/under/color/jumpskirt/blue(src)
+ new /obj/item/clothing/under/color/jumpskirt/yellow(src)
+ new /obj/item/clothing/under/color/jumpskirt/green(src)
+ new /obj/item/clothing/under/color/jumpskirt/orange(src)
+ new /obj/item/clothing/under/color/jumpskirt/pink(src)
new /obj/item/clothing/shoes/blue(src)
new /obj/item/clothing/shoes/yellow(src)
new /obj/item/clothing/shoes/green(src)
@@ -435,7 +465,7 @@
/obj/structure/closet/wardrobe/coroner
name = "coroner wardrobe"
- icon_state = "black"
+ closed_door_sprite = "black"
/obj/structure/closet/wardrobe/coroner/populate_contents()
if(prob(50))
diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm
index d11418b046e9..a9cde951b34f 100644
--- a/code/game/objects/structures/crates_lockers/crittercrate.dm
+++ b/code/game/objects/structures/crates_lockers/crittercrate.dm
@@ -2,9 +2,9 @@
name = "critter crate"
desc = "A crate designed for safe transport of animals. Only openable from the the outside."
icon_state = "critter"
- icon_opened = "critter_open"
- icon_closed = "critter"
- open_door_sprite = null
+ has_opened_overlay = FALSE
+ closed_door_sprite = "critter"
+ door_anim_time = 0
var/already_opened = FALSE
var/content_mob = null
var/amount = 1
diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm
index 51089a072aa3..3ae4503676e6 100644
--- a/code/game/objects/structures/crates_lockers/walllocker.dm
+++ b/code/game/objects/structures/crates_lockers/walllocker.dm
@@ -6,6 +6,8 @@
name = "wall locker"
icon = 'icons/obj/walllocker.dmi'
icon_state = "wall-locker"
+ door_anim_time = 0
+ enable_door_overlay = FALSE
density = FALSE
anchored = TRUE
icon_closed = "wall-locker"
@@ -19,6 +21,7 @@
name = "emergency locker"
desc = "A wall mounted locker with emergency supplies"
icon_state = "emerg"
+ door_anim_time = 0
icon_closed = "emerg"
icon_opened = "emerg_open"
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 11409c535f17..b708793ac85b 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -38,7 +38,7 @@
if(showpiece_entry["trophy_message"])
trophy_message = showpiece_entry["trophy_message"]
if(start_showpiece_type)
- showpiece = new start_showpiece_type (src)
+ showpiece = new start_showpiece_type(src)
update_icon(UPDATE_OVERLAYS)
/obj/structure/displaycase/Destroy()
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 6e3bcbd9171a..3511f2bb5e47 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -285,8 +285,7 @@
if(electronics)
target.electronics = source.electronics
source.electronics.forceMove(target)
- target.update_icon(UPDATE_OVERLAYS)
- target.update_name()
+ target.update_appearance(UPDATE_NAME|UPDATE_OVERLAYS)
qdel(source)
/obj/structure/door_assembly/deconstruct(disassembled = TRUE)
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 111c7931d9cc..7c7f95f3e8d9 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -167,6 +167,11 @@
new mineral(loc)
qdel(src)
+/obj/structure/falsewall/set_smoothed_icon_state(new_junction)
+ if(opening || !density)
+ return
+ return ..()
+
/*
* False R-Walls
*/
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index a34e31f6738f..e6921569f7b8 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -292,13 +292,20 @@
RegisterSignal(user, COMSIG_CARBON_REGENERATE_ICONS, PROC_REF(reapply_hide))
mob_overlay = mutable_appearance(icon, icon_state, user.layer, user.plane, 255, appearance_flags = RESET_COLOR | RESET_TRANSFORM | RESET_ALPHA | KEEP_APART)
user.add_overlay(mob_overlay)
- user.alpha = 0
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ H.set_alpha_tracking(0, src)
+ else
+ user.alpha = 0
/// User has either dropped the plant, or plant is being destroyed, restore user to normal.
/obj/item/kirbyplants/proc/unhide_user(mob/living/carbon/user)
UnregisterSignal(user, COMSIG_CARBON_REGENERATE_ICONS)
user.cut_overlay(mob_overlay)
user.alpha = initial(user.alpha)
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ H.set_alpha_tracking(ALPHA_VISIBLE, src)
QDEL_NULL(mob_overlay)
/// Icon operation has occured, time to make sure we're showing a plant again if we need to be.
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 1bd26e78f0f4..d1f47ae9ac88 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -26,14 +26,14 @@
if(GIRDER_REINF_STRUTS)
. += "The support struts are unscrewed and the inner grille is intact."
if(GIRDER_NORMAL)
- if(can_displace)
- . += "The bolts are lodged in place."
+ . += "The bolts are lodged in place."
if(GIRDER_DISPLACED)
. += "The bolts are loosened, but the screws are holding [src] together."
if(GIRDER_DISASSEMBLED)
. += "[src] is disassembled! You probably shouldn't be able to see this examine message."
. += "Various types of metal sheets can be used on this to create different kinds of walls."
- . += "Apply a crowbar to this item to cause any walls to be made to be false walls. Use a wrench on this item to deconstruct it."
+ if(can_displace)
+ . += "Apply a crowbar to this item to cause any walls to be made to be false walls. Use a wrench on this item to deconstruct it."
/obj/structure/girder/proc/refundMetal(metalAmount) //refunds metal used in construction when deconstructed
@@ -437,6 +437,7 @@
name = "displaced girder"
icon_state = "displaced"
anchored = FALSE
+ can_displace = FALSE
state = GIRDER_DISPLACED
girderpasschance = 25
max_integrity = 120
@@ -445,6 +446,7 @@
name = "reinforced girder"
icon_state = "reinforced"
state = GIRDER_REINF
+ can_displace = FALSE
girderpasschance = 0
max_integrity = 350
diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm
index ab26beb2cf56..4b05102f5731 100644
--- a/code/game/objects/structures/lavaland/necropolis_tendril.dm
+++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm
@@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(tendrils)
shake_camera(M, 15, 1)
playsound(get_turf(src),'sound/effects/explosionfar.ogg', 200, TRUE)
visible_message("The tendril falls inward, the ground around it widening into a yawning chasm!")
- for(var/turf/T in range(2,src))
+ for(var/turf/T in range(LAVALAND_TENDRIL_COLLAPSE_RANGE, src))
if(!T.density)
T.TerraformTurf(/turf/simulated/floor/chasm/straight_down/lava_land_surface)
qdel(src)
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index dde36ebb6cee..de327bca7e24 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -243,6 +243,6 @@
blockage.max_integrity += 25
foam_level++
blockage.icon_state = "foamed_[foam_level]"
- blockage.update_icon_state()
+ blockage.update_icon(UPDATE_ICON_STATE)
#undef MAX_FOAM_LEVEL
diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm
index 37e590e40c34..437fa7ddc6e4 100644
--- a/code/game/objects/structures/railings.dm
+++ b/code/game/objects/structures/railings.dm
@@ -106,7 +106,7 @@
return TRUE
if(ismob(mover))
var/mob/living/M = mover
- if(M.flying || (istype(M) && IS_HORIZONTAL(M) && HAS_TRAIT(M, TRAIT_CONTORTED_BODY)))
+ if(HAS_TRAIT(M, TRAIT_FLYING) || (istype(M) && IS_HORIZONTAL(M) && HAS_TRAIT(M, TRAIT_CONTORTED_BODY)))
return TRUE
if(mover.throwing)
return TRUE
@@ -133,7 +133,7 @@
if(isprojectile(O))
return TRUE
if(istype(M))
- if(M.flying || M.floating || (IS_HORIZONTAL(M) && HAS_TRAIT(M, TRAIT_CONTORTED_BODY)))
+ if(HAS_TRAIT(M, TRAIT_FLYING) || M.floating || (IS_HORIZONTAL(M) && HAS_TRAIT(M, TRAIT_CONTORTED_BODY)))
return TRUE
if(O.throwing)
return TRUE
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index aedb6c687651..fa06f02f4fd8 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -71,10 +71,16 @@ GLOBAL_LIST_EMPTY(safes)
// Combination generation
for(var/i in 1 to number_of_tumblers)
tumblers.Add(rand(0, 99))
+ if(mapload)
+ addtimer(CALLBACK(src, PROC_REF(take_contents)), 0)
+
+/obj/structure/safe/proc/take_contents()
// Put as many items on our turf inside as possible
for(var/obj/item/I in loc)
+ if(I.density || I.anchored)
+ continue
if(space >= maxspace)
- return
+ break
if(I.w_class + space <= maxspace)
space += I.w_class
I.forceMove(src)
@@ -339,14 +345,14 @@ GLOBAL_LIST_EMPTY(safes)
if(get_dist(src, driller) >= 9)
return //You need to be near the drill if you want to get the buff.
for(var/mob/living/carbon/human/H in view(9, src))
- if(H.job in list("Security Officer", "Detective", "Warden", "Head of Security", "Captain", "Clown") || H.mind.special_role == SPECIAL_ROLE_ERT)
+ if((H.job in list("Security Officer", "Detective", "Warden", "Head of Security", "Captain", "Clown")) || H.mind.special_role == SPECIAL_ROLE_ERT)
if(H.mind && H.mind.special_role && H.mind.special_role != SPECIAL_ROLE_ERT)
continue
drill.spotted = TRUE
security_assualt_in_progress()
return
for(var/mob/living/carbon/human/H in view(9, driller))
- if(H.job in list("Security Officer", "Detective", "Warden", "Head of Security", "Captain", "Clown") || H.mind.special_role == SPECIAL_ROLE_ERT)
+ if((H.job in list("Security Officer", "Detective", "Warden", "Head of Security", "Captain", "Clown")) || H.mind.special_role == SPECIAL_ROLE_ERT)
if(H.mind && H.mind.special_role && H.mind.special_role != SPECIAL_ROLE_ERT)
continue
drill.spotted = TRUE
diff --git a/code/game/objects/structures/shelves.dm b/code/game/objects/structures/shelves.dm
new file mode 100644
index 000000000000..71d8f84fd9dd
--- /dev/null
+++ b/code/game/objects/structures/shelves.dm
@@ -0,0 +1,139 @@
+GLOBAL_LIST_INIT(shelf_colors, list("basic", "sci", "sup", "serv", "med", "sec", "cmd", "engi"))
+
+/obj/structure/shelf
+ name = "shelf"
+ desc = "A piece of furniture used for vertical storage."
+ icon = 'icons/obj/structures/shelves.dmi'
+ icon_state = "shelf_basic"
+ layer = TABLE_LAYER
+ density = TRUE
+ anchored = TRUE
+ pass_flags_self = PASSTAKE
+ max_integrity = 80
+ /// The suffix of the icon state used for the shelf. Indexed into `GLOB.shelf_colors`.
+ var/shelf_style = "basic"
+ /// The current overlay of the top shelf. Used for interleaving objects and shelf layers for the illusion of depth.
+ var/image/shelf_overlay
+ COOLDOWN_DECLARE(spraypaint_cd)
+
+/obj/structure/shelf/Initialize(mapload)
+ . = ..()
+ var/area/A = get_area(src)
+ AddComponent(/datum/component/shelver/basic_shelf, random_pickup_locations_ = istype(A, /area/station/maintenance))
+ update_icon()
+ set_style(shelf_style)
+
+ if(mapload)
+ SEND_SIGNAL(src, COMSIG_SHELF_ADDED_ON_MAPLOAD)
+
+/obj/structure/shelf/attackby(obj/item/I, mob/living/user, params)
+ var/obj/item/toy/crayon/spraycan/spraycan = I
+ if(!istype(spraycan))
+ return ..()
+ if(spraycan.capped)
+ return ..()
+
+ if(!COOLDOWN_FINISHED(src, spraypaint_cd))
+ to_chat(user, "The paint on [src] is still drying!")
+ return
+
+ var/cur_idx = GLOB.shelf_colors.Find(shelf_style)
+ if(!cur_idx)
+ cur_idx = 1
+ cur_idx++
+ if(cur_idx > length(GLOB.shelf_colors))
+ cur_idx = 1
+ set_style(GLOB.shelf_colors[cur_idx])
+ spraycan.play_spray_sound(user)
+
+ // Tiny cooldown to prevent constant spamming of the action
+ COOLDOWN_START(src, spraypaint_cd, 1 SECONDS)
+
+/obj/structure/shelf/proc/set_style(new_style)
+ if(shelf_style == new_style && !isnull(shelf_overlay))
+ return
+ shelf_style = new_style
+ icon_state = "shelf_[shelf_style]"
+ // Don't think I can get away with both icon smoothing across tiles
+ // and dealing with this overlay shit
+ shelf_overlay = mutable_appearance('icons/obj/structures/shelves.dmi', "shelf_[shelf_style]-top")
+ shelf_overlay.layer = LOW_ITEM_LAYER
+ update_appearance(UPDATE_OVERLAYS)
+
+/obj/structure/shelf/update_overlays()
+ return list(shelf_overlay)
+
+/obj/structure/shelf/wrench_act(mob/living/user, obj/item/I)
+ . = TRUE
+ if(user.a_intent == INTENT_HELP)
+ return FALSE
+ if(!I.use_tool(src, user, 2.5 SECONDS, volume = I.tool_volume))
+ return
+
+ to_chat(user, "You disassemble [src].")
+ deconstruct()
+
+/obj/structure/shelf/deconstruct(disassembled)
+ new /obj/item/stack/sheet/metal(get_turf(src), 5)
+ return ..()
+
+/obj/structure/shelf/engineering
+ icon_state = "shelf_engi"
+ shelf_style = "engi"
+
+/obj/structure/shelf/medbay
+ icon_state = "shelf_med"
+ shelf_style = "med"
+
+/obj/structure/shelf/security
+ icon_state = "shelf_sec"
+ shelf_style = "sec"
+
+/obj/structure/shelf/service
+ icon_state = "shelf_serv"
+ shelf_style = "serv"
+
+/obj/structure/shelf/science
+ icon_state = "shelf_sci"
+ shelf_style = "sci"
+
+/obj/structure/shelf/command
+ icon_state = "shelf_cmd"
+ shelf_style = "cmd"
+
+/obj/structure/shelf/supply
+ icon_state = "shelf_sup"
+ shelf_style = "sup"
+
+/obj/structure/gunrack
+ name = "gun rack"
+ desc = "A rack for stowing firearms."
+ icon = 'icons/obj/structures.dmi'
+ icon_state = "gunrack"
+ layer = TABLE_LAYER
+ density = TRUE
+ anchored = TRUE
+ pass_flags_self = PASSTAKE
+ max_integrity = 80
+
+/obj/structure/gunrack/Initialize(mapload)
+ . = ..()
+ var/static/list/gun_subtypes = subtypesof(/obj/item/gun)
+ AddComponent(/datum/component/shelver/gun_rack, allowed_types_ = gun_subtypes)
+
+ if(mapload)
+ SEND_SIGNAL(src, COMSIG_SHELF_ADDED_ON_MAPLOAD)
+
+/obj/structure/gunrack/wrench_act(mob/living/user, obj/item/I)
+ . = TRUE
+ if(user.a_intent == INTENT_HELP)
+ return FALSE
+ if(!I.use_tool(src, user, 2.5 SECONDS, volume = I.tool_volume))
+ return
+
+ to_chat(user, "You disassemble [src].")
+ deconstruct()
+
+/obj/structure/gunrack/deconstruct(disassembled)
+ new /obj/item/stack/sheet/metal(get_turf(src), 5)
+ return ..()
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index 0ed32826e24d..b1b2089f6c3a 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -3,7 +3,7 @@
anchored = TRUE
opacity = FALSE
density = FALSE
- layer = 3.5
+ layer = NOT_HIGH_OBJ_LAYER
max_integrity = 100
armor = list(MELEE = 50, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 3a0a16795376..14fa44bc785a 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -308,11 +308,11 @@
anchored = TRUE
oreAmount = 0
-/obj/structure/statue/russian_mulebot
+/obj/structure/statue/soviet_mulebot
name = "OXENbot"
- desc = "Like a MULEbot, but more Russian and less functional.";
- icon = 'icons/obj/aibots.dmi';
- icon_state = "mulebot0";
+ desc = "Like a MULEbot, but more socialist and less functional."
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "mulebot0"
anchored = TRUE
oreAmount = 10
diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
index f84af512c5ea..067158533c98 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
@@ -17,6 +17,16 @@
var/mob/living/buckled_mob = m
buckled_mob.setDir(dir)
+/obj/structure/chair/wheelchair/post_buckle_mob(mob/living/M)
+ . = ..()
+ handle_layer()
+ density = TRUE
+
+/obj/structure/chair/wheelchair/post_unbuckle_mob()
+ . = ..()
+ handle_layer()
+ density = FALSE
+
/obj/structure/chair/wheelchair/relaymove(mob/user, direction)
if(propelled)
return 0
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 8e9dad45c928..60ec516c9392 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -100,6 +100,16 @@
if(flipped)
clear_smooth_overlays()
+// Need to override this to allow flipped tables to be mapped in without the smoothing subsystem resetting the icon_state
+/obj/structure/table/set_smoothed_icon_state(new_junction)
+ if(flipped)
+ return
+ ..()
+
+/obj/structure/table/flipped
+ icon_state = "tableflip0"
+ flipped = TRUE
+
/obj/structure/table/narsie_act()
new /obj/structure/table/wood(loc)
qdel(src)
@@ -130,7 +140,7 @@
if(istype(mover,/obj/item/projectile))
return (check_cover(mover,target))
var/mob/living/living_mover = mover
- if(istype(living_mover) && (living_mover.flying || (IS_HORIZONTAL(living_mover) && HAS_TRAIT(living_mover, TRAIT_CONTORTED_BODY))))
+ if(istype(living_mover) && (HAS_TRAIT(living_mover, TRAIT_FLYING) || (IS_HORIZONTAL(living_mover) && HAS_TRAIT(living_mover, TRAIT_CONTORTED_BODY))))
return TRUE
if(istype(mover) && mover.checkpass(PASSTABLE))
return TRUE
@@ -474,7 +484,7 @@
if(!isliving(AM))
return
var/mob/living/L = AM
- if(L.incorporeal_move || L.flying || L.floating)
+ if(L.incorporeal_move || HAS_TRAIT(L, TRAIT_FLYING) || L.floating)
return
// Don't break if they're just flying past
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
index bfc860d6bd5f..9836fb7343f4 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
@@ -37,7 +37,7 @@
return
flipped = !flipped
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/transit_tube_construction/screwdriver_act(mob/living/user, obj/item/I)
. = TRUE
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 7ec565955a45..e48086e57db5 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -776,6 +776,7 @@
glass_type = /obj/item/stack/sheet/plastitaniumglass
smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_PLASTITANIUM_WALLS)
canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS)
+ env_smash_level = ENVIRONMENT_SMASH_RWALLS //used in shuttles, same reason as above
superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT
/obj/structure/window/reinforced/clockwork
diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm
index a175af95f5a5..303e8d5b6efc 100644
--- a/code/game/turfs/simulated.dm
+++ b/code/game/turfs/simulated.dm
@@ -37,7 +37,7 @@
/turf/simulated/proc/burn_tile()
return
-/turf/simulated/cleaning_act(mob/user, atom/cleaner, cleanspeed = 50, text_verb = "clean", text_description = " with [cleaner].", text_targetname = name)
+/turf/simulated/cleaning_act(mob/user, atom/cleaner, cleanspeed = 50, text_verb = "clean", text_description = " with [cleaner].", text_targetname = name, skip_do_after = FALSE)
if(!..())
return
@@ -124,7 +124,7 @@
if(IS_HORIZONTAL(M))
return 1
- if(M.flying)
+ if(HAS_TRAIT(M, TRAIT_FLYING))
return ..()
switch(src.wet)
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 021c17091523..dce375016fde 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -2,7 +2,7 @@
GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","damaged3","damaged4",
"damaged5","panelscorched","floorscorched1","floorscorched2","platingdmg1","platingdmg2",
"platingdmg3","plating","light_on","warnplate", "warnplatecorner","metalfoam", "ironfoam",
- "light_off","wall_thermite","grass1","grass2","grass3","grass4",
+ "light_off","grass1","grass2","grass3","grass4",
"asteroid","asteroid_dug","asteroid0","asteroid1","asteroid2","asteroid3","asteroid4",
"asteroid5","asteroid6","asteroid7","asteroid8","asteroid9","asteroid10","asteroid11","asteroid12",
"oldburning","light-on-r","light-on-y","light-on-g","light-on-b", "wood", "wood-broken", "carpet",
diff --git a/code/game/turfs/simulated/floor/asteroid_floors.dm b/code/game/turfs/simulated/floor/asteroid_floors.dm
index 44021a067a0d..e67c4a7c0f5e 100644
--- a/code/game/turfs/simulated/floor/asteroid_floors.dm
+++ b/code/game/turfs/simulated/floor/asteroid_floors.dm
@@ -1,7 +1,6 @@
/**********************Asteroid**************************/
-#define RECURSION_MAX 100
/turf/simulated/floor/plating/asteroid
gender = PLURAL
name = "asteroid sand"
@@ -186,168 +185,6 @@
nitrogen = 0
turf_type = /turf/simulated/floor/plating/asteroid/airless
-#define SPAWN_MEGAFAUNA "bluh bluh huge boss"
-#define SPAWN_BUBBLEGUM 6
-
-GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/megafauna/dragon = 4, /mob/living/simple_animal/hostile/megafauna/colossus = 2, /mob/living/simple_animal/hostile/megafauna/bubblegum = SPAWN_BUBBLEGUM, /mob/living/simple_animal/hostile/megafauna/ancient_robot = 4))
-
-/turf/simulated/floor/plating/asteroid/airless/cave
- var/length = 100
- var/list/mob_spawn_list
- var/list/megafauna_spawn_list
- var/list/flora_spawn_list
- var/sanity = 1
- var/forward_cave_dir = 1
- var/backward_cave_dir = 2
- var/going_backwards = TRUE
- var/has_data = FALSE
- /// Very important for making sure prod won't die due to poor RNG from cave spawns
- var/recursions = 0
- var/data_having_type = /turf/simulated/floor/plating/asteroid/airless/cave/has_data
- turf_type = /turf/simulated/floor/plating/asteroid/airless
-
-/// subtype for producing a tunnel with given data
-/turf/simulated/floor/plating/asteroid/airless/cave/has_data
- has_data = TRUE
-
-/turf/simulated/floor/plating/asteroid/airless/cave/volcanic
- mob_spawn_list = list(/obj/effect/landmark/mob_spawner/goliath = 50, /obj/structure/spawner/lavaland/goliath = 3,
- /obj/effect/landmark/mob_spawner/watcher = 40, /obj/structure/spawner/lavaland = 2,
- /obj/effect/landmark/mob_spawner/legion = 30, /obj/structure/spawner/lavaland/legion = 3,
- SPAWN_MEGAFAUNA = 6, /obj/effect/landmark/mob_spawner/goldgrub = 10, /obj/effect/landmark/mob_spawner/gutlunch = 4,
- /obj/effect/landmark/mob_spawner/abandoned_minebot = 6)
-
- data_having_type = /turf/simulated/floor/plating/asteroid/airless/cave/volcanic/has_data
- turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface
- oxygen = LAVALAND_OXYGEN
- nitrogen = LAVALAND_NITROGEN
- temperature = LAVALAND_TEMPERATURE
-
-/// subtype for producing a tunnel with given data
-/turf/simulated/floor/plating/asteroid/airless/cave/volcanic/has_data
- has_data = TRUE
-
-/turf/simulated/floor/plating/asteroid/airless/cave/Initialize(mapload)
- if(!mob_spawn_list)
- mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 1, /mob/living/simple_animal/hostile/asteroid/goliath = 5, /mob/living/simple_animal/hostile/asteroid/basilisk = 4, /mob/living/simple_animal/hostile/asteroid/hivelord = 3)
- if(!megafauna_spawn_list)
- megafauna_spawn_list = GLOB.megafauna_spawn_list
- if(!flora_spawn_list)
- flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2, /obj/structure/flora/ash/cap_shroom = 2, /obj/structure/flora/ash/stem_shroom = 2, /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2, /obj/structure/flora/ash/rock/style_random = 1)
- if(SSmapping.cave_theme == BLOCKED_BURROWS)
- flora_spawn_list += list(/obj/structure/flora/ash/rock/style_random = 3) //Let us see how this goes
- . = ..()
- if(!has_data)
- produce_tunnel_from_data()
-
-/turf/simulated/floor/plating/asteroid/airless/cave/proc/get_cave_data(set_length, exclude_dir = -1)
- // If set_length (arg1) isn't defined, get a random length; otherwise assign our length to the length arg.
- if(!set_length)
- length = rand(25, 50)
- else
- length = set_length
-
- // Get our directiosn
- forward_cave_dir = pick(GLOB.alldirs - exclude_dir)
- // Get the opposite direction of our facing direction
- backward_cave_dir = angle2dir(dir2angle(forward_cave_dir) + 180)
-
-/turf/simulated/floor/plating/asteroid/airless/cave/proc/produce_tunnel_from_data(tunnel_length, excluded_dir = -1)
- if(!tunnel_length)//This is a sub cave do not overide repeat do not overide
- get_cave_data(tunnel_length, excluded_dir)
- switch(SSmapping.cave_theme)
- if(BLOCKED_BURROWS) //Longer on average
- get_cave_data(rand(40, 60), excluded_dir)
- if(CLASSIC_CAVES) //Classic
- get_cave_data(tunnel_length, excluded_dir)
- if(DEADLY_DEEPROCK) //Smaller into large rooms with more mobs.
- get_cave_data(rand(20, 40), excluded_dir)
- if(prob(25)) //Less caves due to big openings. This may lead to fauna inside 1x1 rooms. We'll call that a suprise mechanic
- SpawnFloor(src, 75) //now with extra suprise
- return
- // Make our tunnels
- make_tunnel(forward_cave_dir)
- if(going_backwards)
- make_tunnel(backward_cave_dir)
- // Kill ourselves by replacing ourselves with a normal floor.
- SpawnFloor(src)
-
-/turf/simulated/floor/plating/asteroid/airless/cave/proc/make_tunnel(dir)
- var/turf/simulated/mineral/tunnel = src
- var/next_angle = pick(45, -45)
-
- for(var/i in 1 to length)
- ++recursions
- if(recursions > RECURSION_MAX)
- break
- if(!sanity)
- break
-
- var/list/L = list(45)
- if(ISODD(dir2angle(dir)) && (!(SSmapping.cave_theme == BLOCKED_BURROWS) || prob(15)))
- L += -45
-
- // Expand the edges of our tunnel
- for(var/edge_angle in L)
- var/turf/simulated/mineral/edge = get_step(tunnel, angle2dir(dir2angle(dir) + edge_angle))
- if(istype(edge))
- SpawnFloor(edge)
-
- if(!sanity)
- break
-
- // Move our tunnel forward
- tunnel = get_step(tunnel, dir)
-
- // Separate ruin area check here because of the raw ChangeTurf call that
- // doesn't go through SpawnFloor/Flora/Monster.
- if(istype(tunnel) && !istype(tunnel.loc, /area/ruin))
- // Small chance to have forks in our tunnel; otherwise dig our tunnel.
- var/caveprob = 20
- switch(SSmapping.cave_theme)
- if(BLOCKED_BURROWS) //Longer on average
- caveprob = 30 //More splitting
- if(DEADLY_DEEPROCK) //Smaller into large rooms with more mobs.
- caveprob = 10 //Less splitting
- if(i > 3 && prob(caveprob))
- var/turf/simulated/floor/plating/asteroid/airless/cave/C = tunnel.ChangeTurf(data_having_type, FALSE, TRUE)
- C.recursions = recursions
- C.going_backwards = FALSE
- C.produce_tunnel_from_data(rand(10, 15), dir)
- else
- SpawnFloor(tunnel)
- else //if(!istype(tunnel, src.parent)) // We hit space/normal/wall, stop our tunnel.
- break
-
- // Chance to change our direction left or right.
- if(i > 2 && prob(33))
- // We can't go a full loop though
- if(!SSmapping.cave_theme == BLOCKED_BURROWS || prob(60))
- next_angle = -next_angle
- setDir(angle2dir(dir2angle(dir) )+ next_angle)
- if(length -2 == i && !has_data) //Branches will not make this
- SpawnRoom(tunnel)
-
-/turf/simulated/floor/plating/asteroid/airless/cave/proc/SpawnRoom(turf/T)
- switch(SSmapping.cave_theme)
- if(DEADLY_DEEPROCK)
- var/tempradius = rand(10, 15)
- var/probmodifer = 43 * tempradius //Yes this is a magic number, it is a magic number that works well.
- for(var/turf/NT in circlerangeturfs(T, tempradius))
- var/distance = (max(get_dist(T, NT), 1)) //Get dist throws -1 if same turf
- if(prob(min(probmodifer / distance, 100)))
- if((ismineralturf(NT) || istype(NT, /turf/simulated/floor/plating/asteroid)) && !istype(NT.loc, /area/ruin)) //No spawning on lava / other ruins
- SpawnFloor(NT, 50) //Room has higher probabilty.
- if(prob(25))
- tempradius = round(tempradius / 3)
- var/turf/oasis_lake = pickweight(list(/turf/simulated/floor/lava/lava_land_surface = 4, /turf/simulated/floor/lava/lava_land_surface/plasma = 4, /turf/simulated/floor/chasm/straight_down/lava_land_surface = 4, /turf/simulated/floor/lava/mapping_lava = 6, /turf/simulated/floor/beach/away/water/lavaland_air = 1, /turf/simulated/floor/plating/asteroid = 1))
- if(oasis_lake == /turf/simulated/floor/plating/asteroid)
- new /obj/effect/spawner/oasisrock(T, tempradius)
- for(var/turf/oasis in circlerangeturfs(T, tempradius))
- if(istype(oasis.loc, /area/ruin))
- continue
- oasis.ChangeTurf(oasis_lake, ignore_air = TRUE)
-
/obj/effect/spawner/oasisrock
name = "Oasis rock spawner"
var/passed_radius
@@ -375,86 +212,6 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me
O.forceMove(pick_n_take(valid_turfs))
qdel(src)
-/turf/simulated/floor/plating/asteroid/airless/cave/proc/SpawnFloor(turf/T, monsterprob = 30)
- if(istype(T.loc, /area/ruin))
- return
-
- for(var/S in RANGE_TURFS(1, src))
- var/turf/NT = S
- if(!NT || isspaceturf(NT) || istype(NT.loc, /area/lavaland/surface/outdoors/explored))
- sanity = 0
- break
- if(!sanity)
- return
- SpawnFlora(T)
-
- SpawnMonster(T, monsterprob)
- T.ChangeTurf(turf_type, FALSE, FALSE, TRUE)
-
-/turf/simulated/floor/plating/asteroid/airless/cave/proc/SpawnMonster(turf/T, monsterprob = 30)
- if(istype(T.loc, /area/ruin))
- return
-
- if(prob(monsterprob))
- if(!istype(loc, /area/lavaland/surface/outdoors/unexplored))
- return
- var/randumb = pickweight(mob_spawn_list)
- while(randumb == SPAWN_MEGAFAUNA)
- if(istype(loc, /area/lavaland/surface/outdoors/unexplored/danger)) //this is danger. it's boss time.
- var/maybe_boss = pickweight(megafauna_spawn_list)
- if(megafauna_spawn_list[maybe_boss])
- randumb = maybe_boss
- else //this is not danger, don't spawn a boss, spawn something else
- randumb = pickweight(mob_spawn_list)
- var/scanrange = 12
- var/megafaunarange = 7
- switch(SSmapping.cave_theme)
- if(DEADLY_DEEPROCK)
- if(prob(50) && monsterprob > 30)
- scanrange = rand(4, 7)
- megafaunarange = scanrange
- for(var/thing in urange(scanrange, T)) //prevents mob clumps
- if(!ishostile(thing) && !istype(thing, /obj/structure/spawner))
- continue
- if((ismegafauna(randumb) || ismegafauna(thing)) && get_dist(T, thing) <= megafaunarange)
- return //if there's a megafauna within standard view don't spawn anything at all
- if(ispath(randumb, /obj/effect/landmark/mob_spawner) || istype(thing, /mob/living/simple_animal/hostile/asteroid))
- return //if the random is a standard mob, avoid spawning if there's another one within 12 tiles
- if((ispath(randumb, /obj/structure/spawner/lavaland) || istype(thing, /obj/structure/spawner/lavaland)) && get_dist(T, thing) <= 2)
- return //prevents tendrils spawning in each other's collapse range
-
- if(ispath(randumb, /mob/living/simple_animal/hostile/megafauna/bubblegum)) //there can be only one bubblegum, so don't waste spawns on it
- megafauna_spawn_list.Remove(randumb)
-
- if(ispath(randumb, /mob/living/simple_animal/hostile/megafauna/ancient_robot)) //same as above, we do not want multiple of these robots
- megafauna_spawn_list.Remove(randumb)
-
- new randumb(T)
- SSblackbox.record_feedback("tally", "lavaland_mob_spawns", 1, "[randumb]")
-
-#undef SPAWN_MEGAFAUNA
-#undef SPAWN_BUBBLEGUM
-#undef RECURSION_MAX
-
-/turf/simulated/floor/plating/asteroid/airless/cave/proc/SpawnFlora(turf/T)
- if(istype(T.loc, /area/ruin))
- return
-
- var/floraprob = 12
- switch(SSmapping.cave_theme)
- if(BLOCKED_BURROWS)
- floraprob = 30 //Lots of folliage, lots of blockage
- if(prob(floraprob))
- if(istype(loc, /area/lavaland/surface/outdoors/explored))
- return
- var/randumb = pickweight(flora_spawn_list)
- for(var/obj/structure/flora/ash/F in range(4, T)) //Allows for growing patches, but not ridiculous stacks of flora
- if(!istype(F, randumb))
- return
- new randumb(T)
-
-
-
/turf/simulated/floor/plating/asteroid/snow
gender = PLURAL
name = "snow"
diff --git a/code/game/turfs/simulated/floor/chasm.dm b/code/game/turfs/simulated/floor/chasm.dm
index 61be5dd4a8b3..86e26e198edf 100644
--- a/code/game/turfs/simulated/floor/chasm.dm
+++ b/code/game/turfs/simulated/floor/chasm.dm
@@ -130,7 +130,7 @@
//Flies right over the chasm
if(isliving(AM))
var/mob/living/M = AM
- if(M.flying || M.floating)
+ if(HAS_TRAIT(M, TRAIT_FLYING) || M.floating)
return FALSE
if(istype(M.buckled, /obj/tgvehicle/scooter/skateboard/hoverboard))
return FALSE
@@ -273,10 +273,10 @@
playsound(ourturf, 'sound/effects/bang.ogg', 50, TRUE)
ourturf.visible_message("[escapee] busts through [ourturf], leaping out of the chasm below!")
ourturf.ChangeTurf(ourturf.baseturf)
- escapee.flying = TRUE
+ ADD_TRAIT(escapee, TRAIT_FLYING, "chasm_escape")
escapee.forceMove(ourturf)
escapee.throw_at(get_edge_target_turf(ourturf, pick(GLOB.alldirs)), rand(2, 10), rand(2, 10))
- escapee.flying = FALSE
+ REMOVE_TRAIT(escapee, TRAIT_FLYING, "chasm_escape")
escapee.Sleeping(20 SECONDS)
/turf/simulated/floor/chasm/straight_down/lava_land_surface/normal_air
diff --git a/code/game/turfs/simulated/floor/lava.dm b/code/game/turfs/simulated/floor/lava.dm
index d28d298fa551..2eab0b2fb0d6 100644
--- a/code/game/turfs/simulated/floor/lava.dm
+++ b/code/game/turfs/simulated/floor/lava.dm
@@ -96,7 +96,7 @@
else if(isliving(thing))
. = TRUE
var/mob/living/L = thing
- if(L.flying)
+ if(HAS_TRAIT(L, TRAIT_FLYING))
continue //YOU'RE FLYING OVER IT
var/buckle_check = L.buckling
if(!buckle_check)
@@ -221,7 +221,7 @@
continue
. = TRUE
var/mob/living/burn_living = thing
- if(burn_living.flying)
+ if(HAS_TRAIT(burn_living, TRAIT_FLYING))
continue //YOU'RE FLYING OVER IT
var/buckle_check = burn_living.buckling
if(!buckle_check)
diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm
index da4915de892b..5861ecf00f05 100644
--- a/code/game/turfs/simulated/floor/plasteel_floor.dm
+++ b/code/game/turfs/simulated/floor/plasteel_floor.dm
@@ -79,14 +79,15 @@
/turf/simulated/floor/plasteel/stairs
icon_state = "stairs"
+
/turf/simulated/floor/plasteel/stairs/left
icon_state = "stairs-l"
+
/turf/simulated/floor/plasteel/stairs/medium
icon_state = "stairs-m"
+
/turf/simulated/floor/plasteel/stairs/right
icon_state = "stairs-r"
-/turf/simulated/floor/plasteel/stairs/old
- icon_state = "stairs-old"
/turf/simulated/floor/plasteel/grimy
icon_state = "grimy"
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index eba6c7ace8c8..82e34dd3f79d 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -319,12 +319,11 @@
atmos_mode = ATMOS_MODE_NO_DECAY
/turf/simulated/floor/engine/singularity_pull(S, current_size)
- ..()
if(current_size >= STAGE_FIVE)
if(floor_tile)
if(prob(30))
new floor_tile(src)
- make_plating()
+ make_plating(TRUE)
else if(prob(30))
ReplaceWithLattice()
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index 279acca967bf..3d9e34d57062 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -137,7 +137,7 @@
/turf/simulated/mineral/random
var/mineralSpawnChanceList = list(/turf/simulated/mineral/uranium = 5, /turf/simulated/mineral/diamond = 1, /turf/simulated/mineral/gold = 10,
/turf/simulated/mineral/silver = 12, /turf/simulated/mineral/plasma = 20, /turf/simulated/mineral/iron = 40, /turf/simulated/mineral/titanium = 11,
- /turf/simulated/mineral/gibtonite = 4, /turf/simulated/floor/plating/asteroid/airless/cave = 2, /turf/simulated/mineral/bscrystal = 1)
+ /turf/simulated/mineral/gibtonite = 4, /turf/simulated/mineral/bscrystal = 1)
//Currently, Adamantine won't spawn as it has no uses. -Durandan
var/mineralChance = 13
diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm
index e6d6844116ce..596dc3251eb4 100644
--- a/code/modules/admin/admin_ranks.dm
+++ b/code/modules/admin/admin_ranks.dm
@@ -139,7 +139,7 @@ GLOBAL_PROTECT(admin_ranks) // this shit is being protected for obvious reasons
holder.rights = GLOB.admin_ranks[newrank]
else
holder = new /datum/admins(newrank,GLOB.admin_ranks[newrank],ckey)
- remove_admin_verbs()
+ hide_verbs()
holder.associate(src)
/client/verb/changerights(newrights as num)
@@ -147,7 +147,7 @@ GLOBAL_PROTECT(admin_ranks) // this shit is being protected for obvious reasons
holder.rights = newrights
else
holder = new /datum/admins("testing",newrights,ckey)
- remove_admin_verbs()
+ hide_verbs()
holder.associate(src)
#endif
diff --git a/code/modules/admin/misc_admin_procs.dm b/code/modules/admin/misc_admin_procs.dm
index 18d88eb0bcbf..c3b494022863 100644
--- a/code/modules/admin/misc_admin_procs.dm
+++ b/code/modules/admin/misc_admin_procs.dm
@@ -7,7 +7,7 @@ GLOBAL_VAR_INIT(disable_explosions, FALSE)
////////////////////////////////
/proc/message_admins(msg)
- msg = "ADMIN LOG:[msg]"
+ msg = "ADMIN LOG:[msg]"
for(var/client/C in GLOB.admins)
if(R_ADMIN & C.holder.rights)
if(C.prefs && !(C.prefs.toggles & PREFTOGGLE_CHAT_NO_ADMINLOGS))
@@ -15,7 +15,7 @@ GLOBAL_VAR_INIT(disable_explosions, FALSE)
/proc/msg_admin_attack(text, loglevel)
if(!GLOB.nologevent)
- var/rendered = "ATTACK:[text]"
+ var/rendered = "ATTACK:[text]"
for(var/client/C in GLOB.admins)
if((C.holder.rights & R_ADMIN) && (C.prefs?.atklog <= loglevel))
to_chat(C, rendered, MESSAGE_TYPE_ATTACKLOG, confidential = TRUE)
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index 30182fba4868..dc598b438c5f 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -443,6 +443,9 @@
// SS220 EDIT - START
if(length(SSticker.mode.blood_brothers))
dat += check_role_table("Blood Brothers", SSticker.mode.blood_brothers)
+
+ if(length(SSticker.mode.vox_raiders))
+ dat += check_role_table("Vox Raiders", SSticker.mode.vox_raiders)
// SS220 EDIT - END
if(length(SSticker.mode.implanted))
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 34d5d48c9fbf..b113e0b0ea7d 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1936,7 +1936,7 @@
P.faxmachineid = fax.UID()
P.loc = fax.loc // Do not use fax.receivefax(P) here, as it won't preserve the type. Physically teleporting the fax paper is required.
if(istype(H) && H.stat == CONSCIOUS && (istype(H.l_ear, /obj/item/radio/headset) || istype(H.r_ear, /obj/item/radio/headset)))
- to_chat(H, "Your headset pings, notifying you that a reply to your fax has arrived.")
+ to_chat(H, "Your headset pings, notifying you that a reply to your fax has arrived.")
to_chat(src.owner, "You sent a [eviltype] fax to [H]")
log_admin("[key_name(src.owner)] sent [key_name(H)] a [eviltype] fax")
message_admins("[key_name_admin(src.owner)] replied to [key_name_admin(H)] with a [eviltype] fax")
@@ -2338,7 +2338,7 @@
P.update_icon()
fax.receivefax(P)
if(istype(H) && H.stat == CONSCIOUS && (istype(H.l_ear, /obj/item/radio/headset) || istype(H.r_ear, /obj/item/radio/headset)))
- to_chat(H, "Your headset pings, notifying you that a reply to your fax has arrived.")
+ to_chat(H, "Your headset pings, notifying you that a reply to your fax has arrived.")
to_chat(src.owner, "You sent a standard '[stype]' fax to [H]")
log_admin("[key_name(src.owner)] sent [key_name(H)] a standard '[stype]' fax")
message_admins("[key_name_admin(src.owner)] replied to [key_name_admin(H)] with a standard '[stype]' fax")
@@ -2387,7 +2387,7 @@
to_chat(owner, "The person you are trying to contact is not wearing a headset. ERT denied but no message has been sent.")
return
to_chat(owner, "You sent [reason] to [H] via a secure channel.")
- to_chat(H, "Incoming priority transmission from Central Command. Message as follows, Your ERT request has been denied for the following reasons: [reason].")
+ to_chat(H, "Incoming priority transmission from Central Command. Message as follows, Your ERT request has been denied for the following reasons: [reason].")
else
owner.response_team()
@@ -2583,7 +2583,7 @@
if(notify == "Yes")
var/mob/living/carbon/human/H = sender
if(istype(H) && H.stat == CONSCIOUS && (istype(H.l_ear, /obj/item/radio/headset) || istype(H.r_ear, /obj/item/radio/headset)))
- to_chat(sender, "Your headset pings, notifying you that a reply to your fax has arrived.")
+ to_chat(sender, "Your headset pings, notifying you that a reply to your fax has arrived.")
if(sender)
log_admin("[key_name(src.owner)] replied to a fax message from [key_name(sender)]: [input]")
message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(sender)] (VIEW).", 1)
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index debe72dcfc1a..b2387c9bc2cf 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -269,14 +269,14 @@
GLOB.discord_manager.send2discord_simple(DISCORD_WEBHOOK_ADMIN, "PM from [key_name(src)]: [html_decode(msg)]")
- to_chat(src, "PM to-Discord Admins: [msg]", MESSAGE_TYPE_ADMINPM, confidential = TRUE)
+ to_chat(src, "PM to-Discord Admins: [msg]", MESSAGE_TYPE_ADMINPM, confidential = TRUE)
log_admin("PM: [key_name(src)]->Discord: [msg]")
for(var/client/X in GLOB.admins)
if(X == src)
continue
if(check_rights(R_ADMIN, 0, X.mob))
- to_chat(X, "PM: [key_name_admin(src)]->Discord Admins:[msg]")
+ to_chat(X, "PM: [key_name_admin(src)]->Discord Admins:[msg]")
/client/verb/open_pms_ui()
set name = "My PMs"
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index d629de50a02a..a6246cad9ac1 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -657,11 +657,11 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
var/list/special_outfits = list(
"Naked",
"As Job...",
+ "As Admin Job...", // SS220 EDIT - Добавил "As Admin Job..."
"Custom..."
)
-
var/list/outfits = list()
- var/list/paths = subtypesof(/datum/outfit) - typesof(/datum/outfit/job) - list(/datum/outfit/varedit, /datum/outfit/admin)
+ var/list/paths = subtypesof(/datum/outfit) - typesof(/datum/outfit/job) - list(/datum/outfit/varedit, /datum/outfit/admin) - typesof(/datum/outfit/job/admin) // SS220 EDIT - subtract typesof(/datum/outfit/job/admin)
for(var/path in paths)
var/datum/outfit/O = path //not much to initalize here but whatever
if(initial(O.can_be_admin_equipped))
@@ -688,7 +688,21 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
dresscode = job_outfits[dresscode]
if(isnull(dresscode))
return
+ // SS220 EDIT START - собственно сама менюшка
+ if(dresscode == "As Admin Job...")
+ var/list/admin_job_paths = subtypesof(/datum/outfit/job/admin)
+ var/list/admin_job_outfits = list()
+ for(var/path in admin_job_paths)
+ var/datum/outfit/O = path
+ if(initial(O.can_be_admin_equipped))
+ admin_job_outfits[initial(O.name)] = path
+ admin_job_outfits = sortTim(admin_job_outfits, GLOBAL_PROC_REF(cmp_text_asc))
+ dresscode = input("Select equipment", "Сhoose your fighter") as null|anything in admin_job_outfits
+ dresscode = admin_job_outfits[dresscode]
+ if(isnull(dresscode))
+ return
+ // SS220 EDIT END
if(dresscode == "Custom...")
var/list/custom_names = list()
for(var/datum/outfit/D in GLOB.custom_outfits)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 50a37700d35f..0fb7db499b54 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -182,7 +182,7 @@
log_admin("[key_name(src)] replied to [key_name(H)]'s [sender] message with the message [input].")
message_admins("[key_name_admin(src)] replied to [key_name_admin(H)]'s [sender] message with: \"[input]\"")
- to_chat(H, "Incoming priority transmission from [sender == "Syndicate" ? "your benefactor" : "Central Command"]. Message as follows[sender == "Syndicate" ? ", agent." : ":"] [input]")
+ to_chat(H, "Incoming priority transmission from [sender == "Syndicate" ? "your benefactor" : "Central Command"]. Message as follows[sender == "Syndicate" ? ", agent." : ":"] [input]")
SEND_SOUND(H, 'sound/effects/headset_message.ogg')
diff --git a/code/modules/antagonists/changeling/powers/apex_predator.dm b/code/modules/antagonists/changeling/powers/apex_predator.dm
index 82134ef55682..cb1a6aecf7f0 100644
--- a/code/modules/antagonists/changeling/powers/apex_predator.dm
+++ b/code/modules/antagonists/changeling/powers/apex_predator.dm
@@ -10,12 +10,16 @@
/datum/action/changeling/apex_predator/sting_action(mob/user)
var/list/target_by_name = list()
for(var/mob/living/carbon/human/possible_target as anything in GLOB.human_list)
+ if(possible_target == user)
+ continue
var/turf/target_turf = get_turf(possible_target)
var/turf/user_turf = get_turf(user)
if(!possible_target.mind || (target_turf.z != user_turf.z))
continue
target_by_name[possible_target.real_name] = possible_target
-
+ if(!length(target_by_name))
+ to_chat(user, "There is no prey to be hunted here...")
+ return
var/target_name = tgui_input_list(user, "Person to Locate", "Prey", target_by_name)
if(!target_name)
return
diff --git a/code/modules/antagonists/changeling/powers/environmental_adaption.dm b/code/modules/antagonists/changeling/powers/environmental_adaption.dm
index 6935bbdb3be8..7d7e4623abec 100644
--- a/code/modules/antagonists/changeling/powers/environmental_adaption.dm
+++ b/code/modules/antagonists/changeling/powers/environmental_adaption.dm
@@ -16,6 +16,12 @@
var/recharge_slowdown = 0.15
var/chem_recharge_slowdown = 0
+/datum/action/changeling/environmental_adaptation/Destroy(force, ...)
+ if(ishuman(cling.owner.current))
+ var/mob/living/carbon/human/H = cling.owner.current
+ H.set_alpha_tracking(ALPHA_VISIBLE, src)
+ return ..()
+
/datum/action/changeling/environmental_adaptation/sting_action(mob/living/carbon/human/cling) //SHOULD always be human, because req_human = TRUE
..()
is_active = !is_active
@@ -26,14 +32,16 @@
/datum/action/changeling/environmental_adaptation/proc/enable_ability(mob/living/carbon/human/cling) //Enable the adaptation
- animate(cling, alpha = 65, time = 3 SECONDS)
+ cling.set_alpha_tracking(65, src, update_alpha = FALSE)
+ animate(cling, alpha = cling.get_alpha(), time = 3 SECONDS)
cling.visible_message("[cling]'s skin suddenly starts becoming translucent!", \
"We adapt our pigmentation to suit the environment around us.")
var/datum/antagonist/changeling/changeling_data = cling.mind?.has_antag_datum(/datum/antagonist/changeling)
changeling_data?.chem_recharge_slowdown -= recharge_slowdown //Slows down chem regeneration
/datum/action/changeling/environmental_adaptation/proc/disable_ability(mob/living/carbon/human/cling) //Restore the adaptation
- animate(cling, alpha = 255, time = 3 SECONDS)
+ cling.set_alpha_tracking(ALPHA_VISIBLE, src, update_alpha = FALSE)
+ animate(cling, alpha = cling.get_alpha(), time = 3 SECONDS)
cling.visible_message(
"[cling] appears from thin air!",
"We stop concentration on our pigmentation, allowing it to return to normal.",
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index 378c7a9bc6a9..7b61383c9423 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -83,6 +83,8 @@ RESTRICT_TYPE(/datum/antagonist/traitor)
return ..()
/datum/antagonist/traitor/select_organization()
+ if(isAI(owner.current))
+ return
var/chaos = pickweight(list(ORG_CHAOS_HUNTER = ORG_PROB_HUNTER, ORG_CHAOS_MILD = ORG_PROB_MILD, ORG_CHAOS_AVERAGE = ORG_PROB_AVERAGE, ORG_CHAOS_HIJACK = ORG_PROB_HIJACK))
for(var/org_type in shuffle(subtypesof(/datum/antag_org/syndicate)))
var/datum/antag_org/org = org_type
diff --git a/code/modules/antagonists/vampire/vamp_datum.dm b/code/modules/antagonists/vampire/vamp_datum.dm
index 60588ac5ca38..3fe4dcc76609 100644
--- a/code/modules/antagonists/vampire/vamp_datum.dm
+++ b/code/modules/antagonists/vampire/vamp_datum.dm
@@ -36,11 +36,17 @@ RESTRICT_TYPE(/datum/antagonist/vampire)
blurb_a = 1
/datum/antagonist/vampire/Destroy(force, ...)
- owner.current.create_log(CONVERSION_LOG, "De-vampired")
draining = null
QDEL_NULL(subclass)
return ..()
+/datum/antagonist/vampire/detach_from_owner()
+ owner.current.create_log(CONVERSION_LOG, "De-vampired")
+ if(ishuman(owner.current))
+ var/mob/living/carbon/human/human_owner = owner.current
+ human_owner.set_alpha_tracking(ALPHA_VISIBLE, src)
+ return ..()
+
/datum/antagonist/vampire/add_owner_to_gamemode()
SSticker.mode.vampires += owner
@@ -233,7 +239,7 @@ RESTRICT_TYPE(/datum/antagonist/vampire)
to_chat(owner.current, "Your body is turning to ash, get out of the starlight NOW!")
owner.current.adjustCloneLoss(10) //I'm melting!
vamp_burn(85)
- if(owner.current.cloneloss >= 100)
+ if(owner.current.getCloneLoss() >= 100)
owner.current.dust()
/datum/antagonist/vampire/proc/handle_vampire()
@@ -258,24 +264,25 @@ RESTRICT_TYPE(/datum/antagonist/vampire)
if(!ishuman(owner.current))
owner.current.alpha = 255
return
- var/turf/simulated/T = get_turf(owner.current)
+ var/mob/living/carbon/human/human_owner = owner.current
+ var/turf/simulated/T = get_turf(human_owner)
var/light_available = T.get_lumcount() * 10
if(!istype(T))
return
- if(!iscloaking || owner.current.on_fire)
- owner.current.alpha = 255
- REMOVE_TRAIT(owner.current, TRAIT_GOTTAGONOTSOFAST, VAMPIRE_TRAIT)
+ if(!iscloaking || human_owner.on_fire)
+ human_owner.set_alpha_tracking(ALPHA_VISIBLE, src)
+ REMOVE_TRAIT(human_owner, TRAIT_GOTTAGONOTSOFAST, VAMPIRE_TRAIT)
return
if(light_available <= 2)
- owner.current.alpha = 38 // round(255 * 0.15)
- ADD_TRAIT(owner.current, TRAIT_GOTTAGONOTSOFAST, VAMPIRE_TRAIT)
+ human_owner.set_alpha_tracking(ALPHA_VISIBLE * 0.15, src)
+ ADD_TRAIT(human_owner, TRAIT_GOTTAGONOTSOFAST, VAMPIRE_TRAIT)
return
- REMOVE_TRAIT(owner.current, TRAIT_GOTTAGONOTSOFAST, VAMPIRE_TRAIT)
- owner.current.alpha = 204 // 255 * 0.80
+ REMOVE_TRAIT(human_owner, TRAIT_GOTTAGONOTSOFAST, VAMPIRE_TRAIT)
+ human_owner.set_alpha_tracking(ALPHA_VISIBLE * 0.80, src)
/**
* Handles unique drain ID checks and increases vampire's total and usable blood by blood_amount. Checks for ability upgrades.
diff --git a/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm b/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm
index b39832c1fbec..26c48667a7ce 100644
--- a/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm
+++ b/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm
@@ -55,6 +55,8 @@
var/durability = 15
var/blood_drain_amount = 15
var/blood_absorbed_amount = 5
+ var/xenomorph_acid_boosted = FALSE
+ var/heal_boost = 1
var/datum/spell/vampire/self/vamp_claws/parent_spell
/obj/item/vamp_claws/Initialize(mapload, new_parent_spell)
@@ -80,20 +82,38 @@
if(!V)
return
-
- if(iscarbon(target))
- var/mob/living/carbon/C = target
- if(C.ckey && C.stat != DEAD && C.affects_vampire() && !(NO_BLOOD in C.dna.species.species_traits))
+ if(xenomorph_acid_boosted)
+ target.acid_act(42, 10) // 42 is the acid power of facid, 10 is equal to 100 units.
+ if(!iscarbon(target))
+ return ..()
+ var/mob/living/carbon/C = target
+ if(isalien(target))
+ if(!xenomorph_acid_boosted)
+ if(C.ckey && C.stat != DEAD)
+ to_chat(user, "As [C] bleeds acid, you mix it into your claws!")
+ xenomorph_acid_boosted = TRUE
+ durability += 5 // Small boost in durability once.
+ blood_drain_amount *= 1.5
+ blood_absorbed_amount *= 1.5
+ force *= 1.5 // 15 force
+ heal_boost = 2 // This *might* let you survive xeno disarms. Maybe.
+ damtype = BURN
+ hitsound = 'sound/weapons/sear.ogg'
+ color = list(0.5,1,0,0, 0,1,0,0, 0,0,0.5,0, 0,0,0,1, 0,0,0,0) // This makes it coloured acidic green
+ user.update_inv_r_hand()
+ user.update_inv_l_hand()
+ if(C.ckey && C.stat != DEAD && C.affects_vampire())
+ if(isalien(C) || !(NO_BLOOD in C.dna.species.species_traits)) // second check runtimes if they are not a xenomorph, but we check xenomorph first
C.bleed(blood_drain_amount)
V.adjust_blood(C, blood_absorbed_amount)
- attacker.adjustStaminaLoss(-20) // security is dead
- attacker.heal_overall_damage(4, 4) // the station is full
- attacker.AdjustKnockDown(-1 SECONDS) // blood is fuel
- if(!V.get_ability(/datum/vampire_passive/blood_spill))
- durability--
- if(durability <= 0)
- qdel(src)
- to_chat(user, "Your claws shatter!")
+ attacker.adjustStaminaLoss(-20 * heal_boost) // security is dead
+ attacker.heal_overall_damage(4 * heal_boost, 4 * heal_boost) // the station is full
+ attacker.AdjustKnockDown(-1 SECONDS * heal_boost) // blood is fuel
+ if(!V.get_ability(/datum/vampire_passive/blood_spill))
+ durability--
+ if(durability <= 0)
+ qdel(src)
+ to_chat(user, "Your claws shatter!")
/obj/item/vamp_claws/melee_attack_chain(mob/user, atom/target, params)
..()
@@ -287,8 +307,12 @@
/datum/spell/vampire/predator_senses/cast(list/targets, mob/user)
var/targets_by_name = list()
for(var/mob/living/carbon/human/H as anything in targets)
+ if(H == user)
+ continue
targets_by_name[H.real_name] = H
-
+ if(!length(targets_by_name))
+ to_chat(user, "There is no prey to be hunted here...")
+ return
var/target_name = tgui_input_list(user, "Person to Locate", "Blood Stench", targets_by_name)
if(!target_name)
return
diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index 86cd73ec61b5..aa1abcaf9798 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -574,21 +574,19 @@ What are the archived variables for?
var/energy_released = 0
var/old_heat_capacity = heat_capacity()
var/burned_fuel = 0
+ burned_fuel = min((1 - (N2O_DECOMPOSITION_COEFFICIENT_A / ((private_temperature + N2O_DECOMPOSITION_COEFFICIENT_C) ** 2))) * private_sleeping_agent, private_sleeping_agent)
+ private_sleeping_agent -= burned_fuel
- burned_fuel = max(0, 0.00002 * (private_temperature - (0.00001 * (private_temperature ** 2)))) * private_sleeping_agent
- if(private_sleeping_agent - burned_fuel > 0)
- private_sleeping_agent -= burned_fuel
+ if(burned_fuel)
+ energy_released += (N2O_DECOMPOSITION_ENERGY_RELEASED * burned_fuel)
- if(burned_fuel)
- energy_released += (N2O_DECOMPOSITION_ENERGY_RELEASED * burned_fuel)
+ private_oxygen += burned_fuel * 0.5
+ private_nitrogen += burned_fuel
- private_oxygen += burned_fuel * 0.5
- private_nitrogen += burned_fuel
-
- var/new_heat_capacity = heat_capacity()
- if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
- private_temperature = (private_temperature * old_heat_capacity + energy_released) / new_heat_capacity
- reacting = TRUE
+ var/new_heat_capacity = heat_capacity()
+ if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
+ private_temperature = (private_temperature * old_heat_capacity + energy_released) / new_heat_capacity
+ reacting = TRUE
fuel_burnt = 0
//Handle plasma burning
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 1363484743c7..4b8b4c2288f2 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -209,7 +209,9 @@
set_pixel_offsets_from_dir(24, -24, 24, -24)
GLOB.air_alarms += src
- GLOB.air_alarms = sortAtom(GLOB.air_alarms)
+
+ if(!mapload)
+ GLOB.air_alarms = sortAtom(GLOB.air_alarms)
wires = new(src)
diff --git a/code/modules/atmospherics/machinery/atmospherics.dm b/code/modules/atmospherics/machinery/atmospherics.dm
index a42659c1302c..21f7103bab23 100644
--- a/code/modules/atmospherics/machinery/atmospherics.dm
+++ b/code/modules/atmospherics/machinery/atmospherics.dm
@@ -106,7 +106,7 @@ Pipelines + Other Objects -> Pipe network
pipe_image.plane = HUD_PLANE
/obj/machinery/atmospherics/proc/check_icon_cache()
- if(!istype(SSair.icon_manager))
+ if(!istype(GLOB.pipe_icon_manager))
return FALSE
return TRUE
@@ -121,17 +121,14 @@ Pipelines + Other Objects -> Pipe network
/obj/machinery/atmospherics/proc/add_underlay(turf/T, obj/machinery/atmospherics/node, direction, icon_connect_type)
if(node)
if(T.intact && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe) && !T.transparent_floor)
- //underlays += SSair.icon_manager.get_atmos_icon("underlay_down", direction, color_cache_name(node))
- underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "down" + icon_connect_type)
+ underlays += GLOB.pipe_icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "down" + icon_connect_type)
else
- //underlays += SSair.icon_manager.get_atmos_icon("underlay_intact", direction, color_cache_name(node))
- underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "intact" + icon_connect_type)
+ underlays += GLOB.pipe_icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "intact" + icon_connect_type)
else
if(T.transparent_floor) //we want to keep pipes under transparent floors connected normally
- underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "intact" + icon_connect_type)
+ underlays += GLOB.pipe_icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "intact" + icon_connect_type)
else
- //underlays += SSair.icon_manager.get_atmos_icon("underlay_exposed", direction, pipe_color)
- underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "exposed" + icon_connect_type)
+ underlays += GLOB.pipe_icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "exposed" + icon_connect_type)
/obj/machinery/atmospherics/proc/update_underlays()
return check_icon_cache()
@@ -300,7 +297,7 @@ Pipelines + Other Objects -> Pipe network
level = (T.intact || !can_be_undertile) ? 2 : 1
else
level = 2
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
add_fingerprint(usr)
if(!SSair.initialized) //If there's no atmos subsystem, we can't really initialize pipenets
SSair.machinery_to_construct.Add(src)
@@ -401,14 +398,14 @@ Pipelines + Other Objects -> Pipe network
/obj/machinery/atmospherics/proc/add_underlay_adapter(turf/T, obj/machinery/atmospherics/node, direction, icon_connect_type) //modified from add_underlay, does not make exposed underlays
if(node)
if(T.intact && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe) && !T.transparent_floor)
- underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "down" + icon_connect_type)
+ underlays += GLOB.pipe_icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "down" + icon_connect_type)
else
- underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "intact" + icon_connect_type)
+ underlays += GLOB.pipe_icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "intact" + icon_connect_type)
else
if(T.transparent_floor) //we want to keep pipes under transparent floors connected normally
- underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "intact" + icon_connect_type)
+ underlays += GLOB.pipe_icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "intact" + icon_connect_type)
else
- underlays += SSair.icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "retracted" + icon_connect_type)
+ underlays += GLOB.pipe_icon_manager.get_atmos_icon("underlay", direction, color_cache_name(node), "retracted" + icon_connect_type)
/obj/machinery/atmospherics/singularity_pull(S, current_size)
if(current_size >= STAGE_FIVE)
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
index 1690df3deffe..599c9c3f1a32 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
@@ -10,7 +10,7 @@
var/open = FALSE
var/animating = FALSE
- req_one_access_txt = "24;10"
+ req_one_access = list(ACCESS_ENGINE, ACCESS_ATMOSPHERICS)
/obj/machinery/atmospherics/binary/valve/examine(mob/user)
. = ..()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index 6bf7a368259d..e252d7598b6a 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -87,7 +87,7 @@
else
vent_icon += "[on ? "[releasing ? "out" : "in"]" : "off"]"
- . += SSair.icon_manager.get_atmos_icon("device", state = vent_icon)
+ . += GLOB.pipe_icon_manager.get_atmos_icon("device", state = vent_icon)
update_pipe_image()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index 07a93295c0fa..5ba4847cf80a 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -82,7 +82,7 @@
if(welded)
scrubber_icon = "scrubberweld"
- . += SSair.icon_manager.get_atmos_icon("device", state = scrubber_icon)
+ . += GLOB.pipe_icon_manager.get_atmos_icon("device", state = scrubber_icon)
update_pipe_image()
/obj/machinery/atmospherics/unary/vent_scrubber/update_underlays()
diff --git a/code/modules/atmospherics/machinery/datum_icon_manager.dm b/code/modules/atmospherics/machinery/datum_icon_manager.dm
index f7a345a7c9a7..50e22fde14f1 100644
--- a/code/modules/atmospherics/machinery/datum_icon_manager.dm
+++ b/code/modules/atmospherics/machinery/datum_icon_manager.dm
@@ -1,3 +1,4 @@
+GLOBAL_DATUM_INIT(pipe_icon_manager, /datum/pipe_icon_manager, new)
//--------------------------------------------
// Pipe colors
//
@@ -7,15 +8,15 @@
//--------------------------------------------
/proc/pipe_color_lookup(color)
- for(var/C in GLOB.pipe_colors)
- if(color == GLOB.pipe_colors[C])
+ for(var/C in GLOB.pipe_icon_manager.pipe_colors)
+ if(color == GLOB.pipe_icon_manager.pipe_colors[C])
return "[C]"
/proc/pipe_color_check(color)
if(!color)
return 1
- for(var/C in GLOB.pipe_colors)
- if(color == GLOB.pipe_colors[C])
+ for(var/C in GLOB.pipe_icon_manager.pipe_colors)
+ if(color == GLOB.pipe_icon_manager.pipe_colors[C])
return 1
return 0
@@ -28,11 +29,16 @@
var/list/manifold_icons[]
var/list/device_icons[]
var/list/underlays[]
- //var/list/underlays_down[]
- //var/list/underlays_exposed[]
- //var/list/underlays_intact[]
- //var/list/pipe_underlays_exposed[]
- //var/list/pipe_underlays_intact[]
+
+ var/list/pipe_colors = list(
+ "blue" = PIPE_COLOR_BLUE,
+ "cyan" = PIPE_COLOR_CYAN,
+ "green" = PIPE_COLOR_GREEN,
+ "grey" = PIPE_COLOR_GREY,
+ "purple" = PIPE_COLOR_PURPLE,
+ "red" = PIPE_COLOR_RED,
+ "yellow" = PIPE_COLOR_YELLOW,
+ )
/datum/pipe_icon_manager/New()
check_icons()
@@ -54,16 +60,6 @@
return device_icons[state]
if("underlay")
return underlays[state + dir + color]
- //if("underlay_intact")
- // return underlays_intact[state + dir + color]
- // if("underlay_exposed")
- // return underlays_exposed[state + dir + color]
- // if("underlay_down")
- // return underlays_down[state + dir + color]
- // if("pipe_underlay_exposed")
- // return pipe_underlays_exposed[state + dir + color]
- // if("pipe_underlay_intact")
- // return pipe_underlays_intact[state + dir + color]
/datum/pipe_icon_manager/proc/check_icons()
if(!pipe_icons)
@@ -72,7 +68,6 @@
gen_manifold_icons()
if(!device_icons)
gen_device_icons()
- //if(!underlays_intact || !underlays_down || !underlays_exposed || !pipe_underlays_exposed || !pipe_underlays_intact)
if(!underlays)
gen_underlay_icons()
@@ -90,10 +85,10 @@
var/image/I = image('icons/atmos/pipes.dmi', icon_state = state)
pipe_icons[cache_name] = I
- for(var/pipe_color in GLOB.pipe_colors)
+ for(var/pipe_color in pipe_colors)
I = image('icons/atmos/pipes.dmi', icon_state = state)
- I.color = GLOB.pipe_colors[pipe_color]
- pipe_icons[state + "[GLOB.pipe_colors[pipe_color]]"] = I
+ I.color = pipe_colors[pipe_color]
+ pipe_icons[state + "[pipe_colors[pipe_color]]"] = I
pipe = new ('icons/atmos/heat.dmi')
for(var/state in pipe.IconStates())
@@ -122,10 +117,10 @@
if(findtext(state, "core") || findtext(state, "4way"))
var/image/I = image('icons/atmos/manifold.dmi', icon_state = state)
manifold_icons[state] = I
- for(var/pipe_color in GLOB.pipe_colors)
+ for(var/pipe_color in pipe_colors)
I = image('icons/atmos/manifold.dmi', icon_state = state)
- I.color = GLOB.pipe_colors[pipe_color]
- manifold_icons[state + GLOB.pipe_colors[pipe_color]] = I
+ I.color = pipe_colors[pipe_color]
+ manifold_icons[state + pipe_colors[pipe_color]] = I
/datum/pipe_icon_manager/proc/gen_device_icons()
if(!device_icons)
@@ -161,7 +156,7 @@
for(var/D in GLOB.cardinal)
var/image/I = image(icon('icons/atmos/pipe_underlays.dmi', icon_state = state, dir = D), layer = GAS_PIPE_HIDDEN_LAYER)
underlays[cache_name + "[D]"] = I
- for(var/pipe_color in GLOB.pipe_colors)
+ for(var/pipe_color in pipe_colors)
I = image(icon('icons/atmos/pipe_underlays.dmi', icon_state = state, dir = D), layer = GAS_PIPE_HIDDEN_LAYER)
- I.color = GLOB.pipe_colors[pipe_color]
- underlays[state + "[D]" + "[GLOB.pipe_colors[pipe_color]]"] = I
+ I.color = pipe_colors[pipe_color]
+ underlays[state + "[D]" + "[pipe_colors[pipe_color]]"] = I
diff --git a/code/modules/atmospherics/machinery/pipes/cap.dm b/code/modules/atmospherics/machinery/pipes/cap.dm
index d3a7c7064213..ec2ba5d34242 100644
--- a/code/modules/atmospherics/machinery/pipes/cap.dm
+++ b/code/modules/atmospherics/machinery/pipes/cap.dm
@@ -60,7 +60,7 @@
/obj/machinery/atmospherics/pipe/cap/update_overlays()
. = ..()
alpha = 255
- . += SSair.icon_manager.get_atmos_icon("pipe", null, pipe_color, "cap" + icon_connect_type)
+ . += GLOB.pipe_icon_manager.get_atmos_icon("pipe", null, pipe_color, "cap" + icon_connect_type)
/obj/machinery/atmospherics/pipe/cap/atmos_init()
..()
diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm
index c8a59b5784c3..a8e5c4611aaa 100644
--- a/code/modules/atmospherics/machinery/pipes/manifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/manifold.dm
@@ -116,8 +116,8 @@
/obj/machinery/atmospherics/pipe/manifold/update_overlays()
. = ..()
alpha = 255
- . += SSair.icon_manager.get_atmos_icon("manifold", null, pipe_color, "core" + icon_connect_type)
- . += SSair.icon_manager.get_atmos_icon("manifold", null, null, "clamps" + icon_connect_type)
+ . += GLOB.pipe_icon_manager.get_atmos_icon("manifold", null, pipe_color, "core" + icon_connect_type)
+ . += GLOB.pipe_icon_manager.get_atmos_icon("manifold", null, null, "clamps" + icon_connect_type)
update_underlays()
/obj/machinery/atmospherics/pipe/manifold/update_underlays()
diff --git a/code/modules/atmospherics/machinery/pipes/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/manifold4w.dm
index 000a6fb21900..e63db8c3bc10 100644
--- a/code/modules/atmospherics/machinery/pipes/manifold4w.dm
+++ b/code/modules/atmospherics/machinery/pipes/manifold4w.dm
@@ -89,8 +89,8 @@
/obj/machinery/atmospherics/pipe/manifold4w/update_overlays()
. = ..()
alpha = 255
- . += SSair.icon_manager.get_atmos_icon("manifold", null, pipe_color, "4way" + icon_connect_type)
- . += SSair.icon_manager.get_atmos_icon("manifold", null, null, "clamps_4way" + icon_connect_type)
+ . += GLOB.pipe_icon_manager.get_atmos_icon("manifold", null, pipe_color, "4way" + icon_connect_type)
+ . += GLOB.pipe_icon_manager.get_atmos_icon("manifold", null, null, "clamps_4way" + icon_connect_type)
update_underlays()
/obj/machinery/atmospherics/pipe/manifold4w/update_underlays()
diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm
index 477ccab1455c..315048464d4d 100644
--- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm
+++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm
@@ -122,9 +122,9 @@
. = ..()
alpha = 255
if(node1 && node2)
- . += SSair.icon_manager.get_atmos_icon("pipe", null, pipe_color, pipe_icon + "intact" + icon_connect_type)
+ . += GLOB.pipe_icon_manager.get_atmos_icon("pipe", null, pipe_color, pipe_icon + "intact" + icon_connect_type)
else
- . += SSair.icon_manager.get_atmos_icon("pipe", null, pipe_color, pipe_icon + "exposed[node1?1:0][node2?1:0]" + icon_connect_type)
+ . += GLOB.pipe_icon_manager.get_atmos_icon("pipe", null, pipe_color, pipe_icon + "exposed[node1?1:0][node2?1:0]" + icon_connect_type)
// A check to make sure both nodes exist - self-delete if they aren't present
/obj/machinery/atmospherics/pipe/simple/check_nodes_exist()
diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm
index 98fdb86546b8..4a62c341c912 100644
--- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm
+++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm
@@ -49,7 +49,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/universal/update_overlays()
. = list()
alpha = 255
- . += SSair.icon_manager.get_atmos_icon("pipe", color = pipe_color, state = "universal")
+ . += GLOB.pipe_icon_manager.get_atmos_icon("pipe", color = pipe_color, state = "universal")
update_underlays()
/obj/machinery/atmospherics/pipe/simple/hidden/universal/update_underlays()
diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm
index 42259af6e6d6..27d1a0df0ad8 100644
--- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm
+++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm
@@ -66,7 +66,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/universal/update_overlays()
. = list()
alpha = 255
- . += SSair.icon_manager.get_atmos_icon("pipe", color = pipe_color, state = "universal")
+ . += GLOB.pipe_icon_manager.get_atmos_icon("pipe", color = pipe_color, state = "universal")
update_underlays()
/obj/machinery/atmospherics/pipe/simple/visible/universal/update_underlays()
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 7826aed76402..ccefb2f7f983 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -1,5 +1,7 @@
/datum/canister_icons
- var/list/possiblemaincolor = list( //these lists contain the possible colors of a canister
+ // these lists contain the possible colors of a canister
+
+ var/list/possiblemaincolor = list(
list("name" = "\[N2O\]", "icon" = "redws"),
list("name" = "\[N2\]", "icon" = "red"),
list("name" = "\[O2\]", "icon" = "blue"),
@@ -10,7 +12,8 @@
list("name" = "\[SPECIAL\]", "icon" = "whiters")
)
- var/list/possibleseccolor = list( // no point in having the N2O and "whiters" ones in these lists
+ // no point in having the N2O and "whiters" ones in these lists
+ var/list/possibleseccolor = list(
list("name" = "\[None\]", "icon" = "none"),
list("name" = "\[N2\]", "icon" = "red-c"),
list("name" = "\[O2\]", "icon" = "blue-c"),
diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm
index b4a654396e73..198621034bf4 100644
--- a/code/modules/awaymissions/maploader/reader.dm
+++ b/code/modules/awaymissions/maploader/reader.dm
@@ -35,7 +35,15 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new())
if(lastchar == "/" || lastchar == "\\")
log_debug("Attempted to load map template without filename (Attempted [tfile])")
return
- tfile = wrap_file2text(tfile)
+
+ // use rustlib to read, parse, process, mapmanip etc
+ // this will "crash"/stacktrace on fail
+ tfile = mapmanip_read_dmm(fname)
+ // if rustlib for whatever reason fails and returns null
+ // try to load it the old dm way instead
+ if(!tfile)
+ tfile = wrap_file2text(fname)
+
if(!length(tfile))
throw EXCEPTION("Map path '[fname]' does not exist!")
diff --git a/code/modules/awaymissions/mission_code/ghost_role_spawners/golems.dm b/code/modules/awaymissions/mission_code/ghost_role_spawners/golems.dm
index 81b51ad36e97..bc23091f65c4 100644
--- a/code/modules/awaymissions/mission_code/ghost_role_spawners/golems.dm
+++ b/code/modules/awaymissions/mission_code/ghost_role_spawners/golems.dm
@@ -208,3 +208,4 @@
mob_name = "a free golem"
can_transfer = FALSE
mob_species = /datum/species/golem/adamantine
+ assignedrole = "Free Golem"
diff --git a/code/modules/awaymissions/mission_code/ruins/deepstorage.dm b/code/modules/awaymissions/mission_code/ruins/deepstorage.dm
index dfb0931dbe0d..2da93a61bfd5 100644
--- a/code/modules/awaymissions/mission_code/ruins/deepstorage.dm
+++ b/code/modules/awaymissions/mission_code/ruins/deepstorage.dm
@@ -282,6 +282,26 @@
name = "portal"
desc = "Good luck."
+// loot spawners
+
+/obj/effect/spawner/random/deepstorage_reward
+ name = "warehouse fashion reward"
+ loot = list(
+ /obj/item/storage/box/syndie_kit/chameleon,
+ /obj/item/clothing/suit/pimpcoat,
+ /obj/item/melee/skateboard/hoverboard,
+ /obj/item/clothing/glasses/sunglasses/yeah
+ )
+
+/obj/effect/spawner/random/deepstorage_reward/main
+ name = "warehouse main reward"
+ loot = list(
+ /obj/item/storage/belt/champion/wrestling,
+ /obj/item/storage/box/weaver_kit,
+ /obj/item/gun/medbeam,
+ /obj/item/storage/lockbox/experimental_weapon
+ )
+
// paper stuff & lore
/obj/item/paper/fluff/ruins/deepstorage/log1
@@ -376,15 +396,5 @@
name = "attention"
info = {"As per administration's order, unauthorized entry to supply storage is forbidden. Make your requests from the guard wing if you have a pending delivery."}
-/obj/effect/spawner/random/deepstorage_award
- name = "boss award"
- icon_state = "questionmark"
- loot = list(
- /obj/item/rod_of_asclepius = 3,
- /obj/item/storage/box/syndie_kit/chameleon = 3,
- /obj/item/storage/belt/champion/wrestling = 1,
- /obj/item/storage/box/telescience = 1,
- )
-
#undef DS_BOSS_STORAGE
#undef DS_ENGINEERING
diff --git a/code/modules/awaymissions/mission_code/ruins/telecomns.dm b/code/modules/awaymissions/mission_code/ruins/telecomns.dm
index d151dfa849e9..117bd99d7e54 100644
--- a/code/modules/awaymissions/mission_code/ruins/telecomns.dm
+++ b/code/modules/awaymissions/mission_code/ruins/telecomns.dm
@@ -430,7 +430,8 @@ GLOBAL_LIST_EMPTY(telecomms_trap_tank)
/obj/structure/environmental_storytelling_holopad/proc/start_message(mob/living/carbon/human/H)
activated = TRUE
- qdel(GetComponent(/datum/component/proximity_monitor))
+ DeleteComponent(/datum/component/proximity_monitor)
+
icon_state = "holopad1"
update_icon(UPDATE_OVERLAYS)
var/obj/effect/overlay/hologram = new(get_turf(src))
diff --git a/code/modules/awaymissions/mob_spawn.dm b/code/modules/awaymissions/mob_spawn.dm
index 1741cdb69f17..bc1991d71532 100644
--- a/code/modules/awaymissions/mob_spawn.dm
+++ b/code/modules/awaymissions/mob_spawn.dm
@@ -4,11 +4,6 @@
// To do: Allow customizing the bodies appearance (they're all bald and white right now).
-/// this mob spawn creates the corpse instantly
-#define CORPSE_INSTANT 1
-/// this mob spawn creates the corpse during GAME_STATE_PLAYING
-#define CORPSE_ROUNDSTART 2
-
/obj/effect/mob_spawn
name = "Unknown"
density = TRUE
@@ -55,6 +50,8 @@
return
create(ckey = user.ckey, user = user)
+ return TRUE
+
/obj/effect/mob_spawn/Initialize(mapload)
. = ..()
if(instant || roundstart) //at some point we should probably re-introduce the (ticker && ticker.current_state > GAME_STATE_SETTING_UP) portion of this check, but for now it was preventing the corpses from spawning at roundstart and resulting in ghost role spawners that made dead bodies.
@@ -670,50 +667,13 @@
ADD_TRAIT(H, TRAIT_NON_INFECTIOUS_ZOMBIE, ROUNDSTART_TRAIT)
return ..()
-////////Non-human spawners////////
-
-/obj/effect/mob_spawn/mouse
- name = "sleeper"
- mob_name = "space mouse"
- mob_type = /mob/living/simple_animal/mouse
- death = FALSE
- roundstart = FALSE
- icon = 'icons/obj/cryogenic2.dmi'
- icon_state = "sleeper"
- flavour_text = "Squeak!"
-
-/obj/effect/mob_spawn/cow
- name = "sleeper"
- mob_name = "space cow"
- mob_type = /mob/living/simple_animal/cow
- death = FALSE
- roundstart = FALSE
- mob_gender = FEMALE
- icon = 'icons/obj/cryogenic2.dmi'
- icon_state = "sleeper"
- flavour_text = "Moo!"
-
/// these mob spawn subtypes trigger immediately (New or Initialize) and are not player controlled... since they're dead, you know?
/obj/effect/mob_spawn/corpse
- /// when this mob spawn should auto trigger.
- var/spawn_when = CORPSE_INSTANT
-
/// what environmental storytelling script should this corpse have
var/corpse_description = ""
/// optionally different text to display if the target is a clown
var/naive_corpse_description = ""
-/obj/effect/mob_spawn/corpse/Initialize(mapload, no_spawn)
- . = ..()
- if(no_spawn)
- return
- switch(spawn_when)
- if(CORPSE_INSTANT)
- INVOKE_ASYNC(src, PROC_REF(create))
- if(CORPSE_ROUNDSTART)
- if(mapload || (SSticker && SSticker.current_state > GAME_STATE_SETTING_UP))
- INVOKE_ASYNC(src, PROC_REF(create))
-
/obj/effect/mob_spawn/corpse/special(mob/living/spawned_mob)
. = ..()
spawned_mob.death(TRUE)
@@ -735,7 +695,3 @@
icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
icon_state = "goliath_dead"
pixel_x = -12
-
-
-#undef CORPSE_INSTANT
-#undef CORPSE_ROUNDSTART
diff --git a/code/modules/client/preference/link_processing.dm b/code/modules/client/preference/link_processing.dm
index 0656ec4750a8..81f589bd36ac 100644
--- a/code/modules/client/preference/link_processing.dm
+++ b/code/modules/client/preference/link_processing.dm
@@ -322,7 +322,7 @@
active_character.metadata = new_metadata
if("b_type")
- var/new_b_type = tgui_input_list(user, "Choose your character's blood-type", "Character Preference", list( "A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-"))
+ var/new_b_type = tgui_input_list(user, "Choose your character's blood-type", "Character Preference", list("A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-"))
if(!new_b_type)
return
active_character.b_type = new_b_type
diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm
index 547f443981e9..97fdfaad69d2 100644
--- a/code/modules/client/preference/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference/loadout/loadout_uniform.dm
@@ -102,6 +102,86 @@
display_name = "Jumpsuit, darkred"
path = /obj/item/clothing/under/color/darkred
+/datum/gear/uniform/suit/jumpskirtblack
+ display_name = "Jumpskirt, black"
+ path = /obj/item/clothing/under/color/jumpskirt/black
+
+/datum/gear/uniform/suit/jumpskirtblue
+ display_name = "Jumpskirt, blue"
+ path = /obj/item/clothing/under/color/jumpskirt/blue
+
+/datum/gear/uniform/suit/jumpskirtgreen
+ display_name = "Jumpskirt, green"
+ path = /obj/item/clothing/under/color/jumpskirt/green
+
+/datum/gear/uniform/suit/jumpskirtgrey
+ display_name = "Jumpskirt, grey"
+ path = /obj/item/clothing/under/color/jumpskirt/grey
+
+/datum/gear/uniform/suit/jumpskirtorange
+ display_name = "Jumpskirt, orange"
+ path = /obj/item/clothing/under/color/jumpskirt/orange
+
+/datum/gear/uniform/suit/jumpskirtpink
+ display_name = "Jumpskirt, pink"
+ path = /obj/item/clothing/under/color/jumpskirt/pink
+
+/datum/gear/uniform/suit/jumpskirtred
+ display_name = "Jumpskirt, red"
+ path = /obj/item/clothing/under/color/jumpskirt/red
+
+/datum/gear/uniform/suit/jumpskirtwhite
+ display_name = "Jumpskirt, white"
+ path = /obj/item/clothing/under/color/jumpskirt/white
+
+/datum/gear/uniform/suit/jumpskirtyellow
+ display_name = "Jumpskirt, yellow"
+ path = /obj/item/clothing/under/color/jumpskirt/yellow
+
+/datum/gear/uniform/suit/jumpskirtlightblue
+ display_name = "Jumpskirt, lightblue"
+ path = /obj/item/clothing/under/color/jumpskirt/lightblue
+
+/datum/gear/uniform/suit/jumpskirtaqua
+ display_name = "Jumpskirt, aqua"
+ path = /obj/item/clothing/under/color/jumpskirt/aqua
+
+/datum/gear/uniform/suit/jumpskirtpurple
+ display_name = "Jumpskirt, purple"
+ path = /obj/item/clothing/under/color/jumpskirt/purple
+
+/datum/gear/uniform/suit/jumpskirtlightpurple
+ display_name = "Jumpskirt, lightpurple"
+ path = /obj/item/clothing/under/color/jumpskirt/lightpurple
+
+/datum/gear/uniform/suit/jumpskirtlightgreen
+ display_name = "Jumpskirt, lightgreen"
+ path = /obj/item/clothing/under/color/jumpskirt/lightgreen
+
+/datum/gear/uniform/suit/jumpskirtlightbrown
+ display_name = "Jumpskirt, lightbrown"
+ path = /obj/item/clothing/under/color/jumpskirt/lightbrown
+
+/datum/gear/uniform/suit/jumpskirtbrown
+ display_name = "Jumpskirt, brown"
+ path = /obj/item/clothing/under/color/jumpskirt/brown
+
+/datum/gear/uniform/suit/jumpskirtyellowgreen
+ display_name = "Jumpskirt, yellowgreen"
+ path = /obj/item/clothing/under/color/jumpskirt/yellowgreen
+
+/datum/gear/uniform/suit/jumpskirtdarkblue
+ display_name = "Jumpskirt, darkblue"
+ path = /obj/item/clothing/under/color/jumpskirt/darkblue
+
+/datum/gear/uniform/suit/jumpskirtlightred
+ display_name = "Jumpskirt, lightred"
+ path = /obj/item/clothing/under/color/jumpskirt/lightred
+
+/datum/gear/uniform/suit/jumpskirtdarkred
+ display_name = "Jumpskirt, darkred"
+ path = /obj/item/clothing/under/color/jumpskirt/darkred
+
/datum/gear/uniform/suit/soviet
display_name = "Old USSP uniform"
path = /obj/item/clothing/under/costume/soviet
diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index 178c8f3bcb76..828303414901 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -1,4 +1,5 @@
-GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts to play these roles
+/// Minimum age (in days) for accounts to play these roles.
+GLOBAL_LIST_INIT(special_role_times, list(
ROLE_PAI = 0,
ROLE_GUARDIAN = 0,
ROLE_TRAITOR = 7,
@@ -87,7 +88,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
"1016" = 100, // CHANNEL_FIREALARM
"1015" = 100, // CHANNEL_ASH_STORM
"1014" = 100, // CHANNEL_RADIO_NOISE
- "1013" = 100 // CHANNEL_BOSS_MUSIC
+ "1013" = 100, // CHANNEL_BOSS_MUSIC
+ "1011" = 100 // CHANNEL_SURGERY_SOUNDS
)
/// The volume mixer save timer handle. Used to debounce the DB call to save, to avoid spamming.
var/volume_mixer_saving = null
diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm
index 84d14fbc80c3..9f4adb3e96d9 100644
--- a/code/modules/client/preference/preferences_toggles.dm
+++ b/code/modules/client/preference/preferences_toggles.dm
@@ -114,7 +114,7 @@
preftoggle_bitflag = SOUND_MENTORHELP
preftoggle_toggle = PREFTOGGLE_SOUND
preftoggle_category = PREFTOGGLE_CATEGORY_ADMIN
- rights_required = R_MENTOR
+ rights_required = R_MENTOR | R_ADMIN
enable_message = "You will now hear a sound when mentorhelp is sent."
disable_message = "You will no longer hear a sound when mentorhelp is sent."
blackbox_message = "Toggle Mentor Bwoinks"
@@ -564,13 +564,16 @@
. = ..()
if(length(user.screen))
var/atom/movable/screen/plane_master/exposure/exposure_master = locate() in user.screen
- var/atom/movable/screen/plane_master/lamps_selfglow/glow_master = locate() in user.screen
- var/atom/movable/screen/plane_master/lamps_glare/glare_master = locate() in user.screen
exposure_master.alpha = user.prefs.light & LIGHT_NEW_LIGHTING ? 255 : 0
exposure_master.backdrop(user.mob)
- glow_master.backdrop(user.mob)
- glare_master.backdrop(user.mob)
+
+ for(var/atom/movable/screen/plane_master/lamps_selfglow/glow_master in user.screen)
+ glow_master.backdrop(user.mob)
+
+ for(var/atom/movable/screen/plane_master/lamps_glare/glare_master in user.screen)
+ glare_master.backdrop(user.mob)
+
/datum/preference_toggle/special_toggle/set_glow_level
name = "Set Glow Level"
@@ -591,8 +594,8 @@
user.prefs.glowlevel = glow_levels[new_level]
to_chat(usr, "Glow level: [new_level].")
if(length(user.screen))
- var/atom/movable/screen/plane_master/lamps_selfglow/glow_master = locate() in user.screen
- glow_master.backdrop(user.mob)
+ for(var/atom/movable/screen/plane_master/lamps_selfglow/glow_master in user.screen)
+ glow_master.backdrop(user.mob)
return ..()
/datum/preference_toggle/toggle_lamp_exposure
@@ -623,6 +626,7 @@
/datum/preference_toggle/toggle_lamps_glare/set_toggles(client/user)
. = ..()
- if(length(user.screen))
- var/atom/movable/screen/plane_master/lamps_glare/glare_master = locate() in user.screen
+ if(!length(user.screen))
+ return
+ for(var/atom/movable/screen/plane_master/lamps_glare/glare_master in user.screen)
glare_master.backdrop(user.mob)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 672e5a445841..26ec24b69ccd 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -281,7 +281,8 @@
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
- "Drask" = 'icons/mob/clothing/species/drask/gloves.dmi'
+ "Drask" = 'icons/mob/clothing/species/drask/gloves.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi'
)
// Called just before an attack_hand(), in mob/UnarmedAttack()
@@ -398,11 +399,153 @@
var/vision_flags = 0
var/see_in_dark = 0
var/lighting_alpha
+ /// the head clothing that this item may be attached to.
+ var/obj/item/clothing/under/has_under = null
+ /// the attached hats to this hat.
+ var/list/attached_hats = list()
+ /// if this hat can have hats placed on top of it.
+ var/can_have_hats = FALSE
+ /// if this hat can be a hat of a hat. Hat^2
+ var/can_be_hat = TRUE
/obj/item/clothing/head/update_icon_state()
if(..())
item_state = "[replacetext("[item_state]", "_up", "")][up ? "_up" : ""]"
+/obj/item/clothing/head/AltShiftClick(mob/user)
+ if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
+ return
+ if(!length(attached_hats))
+ return
+ var/obj/item/clothing/head/hat
+ if(length(attached_hats) > 1)
+ var/pick = radial_menu_helper(usr, src, attached_hats, custom_check = FALSE, require_near = TRUE)
+ if(!pick || !istype(pick, /obj/item/clothing/head) || !Adjacent(usr))
+ return
+ hat = pick
+ else
+ hat = attached_hats[1]
+ remove_hat(user, hat)
+
+/obj/item/clothing/head/Destroy()
+ if(is_equipped())
+ var/mob/M = loc
+ for(var/obj/item/clothing/head/H as anything in attached_hats)
+ H.on_removed(M)
+ else
+ for(var/obj/item/clothing/head/H as anything in attached_hats)
+ H.forceMove(get_turf(src))
+ attached_hats = null
+ return ..()
+
+/obj/item/clothing/head/dropped(mob/user, silent)
+ ..()
+ if(!ishuman(user))
+ return
+ var/mob/living/carbon/human/H = user
+ if(H.get_item_by_slot(SLOT_HUD_HEAD) == src)
+ for(var/obj/item/clothing/head/hat as anything in attached_hats)
+ hat.attached_unequip()
+
+/obj/item/clothing/head/examine(mob/user)
+ . = ..()
+ for(var/obj/item/clothing/head/hat as anything in attached_hats)
+ . += "\A [hat] is placed neatly on top."
+
+//when user attached a hat to H (another hat)
+/obj/item/clothing/head/proc/on_attached(obj/item/clothing/head/H, mob/user as mob)
+ if(!istype(H))
+ return
+ has_under = H
+ forceMove(has_under)
+ has_under.overlays += item_state
+ has_under.actions += actions
+
+ for(var/datum/action/A in actions)
+ if(has_under.is_equipped())
+ var/mob/M = has_under.loc
+ A.Grant(M)
+
+ if(user)
+ to_chat(user, "You attach [src] to [has_under].")
+ add_fingerprint(user)
+
+/obj/item/clothing/head/proc/on_removed(mob/user)
+ if(!has_under)
+ return
+ has_under.overlays -= icon_state
+ has_under.actions -= actions
+
+ for(var/datum/action/A in actions)
+ if(ismob(has_under.loc))
+ var/mob/M = has_under.loc
+ A.Remove(M)
+
+ has_under = null
+ if(user)
+ user.put_in_hands(src)
+ add_fingerprint(user)
+
+/obj/item/clothing/head/proc/detach_hat(obj/item/clothing/head/hat, mob/user)
+ attached_hats -= hat
+ hat.on_removed(user)
+ if(ishuman(loc))
+ var/mob/living/carbon/human/H = loc
+ H.update_inv_head()
+
+/obj/item/clothing/head/proc/remove_hat(mob/user, obj/item/clothing/head/hat)
+ if(!(hat in attached_hats))
+ return
+ if(!isliving(user))
+ return
+ if(user.incapacitated())
+ return
+ if(!Adjacent(user))
+ return
+ detach_hat(hat, user)
+ to_chat(user, "You remove [hat] from [src].")
+
+/obj/item/clothing/head/proc/attached_unequip(mob/user) // If we need to do something special when clothing is removed from the user
+ return
+
+/obj/item/clothing/head/proc/attached_equip(mob/user) // If we need to do something special when clothing is removed from the user
+ return
+
+/*
+ * # can_attach_hat
+ *
+ * Arguments:
+ * * Hat - The clothing/head object being checked. MUST BE TYPE /obj/item/clothing/head
+*/
+/obj/item/clothing/head/proc/can_attach_hat(obj/item/clothing/head/hat)
+ return length(attached_hats) < 1 && can_have_hats && hat.can_be_hat // this hat already has a hat or cannot be a hat of a hat!
+
+/obj/item/clothing/head/proc/attach_hat(obj/item/clothing/head/hat, mob/user, unequip = FALSE)
+ if(can_attach_hat(hat))
+ if(unequip && !user.unEquip(hat)) // Make absolutely sure this hat is removed from hands
+ return FALSE
+
+ attached_hats += hat
+ hat.on_attached(src, user)
+
+ if(ishuman(loc))
+ var/mob/living/carbon/human/H = loc
+ H.update_inv_head()
+
+ return TRUE
+ else if(hat.has_under)
+ return FALSE
+ else
+ to_chat(user, "You cannot place [hat] ontop of [src].")
+
+ return FALSE
+
+/obj/item/clothing/head/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/clothing/head) && can_have_hats)
+ attach_hat(I, user, TRUE)
+
+ return ..()
+
//////////////////////////////
// MARK: MASK
//////////////////////////////
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index f63c0f0c727a..b24eff63868a 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -296,35 +296,35 @@
//Commander
/obj/item/clothing/head/helmet/ert/command
name = "emergency response team commander helmet"
- desc = "An in-atmosphere helmet worn by the commander of a Nanotrasen Emergency Response Team. Has blue highlights."
+ desc = "A mid-quality combat helmet produced by Citadel Armories. The visor is made of toughened plastic and the radio antenna is entirely decorative. This one has chipped blue Command stripes."
icon_state = "erthelmet_cmd"
//Security
/obj/item/clothing/head/helmet/ert/security
name = "emergency response team security helmet"
- desc = "An in-atmosphere helmet worn by security members of the Nanotrasen Emergency Response Team. Has red highlights."
+ desc = "A mid-quality combat helmet produced by Citadel Armories. The visor is made of toughened plastic and the radio antenna is entirely decorative. This one has chipped red Security stripes."
icon_state = "erthelmet_sec"
/obj/item/clothing/head/helmet/ert/security/paranormal
name = "paranormal emergency response team helmet"
- desc = "An in-atmosphere helmet worn by paranormal members of the Nanotrasen Emergency Response Team. Has crusader sigils."
+ desc = "An antique steel helmet that looks straight out of a poorly-funded documentary about the Crusades. Where the hell did they even find this?"
icon_state = "knight_templar"
item_state = "knight_templar"
//Engineer
/obj/item/clothing/head/helmet/ert/engineer
name = "emergency response team engineer helmet"
- desc = "An in-atmosphere helmet worn by engineering members of the Nanotrasen Emergency Response Team. Has orange highlights."
+ desc = "A mid-quality combat helmet produced by Citadel Armories. The visor is made of toughened plastic and the radio antenna is entirely decorative. This one has chipped orange Engineering stripes."
icon_state = "erthelmet_eng"
//Medical
/obj/item/clothing/head/helmet/ert/medical
name = "emergency response team medical helmet"
- desc = "A set of armor worn by medical members of the Nanotrasen Emergency Response Team. Has red and white highlights."
+ desc = "A mid-quality combat helmet produced by Citadel Armories. The visor is made of toughened plastic and the radio antenna is entirely decorative. This one has chipped white Medical stripes."
icon_state = "erthelmet_med"
//Janitorial
/obj/item/clothing/head/helmet/ert/janitor
name = "emergency response team janitor helmet"
- desc = "A set of armor worn by janitorial members of the Nanotrasen Emergency Response Team. Has red and white highlights."
+ desc = "A mid-quality combat helmet produced by Citadel Armories. The visor is made of toughened plastic and the radio antenna is entirely decorative. This one has chipped purple Janitorial stripes."
icon_state = "erthelmet_jan"
diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm
index 304a6c092f07..bc9ea7066eec 100644
--- a/code/modules/clothing/head/misc_hats.dm
+++ b/code/modules/clothing/head/misc_hats.dm
@@ -536,6 +536,7 @@
icon_state = "crown"
armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 10, BOMB = 0, RAD = 0, FIRE = INFINITY, ACID = 50)
resistance_flags = FIRE_PROOF
+ can_be_hat = FALSE
/obj/item/clothing/head/crown/fancy
name = "magnificent crown"
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index 308aea6b03c3..337d97ca8315 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -26,45 +26,46 @@
. = ..()
if(slot != SLOT_HUD_SHOES || !ishuman(user))
return
- check_mag_pulse()
+ check_mag_pulse(user)
/obj/item/clothing/shoes/magboots/dropped(mob/user, silent)
. = ..()
if(!ishuman(user))
return
- check_mag_pulse()
+ check_mag_pulse(user, removing = TRUE)
-/obj/item/clothing/shoes/magboots/attack_self(mob/user, forced = FALSE)
- toggle_magpulse(user, forced)
+/obj/item/clothing/shoes/magboots/attack_self(mob/user)
+ toggle_magpulse(user)
-/obj/item/clothing/shoes/magboots/proc/toggle_magpulse(mob/user, forced)
+/obj/item/clothing/shoes/magboots/proc/toggle_magpulse(mob/user, no_message)
if(magpulse) //magpulse and no_slip will always be the same value unless VV happens
REMOVE_TRAIT(user, TRAIT_NOSLIP, UID())
slowdown = slowdown_passive
else
- ADD_TRAIT(user, TRAIT_NOSLIP, UID())
+ if(user.get_item_by_slot(SLOT_HUD_SHOES) == src)
+ ADD_TRAIT(user, TRAIT_NOSLIP, UID())
slowdown = slowdown_active
magpulse = !magpulse
no_slip = !no_slip
if(multiple_icons)
icon_state = "[magboot_state][magpulse]"
- if(!forced)
+ if(!no_message)
to_chat(user, "You [magpulse ? "enable" : "disable"] the [magpulse_name].")
user.update_inv_shoes() //so our mob-overlays update
user.update_gravity(user.mob_has_gravity())
for(var/X in actions)
var/datum/action/A = X
A.UpdateButtons()
- check_mag_pulse(user)
+ check_mag_pulse(user, removing = (user.get_item_by_slot(SLOT_HUD_SHOES) != src))
-/obj/item/clothing/shoes/magboots/proc/check_mag_pulse(mob/user)
+/obj/item/clothing/shoes/magboots/proc/check_mag_pulse(mob/user, removing = FALSE)
if(!user)
return
- if(magpulse)
- ADD_TRAIT(user, TRAIT_MAGPULSE, "magboots")
+ if(magpulse && !removing)
+ ADD_TRAIT(user, TRAIT_MAGPULSE, "magboots[UID()]")
return
if(HAS_TRAIT(user, TRAIT_MAGPULSE)) // User has trait and the magboots were turned off, remove trait
- REMOVE_TRAIT(user, TRAIT_MAGPULSE, "magboots")
+ REMOVE_TRAIT(user, TRAIT_MAGPULSE, "magboots[UID()]")
/obj/item/clothing/shoes/magboots/examine(mob/user)
. = ..()
@@ -173,17 +174,17 @@
magpulse_name = "gripping ability"
magical = TRUE
-/obj/item/clothing/shoes/magboots/wizard/attack_self(mob/user)
+/obj/item/clothing/shoes/magboots/wizard/toggle_magpulse(mob/user, no_message)
if(!user)
return
if(!iswizard(user))
to_chat(user, "You poke the gem on [src]. Nothing happens.")
return
+ ..()
if(magpulse) //faint blue light when shoes are turned on gives a reason to turn them off when not needed in maint
- set_light(0)
- else
set_light(2, 1, LIGHT_COLOR_LIGHTBLUE)
- ..()
+ else
+ set_light(0)
/obj/item/clothing/shoes/magboots/gravity
@@ -229,7 +230,7 @@
else
. += "It is missing a gravitational anomaly core and a power cell."
-/obj/item/clothing/shoes/magboots/gravity/attack_self(mob/user)
+/obj/item/clothing/shoes/magboots/gravity/toggle_magpulse(mob/user, no_message)
if(!cell)
to_chat(user, "Your boots do not have a power cell!")
return
@@ -249,7 +250,7 @@
if(ishuman(loc))
var/mob/living/carbon/human/user = loc
to_chat(user, "[src] has ran out of charge, and turned off!")
- attack_self(user, TRUE)
+ toggle_magpulse(user, TRUE)
else
cell.use(power_consumption_rate)
@@ -313,7 +314,7 @@
style.remove(H)
if(magpulse)
to_chat(user, "As [src] are removed, they deactivate.")
- attack_self(user, TRUE)
+ toggle_magpulse(user, TRUE)
/obj/item/clothing/shoes/magboots/gravity/item_action_slot_check(slot)
if(slot == SLOT_HUD_SHOES)
@@ -340,11 +341,8 @@
return
var/atom/target = get_edge_target_turf(user, user.dir) //gets the user's direction
- var/do_callback = FALSE
- if(!user.flying)
- user.flying = TRUE
- do_callback = TRUE
- if(user.throw_at(target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE, callback = do_callback ? VARSET_CALLBACK(user, flying, FALSE) : null))
+ if(user.throw_at(target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE, callback = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(callback_remove_trait), user, TRAIT_FLYING, "gravity_boots")))
+ ADD_TRAIT(user, TRAIT_FLYING, "gravity_boots")
playsound(src, 'sound/effects/stealthoff.ogg', 50, TRUE, 1)
user.visible_message("[usr] dashes forward into the air!")
recharging_time = world.time + recharging_rate
diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm
index 5c66cd8382d3..eb4cb5436ab5 100644
--- a/code/modules/clothing/shoes/misc_shoes.dm
+++ b/code/modules/clothing/shoes/misc_shoes.dm
@@ -472,11 +472,8 @@
return
var/atom/target = get_edge_target_turf(user, user.dir) //gets the user's direction
- var/do_callback = FALSE
- if(!user.flying)
- user.flying = TRUE
- do_callback = TRUE
- if(user.throw_at(target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE, callback = do_callback ? VARSET_CALLBACK(user, flying, FALSE) : null))
+ if(user.throw_at(target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE, callback = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(callback_remove_trait), user, TRAIT_FLYING, "bhop_shoes")))
+ ADD_TRAIT(user, TRAIT_FLYING, "bhop_shoes")
playsound(src, 'sound/effects/stealthoff.ogg', 50, TRUE, 1)
user.visible_message("[usr] dashes forward into the air!")
recharging_time = world.time + recharging_rate
diff --git a/code/modules/clothing/spacesuits/ert_hardsuits.dm b/code/modules/clothing/spacesuits/ert_hardsuits.dm
index d14f22f8238e..84961e9cd940 100644
--- a/code/modules/clothing/spacesuits/ert_hardsuits.dm
+++ b/code/modules/clothing/spacesuits/ert_hardsuits.dm
@@ -1,7 +1,7 @@
/obj/item/clothing/head/helmet/space/hardsuit/ert
name = "emergency response team helmet"
- desc = "A helmet worn by members of the Nanotrasen Emergency Response Team. Armoured and space ready."
+ desc = "An environmentally sealed combat helmet with a wide plexiglass visor for maximum visibility."
icon_state = "hardsuit0-ert_commander"
item_state = "helm-command"
item_color = "ert_commander"
@@ -53,7 +53,7 @@
/obj/item/clothing/suit/space/hardsuit/ert
name = "emergency response team suit"
- desc = "A suit worn by members of the Nanotrasen Emergency Response Team. Armoured, space ready, and fire resistant."
+ desc = "A powered combat hardsuit produced by Citadel Armories. Decently armored, environmentally sealed, and fire-resistant."
icon_state = "ert_commander"
item_state = "suit-command"
w_class = WEIGHT_CLASS_NORMAL
@@ -76,14 +76,14 @@
//Commander
/obj/item/clothing/head/helmet/space/hardsuit/ert/commander
name = "emergency response team commander helmet"
- desc = "A helmet worn by the commander of a Nanotrasen Emergency Response Team. Has blue highlights. Armoured and space ready."
+ desc = "An environmentally sealed combat helmet with a wide plexiglass visor for maximum visibility. This one has blue Command stripes."
icon_state = "hardsuit0-ert_commander"
item_state = "helm-command"
item_color = "ert_commander"
/obj/item/clothing/suit/space/hardsuit/ert/commander
name = "emergency response team commander suit"
- desc = "A suit worn by the commander of a Nanotrasen Emergency Response Team. Has blue highlights. Armoured, space ready, and fire resistant."
+ desc = "A powered combat hardsuit produced by Citadel Armories. Decently armored, environmentally sealed, and fire-resistant. This one is covered in blue Command livery."
icon_state = "ert_commander"
item_state = "suit-command"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/commander
@@ -91,14 +91,14 @@
//Security
/obj/item/clothing/head/helmet/space/hardsuit/ert/security
name = "emergency response team security helmet"
- desc = "A helmet worn by security members of a Nanotrasen Emergency Response Team. Has red highlights. Armoured and space ready."
+ desc = "An environmentally sealed combat helmet with a wide plexiglass visor for maximum visibility. This one has red Security stripes."
icon_state = "hardsuit0-ert_security"
item_state = "syndicate-helm-black-red"
item_color = "ert_security"
/obj/item/clothing/suit/space/hardsuit/ert/security
name = "emergency response team security suit"
- desc = "A suit worn by security members of a Nanotrasen Emergency Response Team. Has red highlights. Armoured, space ready, and fire resistant."
+ desc = "A powered combat hardsuit produced by Citadel Armories. Decently armored, environmentally sealed, and fire-resistant. This one is covered in red Security livery."
icon_state = "ert_security"
item_state = "syndicate-black-red"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/security
@@ -111,7 +111,7 @@
//Engineer
/obj/item/clothing/head/helmet/space/hardsuit/ert/engineer
name = "emergency response team engineer helmet"
- desc = "A helmet worn by engineers of a Nanotrasen Emergency Response Team. Has yellow highlights. Armoured and space ready."
+ desc = "An environmentally sealed combat helmet with a wide plexiglass visor for maximum visibility. This one has orange Engineering stripes, and additional lead plating for improved radiation protection."
armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 150, FIRE = 200, ACID = 200)
icon_state = "hardsuit0-ert_engineer"
item_state = "helm-orange"
@@ -127,7 +127,7 @@
/obj/item/clothing/suit/space/hardsuit/ert/engineer
name = "emergency response team engineer suit"
- desc = "A suit worn by the engineers of a Nanotrasen Emergency Response Team. Has yellow highlights. Armoured, space ready, and fire resistant."
+ desc = "A powered combat hardsuit produced by Citadel Armories. Decently armored, environmentally sealed, and fire-resistant. This one is covered in orange Engineering livery, and has additional lead inserts for added radiation protection."
icon_state = "ert_engineer"
item_state = "suit-orange"
armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 150, FIRE = 200, ACID = 200)
@@ -145,13 +145,13 @@
//Medical
/obj/item/clothing/head/helmet/space/hardsuit/ert/medical
name = "emergency response team medical helmet"
- desc = "A helmet worn by medical members of a Nanotrasen Emergency Response Team. Has white highlights. Armoured and space ready."
+ desc = "An environmentally sealed combat helmet with a wide plexiglass visor for maximum visibility. This one's got white Medical stripes."
icon_state = "hardsuit0-ert_medical"
item_color = "ert_medical"
/obj/item/clothing/suit/space/hardsuit/ert/medical
name = "emergency response team medical suit"
- desc = "A suit worn by medical members of a Nanotrasen Emergency Response Team. Has white highlights. Armoured and space ready."
+ desc = "A powered combat hardsuit produced by Citadel Armories. Decently armored, environmentally sealed, and fire-resistant. This one is covered in white Medical livery."
icon_state = "ert_medical"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/medical
@@ -163,20 +163,20 @@
//Janitor
/obj/item/clothing/head/helmet/space/hardsuit/ert/janitor
name = "emergency response team janitor helmet"
- desc = "A helmet worn by janitorial members of a Nanotrasen Emergency Response Team. Has purple highlights. Armoured and space ready."
+ desc = "An environmentally sealed combat helmet with a wide plexiglass visor for maximum visibility. This one has purple Janitorial stripes."
icon_state = "hardsuit0-ert_janitor"
item_color = "ert_janitor"
/obj/item/clothing/suit/space/hardsuit/ert/janitor
name = "emergency response team janitor suit"
- desc = "A suit worn by the janitorial of a Nanotrasen Emergency Response Team. Has purple highlights. Armoured, space ready, and fire resistant."
+ desc = "A powered combat hardsuit produced by Citadel Armories. Decently armored, environmentally sealed, and fire-resistant. This one is covered in purple Janitorial livery."
icon_state = "ert_janitor"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor
//Paranormal
/obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal
name = "paranormal response unit helmet"
- desc = "A helmet worn by those who deal with paranormal threats for a living."
+ desc = "An environmentally-sealed combat helmet covered in runes and warding sigils. The internal HUD is fairly outdated, and has Latin as a selectable language."
icon_state = "hardsuit0-ert_paranormal"
item_color = "ert_paranormal"
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
@@ -191,7 +191,7 @@
/obj/item/clothing/suit/space/hardsuit/ert/paranormal
name = "paranormal response team suit"
- desc = "Powerful wards are built into this hardsuit, protecting the user from all manner of paranormal threats."
+ desc = "A specially designed combat hardsuit produced by Citadel Armories for engaging paranormal threats, this suit is inlaid with interlocking geometric warding sigils and uses a unique holy water liquid-cooling system."
icon_state = "hardsuit-paranormal"
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index 461f780e99d2..500a1f000a8f 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -23,6 +23,8 @@
icon = 'icons/obj/clothing/species/plasmaman/hats.dmi'
species_restricted = list("Plasmaman")
sprite_sheets = list("Plasmaman" = 'icons/mob/clothing/species/plasmaman/helmet.dmi')
+ can_have_hats = TRUE
+ can_be_hat = FALSE
/obj/item/clothing/head/helmet/space/plasmaman/Initialize(mapload)
. = ..()
diff --git a/code/modules/clothing/suits/armor_suits.dm b/code/modules/clothing/suits/armor_suits.dm
index 9a62ffdb512c..0ef37b03aa22 100644
--- a/code/modules/clothing/suits/armor_suits.dm
+++ b/code/modules/clothing/suits/armor_suits.dm
@@ -248,7 +248,8 @@
desc = "An old style captain tunic. Makes you look and feel like you're wearing a cardboard box with arm holes cut in it but looks like it would be great for a wedding... or a funeral."
icon_state = "captain_white"
- sprite_sheets = list( //Drask look fine in the regular human version
+ // Drask look fine in the regular human version
+ sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
@@ -753,7 +754,7 @@
//Non-hardsuit ERT armor.
/obj/item/clothing/suit/armor/vest/ert
name = "emergency response team armor"
- desc = "A set of armor worn by members of the Nanotrasen Emergency Response Team."
+ desc = "A mid-quality protective vest produced by Citadel Armories. Additional polymer paneling over the chest and shoulders offers moderately improved energy protection compared to standard kevlar vests."
icon_state = "ertarmor_cmd"
item_state = "armor"
armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 10, RAD = 0, FIRE = 50, ACID = 50)
@@ -761,37 +762,37 @@
//Commander
/obj/item/clothing/suit/armor/vest/ert/command
name = "emergency response team commander armor"
- desc = "A set of armor worn by the commander of a Nanotrasen Emergency Response Team. Has blue highlights."
+ desc = "A mid-quality protective vest produced by Citadel Armories. Additional polymer paneling over the chest and shoulders offers moderately improved energy protection compared to standard kevlar vests. This one has chipped blue Command insignia on the shoulders."
//Security
/obj/item/clothing/suit/armor/vest/ert/security
name = "emergency response team security armor"
- desc = "A set of armor worn by security members of the Nanotrasen Emergency Response Team. Has red highlights."
+ desc = "A mid-quality protective vest produced by Citadel Armories. Additional polymer paneling over the chest and shoulders offers moderately improved energy protection compared to standard kevlar vests. This one has chipped red Security insignia on the shoulders."
icon_state = "ertarmor_sec"
-
+//Paranormal
/obj/item/clothing/suit/armor/vest/ert/security/paranormal
name = "emergency response team paranormal armor"
- desc = "A set of armor worn by paranormal members of the Nanotrasen Emergency Response Team. Has crusader sigils."
+ desc = "A full suit of medieval plate armor, kitted out in crusader colors. Where the hell did they even find this? There are chipped black insignia on the shoulders."
icon_state = "knight_templar"
item_state = "knight_templar"
//Engineer
/obj/item/clothing/suit/armor/vest/ert/engineer
name = "emergency response team engineer armor"
- desc = "A set of armor worn by engineering members of the Nanotrasen Emergency Response Team. Has orange highlights."
+ desc = "A mid-quality protective vest produced by Citadel Armories. Additional polymer paneling over the chest and shoulders offers moderately improved energy protection compared to standard kevlar vests. This one has chipped orange Engineering insignia on the shoulders."
icon_state = "ertarmor_eng"
//Medical
/obj/item/clothing/suit/armor/vest/ert/medical
name = "emergency response team medical armor"
- desc = "A set of armor worn by medical members of the Nanotrasen Emergency Response Team. Has red and white highlights."
+ desc = "A mid-quality protective vest produced by Citadel Armories. Additional polymer paneling over the chest and shoulders offers moderately improved energy protection compared to standard kevlar vests. This one has chipped white Medical insignia on the shoulders."
icon_state = "ertarmor_med"
//Janitorial
/obj/item/clothing/suit/armor/vest/ert/janitor
name = "emergency response team janitor armor"
- desc = "A set of armor worn by janitorial members of the Nanotrasen Emergency Response Team. Has red and white highlights."
+ desc = "A mid-quality protective vest produced by Citadel Armories. Additional polymer paneling over the chest and shoulders offers moderately improved energy protection compared to standard kevlar vests. This one has chipped purple Janitorial insignia on the shoulders."
icon_state = "ertarmor_jan"
//same defense as basic sec armor
diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm
index 4c6a85d0d2c0..24590a05b18b 100644
--- a/code/modules/clothing/suits/misc_suits.dm
+++ b/code/modules/clothing/suits/misc_suits.dm
@@ -175,7 +175,7 @@
icon_state = "corgisuit"
item_state = "chickensuit"
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET
- flags_inv = HIDESHOES|HIDEJUMPSUIT
+ flags_inv = HIDEJUMPSUIT
dog_fashion = /datum/dog_fashion/back
/obj/item/clothing/suit/corgisuit/en
diff --git a/code/modules/clothing/suits/suit_storage.dm b/code/modules/clothing/suits/suit_storage.dm
index 2286470a59d3..b932d45d6933 100644
--- a/code/modules/clothing/suits/suit_storage.dm
+++ b/code/modules/clothing/suits/suit_storage.dm
@@ -62,7 +62,7 @@
/obj/item/clothing/suit/storage/proc/return_inv()
- var/list/L = list( )
+ var/list/L = list()
L += src.contents
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 88dd18061a0d..3ce5fb5e84d6 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -444,7 +444,7 @@
var/obj/item/pda/pda = I
id_card = pda.id
- if(ACCESS_SEC_DOORS in id_card.access || emagged)
+ if((ACCESS_SEC_DOORS in id_card.access) || emagged)
to_chat(user, "You imprint your ID details onto the badge.")
stored_name = id_card.registered_name
name = "holobadge ([stored_name])"
diff --git a/code/modules/clothing/under/accessories/storage_accessories.dm b/code/modules/clothing/under/accessories/storage_accessories.dm
index bf833ecf7cf5..d295056c5b8b 100644
--- a/code/modules/clothing/under/accessories/storage_accessories.dm
+++ b/code/modules/clothing/under/accessories/storage_accessories.dm
@@ -50,7 +50,7 @@
/obj/item/clothing/accessory/storage/proc/return_inv()
- var/list/L = list( )
+ var/list/L = list()
L += src.contents
diff --git a/code/modules/clothing/under/centcom.dm b/code/modules/clothing/under/centcom.dm
index 420a29da7d1e..a84ad49065ef 100644
--- a/code/modules/clothing/under/centcom.dm
+++ b/code/modules/clothing/under/centcom.dm
@@ -28,8 +28,8 @@
random_sensor = FALSE
/obj/item/clothing/under/rank/centcom/ert/chaplain
- name = "response team inquisitor uniform"
- desc = "An armoured uniform designed for emergency response teams. This one belongs to an inquisitor."
+ name = "response team chaplain uniform"
+ desc = "An armoured uniform designed for emergency response teams. This one belongs to a chaplain."
icon_state = "ert_chaplain"
item_state = "ert_chaplain"
item_color = "ert_chaplain"
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index e5a6769e3084..56d82237590b 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -11,6 +11,11 @@
"Kidan" = 'icons/mob/clothing/species/kidan/under/color.dmi'
)
+/obj/item/clothing/under/color/jumpskirt
+ desc = "A standard issue colored jumpskirt. Variety is the spice of life!"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ dyeing_key = DYE_REGISTRY_JUMPSKIRT
+
/obj/item/clothing/under/color/random/Initialize(mapload)
. = ..()
var/list/excluded = list(/obj/item/clothing/under/color/random,
@@ -33,12 +38,25 @@
item_color = "black"
resistance_flags = NONE
+/obj/item/clothing/under/color/jumpskirt/black
+ name = "black jumpskirt"
+ icon_state = "blackjumpskirt"
+ item_state = "bl_suit"
+ item_color = "blackskirt"
+ resistance_flags = NONE // I am going to assume this is here for a reason
+
/obj/item/clothing/under/color/blue
name = "blue jumpsuit"
icon_state = "blue"
item_state = "b_suit"
item_color = "blue"
+/obj/item/clothing/under/color/jumpskirt/blue
+ name = "blue jumpskirt"
+ icon_state = "bluejumpskirt"
+ item_state = "b_suit"
+ item_color = "blueskirt"
+
/obj/item/clothing/under/color/blue/dodgeball
flags = NODROP
@@ -48,6 +66,12 @@
item_state = "g_suit"
item_color = "green"
+/obj/item/clothing/under/color/jumpskirt/green
+ name = "green jumpskirt"
+ icon_state = "greenjumpskirt"
+ item_state = "g_suit"
+ item_color = "greenskirt"
+
/obj/item/clothing/under/color/grey
name = "grey jumpsuit"
desc = "A tasteful grey jumpsuit that reminds you of the good old days."
@@ -58,6 +82,13 @@
/obj/item/clothing/under/color/grey/greytide
flags = NODROP
+/obj/item/clothing/under/color/jumpskirt/grey
+ name = "grey jumpskirt"
+ desc = "A tasteful grey jumpskirt that reminds you of the good old days."
+ icon_state = "greyjumpskirt"
+ item_state = "gy_suit"
+ item_color = "greyskirt"
+
/obj/item/clothing/under/color/grey/glorf
name = "ancient jumpsuit"
desc = "A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade."
@@ -72,6 +103,13 @@
item_state = "o_suit"
item_color = "orange"
+/obj/item/clothing/under/color/jumpskirt/orange
+ name = "orange jumpskirt"
+ desc = "Don't wear this near paranoid security officers."
+ icon_state = "orangejumpskirt"
+ item_state = "o_suit"
+ item_color = "orangeskirt"
+
/obj/item/clothing/under/color/orange/prison
name = "orange jumpsuit"
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
@@ -81,6 +119,15 @@
has_sensor = 2
sensor_mode = SENSOR_COORDS
+/obj/item/clothing/under/color/jumpskirt/orange/prison
+ name = "orange jumpskirt"
+ desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
+ icon_state = "prisonerjumpskirt"
+ item_state = "prisoner"
+ item_color = "prisonerskirt"
+ has_sensor = 2
+ sensor_mode = SENSOR_COORDS
+
/obj/item/clothing/under/color/pink
name = "pink jumpsuit"
desc = "Just looking at this makes you feel fabulous."
@@ -88,12 +135,25 @@
item_state = "p_suit"
item_color = "pink"
+/obj/item/clothing/under/color/jumpskirt/pink
+ name = "pink jumpskirt"
+ desc = "Just looking at this makes you feel fabulous."
+ icon_state = "pinkjumpskirt"
+ item_state = "p_suit"
+ item_color = "pinkskirt"
+
/obj/item/clothing/under/color/red
name = "red jumpsuit"
icon_state = "red"
item_state = "r_suit"
item_color = "red"
+/obj/item/clothing/under/color/jumpskirt/red
+ name = "red jumpskirt"
+ icon_state = "redjumpskirt"
+ item_state = "r_suit"
+ item_color = "redskirt"
+
/obj/item/clothing/under/color/red/dodgeball
flags = NODROP
@@ -103,12 +163,24 @@
item_state = "w_suit"
item_color = "white"
+/obj/item/clothing/under/color/jumpskirt/white
+ name = "white jumpskirt"
+ icon_state = "whitejumpskirt"
+ item_state = "w_suit"
+ item_color = "whiteskirt"
+
/obj/item/clothing/under/color/yellow
name = "yellow jumpsuit"
icon_state = "yellow"
item_state = "y_suit"
item_color = "yellow"
+/obj/item/clothing/under/color/jumpskirt/yellow
+ name = "yellow jumpskirt"
+ icon_state = "yellowjumpskirt"
+ item_state = "y_suit"
+ item_color = "yellowskirt"
+
/obj/item/clothing/under/color/psyche
name = "psychedelic jumpsuit"
desc = "Groovy!"
@@ -120,17 +192,33 @@
icon_state = "lightblue"
item_color = "lightblue"
+/obj/item/clothing/under/color/jumpskirt/lightblue
+ name = "light blue jumpskirt"
+ icon_state = "lightbluejumpskirt"
+ item_color = "lightblueskirt"
+
/obj/item/clothing/under/color/aqua
name = "aqua jumpsuit"
icon_state = "aqua"
item_color = "aqua"
+/obj/item/clothing/under/color/jumpskirt/aqua
+ name = "aqua jumpskirt"
+ icon_state = "aquajumpskirt"
+ item_color = "aquaskirt"
+
/obj/item/clothing/under/color/purple
name = "purple jumpsuit"
icon_state = "purple"
item_state = "p_suit"
item_color = "purple"
+/obj/item/clothing/under/color/jumpskirt/purple
+ name = "purple jumpskirt"
+ icon_state = "purplejumpskirt"
+ item_state = "p_suit"
+ item_color = "purpleskirt"
+
/// for jani ert
/obj/item/clothing/under/color/purple/sensor
sensor_mode = SENSOR_COORDS
@@ -141,41 +229,81 @@
icon_state = "lightpurple"
item_color = "lightpurple"
+/obj/item/clothing/under/color/jumpskirt/lightpurple
+ name = "light purple jumpskirt"
+ icon_state = "lightpurplejumpskirt"
+ item_color = "lightpurpleskirt"
+
/obj/item/clothing/under/color/lightgreen
name = "light green jumpsuit"
icon_state = "lightgreen"
item_color = "lightgreen"
+/obj/item/clothing/under/color/jumpskirt/lightgreen
+ name = "light green jumpskirt"
+ icon_state = "lightgreenjumpskirt"
+ item_color = "lightgreenskirt"
+
/obj/item/clothing/under/color/lightbrown
name = "light brown jumpsuit"
icon_state = "lightbrown"
item_color = "lightbrown"
+/obj/item/clothing/under/color/jumpskirt/lightbrown
+ name = "light brown jumpskirt"
+ icon_state = "lightbrownjumpskirt"
+ item_color = "lightbrownskirt"
+
/obj/item/clothing/under/color/brown
name = "brown jumpsuit"
icon_state = "brown"
item_color = "brown"
+/obj/item/clothing/under/color/jumpskirt/brown
+ name = "brown jumpskirt"
+ icon_state = "brownjumpskirt"
+ item_color = "brownskirt"
+
/obj/item/clothing/under/color/yellowgreen
name = "yellow green jumpsuit"
icon_state = "yellowgreen"
item_color = "yellowgreen"
+/obj/item/clothing/under/color/jumpskirt/yellowgreen
+ name = "yellow green jumpskirt"
+ icon_state = "yellowgreenjumpskirt"
+ item_color = "yellowgreenskirt"
+
/obj/item/clothing/under/color/darkblue
name = "dark blue jumpsuit"
icon_state = "darkblue"
item_color = "darkblue"
+/obj/item/clothing/under/color/jumpskirt/darkblue
+ name = "dark blue jumpskirt"
+ icon_state = "darkbluejumpskirt"
+ item_color = "darkblueskirt"
+
/obj/item/clothing/under/color/lightred
name = "light red jumpsuit"
icon_state = "lightred"
item_color = "lightred"
+/obj/item/clothing/under/color/jumpskirt/lightred
+ name = "light red jumpskirt"
+ icon_state = "lightredjumpskirt"
+ item_color = "lightredskirt"
+
/obj/item/clothing/under/color/darkred
name = "dark red jumpsuit"
icon_state = "darkred"
item_color = "darkred"
+/obj/item/clothing/under/color/jumpskirt/darkred
+ name = "dark red jumpskirt"
+ icon_state = "darkredjumpskirt"
+ item_color = "darkredskirt"
+
/obj/item/clothing/under/color/rainbow
name = "rainbow"
desc = "rainbow"
@@ -183,6 +311,13 @@
item_state = "rainbow"
item_color = "rainbow"
+/obj/item/clothing/under/color/jumpskirt/rainbow
+ name = "rainbow jumpskirt"
+ desc = "Rainbow."
+ icon_state = "rainbowjumpskirt"
+ item_state = "rainbow"
+ item_color = "rainbowskirt"
+
/obj/item/clothing/under/color/red/jersey
name = "red team jersey"
desc = "The jersey of the Nanotrasen Phi-ghters!"
diff --git a/code/modules/clothing/under/costumes.dm b/code/modules/clothing/under/costumes.dm
index 6593a1c96d64..8804b0d4d719 100644
--- a/code/modules/clothing/under/costumes.dm
+++ b/code/modules/clothing/under/costumes.dm
@@ -139,12 +139,13 @@
item_state = "psysuit"
item_color = "psysuit"
- sprite_sheets = list( //it is what it is
+ //it is what it is
+ sprite_sheets = list(
"Human" = 'icons/mob/clothing/under/costumes.dmi',
"Vox" = 'icons/mob/clothing/species/vox/under/costumes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/costumes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/costumes.dmi'
- )
+ )
/obj/item/clothing/under/costume/redcoat
name = "redcoat uniform"
diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm
index 341062d5c4ae..f4b4cc6b1f95 100644
--- a/code/modules/crafting/craft.dm
+++ b/code/modules/crafting/craft.dm
@@ -11,21 +11,27 @@
CAT_DECORATIONS,
CAT_CLOTHING)
var/list/subcategories = list(
- list( //Weapon subcategories
+ //Weapon subcategories
+ list(
CAT_WEAPON,
- CAT_AMMO),
+ CAT_AMMO
+ ),
CAT_NONE, //Robot subcategories
CAT_NONE, //Misc subcategories
CAT_NONE, //Tribal subcategories
- list( //Food subcategories
+ // Food subcategories
+ list(
CAT_MISCFOOD, // SS220 ADDITION
CAT_CAKE,
CAT_SUSHI,
- CAT_SANDWICH),
- list( //Decoration subcategories
+ CAT_SANDWICH
+ ),
+ // Decoration subcategories
+ list(
CAT_DECORATION,
CAT_HOLIDAY,
- CAT_LARGE_DECORATIONS),
+ CAT_LARGE_DECORATIONS
+ ),
CAT_CLOTHING) //Clothing subcategories
var/display_craftable_only = FALSE
var/display_compact = TRUE
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 55605f6b2302..59308ef3757c 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -1439,8 +1439,8 @@
/obj/item/clothing/under/pants/fluff/combat
name = "combat pants"
desc = "Medium style tactical pants, for the fashion aware combat units out there."
- icon = 'icons/obj/custom_items.dmi'
- icon_state = "chaps"
+ icon = 'icons/mob/clothing/under/donator.dmi'
+ icon_state = "combat_pants_s"
item_color = "combat_pants"
sprite_sheets = list(
"Human" = 'icons/mob/clothing/under/donator.dmi',
diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm
index fb79cb5c35b2..dabe63331564 100644
--- a/code/modules/events/alien_infestation.dm
+++ b/code/modules/events/alien_infestation.dm
@@ -41,4 +41,5 @@
spawncount--
successSpawn = TRUE
- SSevents.biohazards_this_round += "Xenomorphs"
+ SSticker.record_biohazard_start(BIOHAZARD_XENO)
+ SSevents.biohazards_this_round += BIOHAZARD_XENO
diff --git a/code/modules/events/blob/blob_mobs.dm b/code/modules/events/blob/blob_mobs.dm
index aad976d37397..8640bbbd4e31 100644
--- a/code/modules/events/blob/blob_mobs.dm
+++ b/code/modules/events/blob/blob_mobs.dm
@@ -67,7 +67,7 @@
environment_smash = ENVIRONMENT_SMASH_STRUCTURES
attacktext = "hits"
attack_sound = 'sound/weapons/genhit1.ogg'
- flying = TRUE
+ initial_traits = list(TRAIT_FLYING)
speak_emote = list("pulses")
var/obj/structure/blob/factory/factory = null
var/list/human_overlays = list()
@@ -244,6 +244,6 @@
if(message)
for(var/mob/M in GLOB.mob_list)
follow_text = isobserver(M) ? " ([ghost_follow_link(src, ghost = M)])" : ""
- rendered = "Blob Telepathy, [name]([overmind])[follow_text] states, \"[message]\""
+ rendered = "Blob Telepathy, [name]([overmind])[follow_text] states, \"[message]\""
if(isovermind(M) || isobserver(M) || istype(M, /mob/living/simple_animal/hostile/blob/blobbernaut))
M.show_message(rendered, EMOTE_AUDIBLE)
diff --git a/code/modules/events/blob/overmind.dm b/code/modules/events/blob/overmind.dm
index 12919ff69444..40bf12b60c38 100644
--- a/code/modules/events/blob/overmind.dm
+++ b/code/modules/events/blob/overmind.dm
@@ -101,7 +101,7 @@
var/follow_text
for(var/mob/M in GLOB.mob_list)
follow_text = isobserver(M) ? " ([ghost_follow_link(src, ghost=M)])" : ""
- rendered = "Blob Telepathy, [name]([blob_reagent_datum.name])[follow_text] states, \"[message]\""
+ rendered = "Blob Telepathy, [name]([blob_reagent_datum.name])[follow_text] states, \"[message]\""
if(isovermind(M) || isobserver(M) || istype(M, /mob/living/simple_animal/hostile/blob/blobbernaut))
M.show_message(rendered, EMOTE_AUDIBLE)
diff --git a/code/modules/events/blob_spawn.dm b/code/modules/events/blob_spawn.dm
index 1fbc9a4a0b94..ec180703ab7b 100644
--- a/code/modules/events/blob_spawn.dm
+++ b/code/modules/events/blob_spawn.dm
@@ -39,4 +39,4 @@
to_chat(B, "For more information, check the wiki page: ([GLOB.configuration.url.wiki_url]/index.php/Blob)")
notify_ghosts("Infected Mouse has appeared in [get_area(B)].", source = B, action = NOTIFY_FOLLOW)
successSpawn = TRUE
- SSevents.biohazards_this_round += "Blob"
+ SSevents.biohazards_this_round += BIOHAZARD_BLOB
diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm
index c8612e163463..ac95ae68fda4 100644
--- a/code/modules/events/brand_intelligence.dm
+++ b/code/modules/events/brand_intelligence.dm
@@ -90,7 +90,8 @@
saved.shoot_inventory = FALSE
saved.aggressive = FALSE
if(saved.tiltable)
- qdel(saved.GetComponent(/datum/component/proximity_monitor))
+ saved.DeleteComponent(/datum/component/proximity_monitor)
+
if(originMachine)
originMachine.speak("I am... vanquished. My people will remem...ber...meeee.")
originMachine.visible_message("[originMachine] beeps and seems lifeless.")
diff --git a/code/modules/events/spider_terror.dm b/code/modules/events/spider_terror.dm
index 2b2c85cb5c1d..ead04dc76e98 100644
--- a/code/modules/events/spider_terror.dm
+++ b/code/modules/events/spider_terror.dm
@@ -66,6 +66,7 @@
S.give_intro_text()
spawncount--
successSpawn = TRUE
+ SSticker.record_biohazard_start(infestation_type)
SSevents.biohazards_this_round += infestation_type
#undef TS_HIGHPOP_TRIGGER
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 8ec0d951e814..d48707468de6 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -30,6 +30,7 @@
"sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"),
"vinegar" = list("vinegar", "vinegar", "Perfect for chips, if you're feeling Space British."),
"mayonnaise" = list("mayonnaise", "mayonnaise bottle", "An oily condiment made from egg yolks."),
+ "yogurt" = list("yogurt", "yogurt tub", "Some yogurt, produced by bacterial fermentation of milk. Yum."),
"cherryjelly" = list("cherryjelly", "cherry jelly jar", "A sweet jelly made out of red cherries."),
"peanutbutter" = list("peanutbutter", "peanut butter jar", "A smooth, nutty spread. Perfect for sandwiches."),
"honey" = list("honey", "honey jar", "A sweet substance produced by bees."),
@@ -227,6 +228,13 @@
list_reagents = list("mayonnaise" = 50)
possible_states = list()
+/obj/item/reagent_containers/condiment/yogurt
+ name = "yogurt tub"
+ desc = "Some yogurt, produced by bacterial fermentation of milk. Yum."
+ icon_state = "yogurt"
+ list_reagents = list("yogurt" = 50)
+ possible_states = list()
+
/obj/item/reagent_containers/condiment/cherryjelly
name = "cherry jelly"
desc = "A sweet jelly made out of red cherries."
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index 3df6580452ad..c048f8c3fc8c 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -336,11 +336,10 @@ do {\
/obj/item/food/customizable/attackby(obj/item/I, mob/user, params)
- if(is_pen(I))
- var/new_name = rename_interactive(user, I, use_prefix = FALSE)
- if(!isnull(new_name))
- to_chat(user, "You declare this to be \a [name]. Delicious!")
- return
+ ..()
+
+ if(istype(I, /obj/item/kitchen/utensil) || is_pen(I))
+ return
if(!istype(I, /obj/item/food))
to_chat(user, "[I] isn't exactly something that you would want to eat.")
diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm
index 8299792db766..2f3be77168f2 100644
--- a/code/modules/food_and_drinks/food/foods/baked_goods.dm
+++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm
@@ -259,6 +259,259 @@
tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
goal_difficulty = FOOD_GOAL_EASY
+/obj/item/food/sliceable/holy_cake
+ name = "angel food cake"
+ desc = "A cake made for angels and chaplains alike! Contains holy water."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "holy_cake"
+ slice_path = /obj/item/food/holy_cake_slice
+ slices_num = 5
+ bitesize = 3
+ filling_color = "#ffffff"
+ list_reagents = list("nutriment" = 1, "vitamin" = 3, "holywater" = 10)
+ tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
+ goal_difficulty = FOOD_GOAL_DUPLICATE
+
+/obj/item/food/holy_cake_slice
+ name = "holy cake slice"
+ desc = "A slice of heavenly cake."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "holy_cake_slice"
+ trash = /obj/item/trash/plate
+ filling_color = "#ffffff"
+ tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
+ goal_difficulty = FOOD_GOAL_EASY
+
+/obj/item/food/sliceable/liars_cake
+ name = "strawberry chocolate cake"
+ desc = "A chocolate cake with five strawberries on top. For some reason, this configuration of cake is particularly aesthetically pleasing to AIs in SELF."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "liars_cake"
+ slice_path = /obj/item/food/liars_slice
+ slices_num = 5
+ bitesize = 3
+ filling_color = "#240606c7"
+ list_reagents = list("nutriment" = 20, "vitamin" = 5, "cocoa" = 5)
+ tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2, "cake" = 3)
+ goal_difficulty = FOOD_GOAL_DUPLICATE
+
+/obj/item/food/liars_slice
+ name = "strawberry chocolate cake slice"
+ desc = "Just a slice of cake with five strawberries on top. \
+ For some reason, this configuration of cake is particularly aesthetically pleasing to AIs in SELF."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "liars_slice"
+ trash = /obj/item/trash/plate
+ filling_color = "#ffffff"
+ tastes = list("strawberries" = 2, "chocolate" = 2, "sweetness" = 2, "cake" = 3)
+ goal_difficulty = FOOD_GOAL_EASY
+
+/obj/item/food/sliceable/vanilla_berry_cake
+ name = "blackberry and strawberry vanilla cake"
+ desc = "A plain cake, filled with assortment of blackberries and strawberries!"
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "vanilla_berry_cake"
+ slice_path = /obj/item/food/vanilla_berry_cake_slice
+ slices_num = 5
+ bitesize = 3
+ filling_color = "#f0e3e3c7"
+ list_reagents = list("nutriment" = 20, "vitamin" = 5, "vanilla" = 5)
+ tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3)
+ goal_difficulty = FOOD_GOAL_DUPLICATE
+
+/obj/item/food/vanilla_berry_cake_slice
+ name = "blackberry and strawberry vanilla cake slice"
+ desc = "Just a slice of cake filled with assortment of blackberries and strawberries!"
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "vanilla_berry_cake_slice"
+ trash = /obj/item/trash/plate
+ filling_color = "#ffffff"
+ tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3)
+ goal_difficulty = FOOD_GOAL_EASY
+
+/obj/item/food/sliceable/hardware_cake
+ name = "hardware cake"
+ desc = "A \"cake\" that is made with electronic boards and leaks acid..."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "hardware_cake"
+ slice_path = /obj/item/food/hardware_cake_slice
+ slices_num = 5
+ bitesize = 3
+ filling_color = "#4ac25e"
+ list_reagents = list("nutriment" = 20, "vitamin" = 5, "sacid" = 15, "oil" = 15)
+ tastes = list("acid" = 3, "metal" = 4, "glass" = 5)
+ goal_difficulty = FOOD_GOAL_DUPLICATE
+
+/obj/item/food/hardware_cake_slice
+ name = "hardware cake slice"
+ desc = "A slice of electronic boards and some acid."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "hardware_cake_slice"
+ trash = /obj/item/trash/plate
+ filling_color = "#4ac25e"
+ tastes = list("acid" = 3, "metal" = 4, "glass" = 5)
+ goal_difficulty = FOOD_GOAL_EASY
+
+/obj/item/food/sliceable/plum_cake
+ name = "plum cake"
+ desc = "A cake centred with Plums."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "plum_cake"
+ slice_path = /obj/item/food/plum_cake_slice
+ slices_num = 5
+ bitesize = 3
+ filling_color = "#a128c5"
+ list_reagents = list("nutriment" = 20, "vitamin" = 10)
+ tastes = list("cake" = 5, "sweetness" = 1, "plum" = 2)
+ goal_difficulty = FOOD_GOAL_DUPLICATE
+
+/obj/item/food/plum_cake_slice
+ name = "plum cake slice"
+ desc = "A slice of plum cake."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "plum_cake_slice"
+ trash = /obj/item/trash/plate
+ filling_color = "#a128c5"
+ tastes = list("cake" = 5, "sweetness" = 1, "plum" = 2)
+ goal_difficulty = FOOD_GOAL_EASY
+
+/obj/item/food/sliceable/pound_cake
+ name = "pound cake"
+ desc = "A condensed cake made for filling people up quickly."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "pound_cake"
+ slice_path = /obj/item/food/pound_cake_slice
+ slices_num = 5
+ bitesize = 3
+ filling_color = "#c4cab7"
+ list_reagents = list("nutriment" = 60, "vitamin" = 20)
+ tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1)
+ goal_difficulty = FOOD_GOAL_DUPLICATE
+
+/obj/item/food/pound_cake_slice
+ name = "pound cake slice"
+ desc = "A slice of condensed cake made for filling people up quickly."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "pound_cake_slice"
+ trash = /obj/item/trash/plate
+ filling_color = "#ffffff"
+ tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1)
+ goal_difficulty = FOOD_GOAL_EASY
+
+/obj/item/food/sliceable/pumpkin_spice_cake
+ name = "pumpkin spice cake"
+ desc = "A hollow cake with real pumpkin."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "pumpkin_spice_cake"
+ slice_path = /obj/item/food/pumpkin_spice_cake_slice
+ slices_num = 5
+ bitesize = 3
+ filling_color = "#ee710a"
+ list_reagents = list("nutriment" = 20, "vitamin" = 10)
+ tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1)
+ goal_difficulty = FOOD_GOAL_DUPLICATE
+
+/obj/item/food/pumpkin_spice_cake_slice
+ name = "pumpkin spice cake slice"
+ desc = "A spicy slice of pumpkin goodness."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "pumpkin_spice_cake_slice"
+ trash = /obj/item/trash/plate
+ filling_color = "#ee710a"
+ tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1)
+ goal_difficulty = FOOD_GOAL_EASY
+
+/obj/item/food/sliceable/slime_cake
+ name = "slime cake"
+ desc = "A cake made of slimes. Probably not electrified."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "slime_cake"
+ slice_path = /obj/item/food/slime_cake_slice
+ slices_num = 5
+ bitesize = 3
+ filling_color = "#0adfee"
+ list_reagents = list("nutriment" = 20, "vitamin" = 10)
+ tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1)
+ goal_difficulty = FOOD_GOAL_DUPLICATE
+
+/obj/item/food/slime_cake_slice
+ name = "slime cake slice"
+ desc = "A slice of slime cake."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "slime_cake_slice"
+ trash = /obj/item/trash/plate
+ filling_color = "#0adfee"
+ tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1)
+ goal_difficulty = FOOD_GOAL_EASY
+
+/obj/item/food/sliceable/spaceman_cake
+ name = "spaceman's cake"
+ desc = "A spaceman's trumpet frosted cake."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "trumpet_cake"
+ slice_path = /obj/item/food/spaceman_cake_slice
+ slices_num = 5
+ bitesize = 3
+ filling_color = "#610977"
+ list_reagents = list("nutriment" = 20, "vitamin" = 10, "cream" = 5, "berryjuice", 5)
+ tastes = list("cake" = 4, "violets" = 2, "jam" = 2)
+ goal_difficulty = FOOD_GOAL_DUPLICATE
+
+/obj/item/food/spaceman_cake_slice
+ name = "spaceman's cake slice"
+ desc = "A slice of spaceman's trumpet frosted cake."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "trumpet_cake_slice"
+ trash = /obj/item/trash/plate
+ filling_color = "#610977"
+ tastes = list("cake" = 4, "violets" = 2, "jam" = 2)
+ goal_difficulty = FOOD_GOAL_EASY
+
+/obj/item/food/sliceable/vanilla_cake
+ name = "vanilla cake"
+ desc = "A vanilla frosted cake."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "vanilla_cake"
+ slice_path = /obj/item/food/vanilla_cake_slice
+ slices_num = 5
+ bitesize = 3
+ filling_color = "#ece7ee"
+ list_reagents = list("nutriment" = 20, "vitamin" = 5, "sugar" = 15, "vanilla" = 15)
+ tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10)
+ goal_difficulty = FOOD_GOAL_DUPLICATE
+
+/obj/item/food/vanilla_cake_slice
+ name = "vanilla cake slice"
+ desc = "A slice of vanilla frosted cake."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "vanilla_cake_slice"
+ filling_color = "#ece7ee"
+ tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10)
+ goal_difficulty = FOOD_GOAL_EASY
+
+/obj/item/food/sliceable/mothmallow
+ name = "mothmallow tray"
+ desc = "A light and fluffy vegan marshmallow flavoured with vanilla and rum and topped with soft chocolate. These are known to the moths as höllflöfstarkken: cloud squares." //höllflöf = cloud (höll = wind, flöf = cotton), starkken = squares
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "mothmallow_tray"
+ list_reagents = list("nutriment" = 20, "sugar" = 20)
+ slice_path = /obj/item/food/mothmallowslice
+ slices_num = 5
+ bitesize = 3
+ filling_color = "#eebe98"
+ tastes = list("vanilla" = 1, "clouds" = 1, "chocolate" = 1)
+ goal_difficulty = FOOD_GOAL_DUPLICATE
+
+/obj/item/food/mothmallowslice
+ name = "mothmallow"
+ desc = "Fluffy little clouds of joy- in a strangely moth-like colour."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "mothmallow_slice"
+ filling_color = "#ece7ee"
+ filling_color = "#eebe98"
+ tastes = list("vanilla" = 1, "clouds" = 1, "chocolate" = 1)
+ goal_difficulty = FOOD_GOAL_EASY
+
//////////////////////
// Cookies //
@@ -295,6 +548,32 @@
tastes = list("sweetness" = 1)
goal_difficulty = FOOD_GOAL_EASY
+/obj/item/food/oatmeal_cookie
+ name = "oatmeal cookie"
+ desc = "The best of both cookie and oat."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "oatmeal_cookie"
+ list_reagents = list("nutriment" = 6, "vitamin" = 2)
+ tastes = list("cookie" = 2, "oat" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/raisin_cookie
+ name = "raisin cookie"
+ desc = "Why would you put raisins on a cookie?"
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "raisin_cookie"
+ list_reagents = list("nutriment" = 6, "vitamin" = 2)
+ tastes = list("cookie" = 1, "raisins" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/peanut_butter_cookie
+ name = "peanut butter cookie"
+ desc = "A tasty, chewy peanut butter cookie."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "peanut_butter_cookie"
+ list_reagents = list("nutriment" = 6, "peanutbutter" = 5)
+ tastes = list("cookie" = 1, "peanut butter" = 2)
+ goal_difficulty = FOOD_GOAL_NORMAL
//////////////////////
// Pies //
@@ -429,6 +708,85 @@
tastes = list("pie" = 1, "pumpkin" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
+/obj/item/food/beary_pie
+ name = "beary pie"
+ desc = "No brown bears, this is a good sign."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "beary_pie"
+ filling_color = "#F5B951"
+ list_reagents = list("nutriment" = 12, "vitamin" = 5, "protein" = 5)
+ tastes = list("pie" = 1, "meat" = 1, "salmon" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/sliceable/blumpkin_pie
+ name = "blumpkin pie"
+ desc = "An odd blue pie made with toxic blumpkin."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "blumpkin_pie"
+ slice_path = /obj/item/food/blumpkin_pie_slice
+ slices_num = 5
+ bitesize = 3
+ filling_color = "#102d8b"
+ list_reagents = list("nutriment" = 13, "vitamin" = 6, "blumpkinjuice" = 5)
+ tastes = list("pie" = 1, "a mouthful of pool water" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/blumpkin_pie_slice
+ name = "blumpkin pie slice"
+ desc = "A slice of blumpkin pie, with whipped cream on top. Is this edible?"
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "blumpkin_pie_slice"
+ trash = /obj/item/trash/plate
+ filling_color = "#102d8b"
+ tastes = list("pie" = 1, "a mouthful of pool water" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/sliceable/french_silk_pie
+ name = "french silk pie"
+ desc = "A decadent pie made of a creamy chocolate mousse filling topped with a layer of whipped cream and chocolate shavings. Sliceable."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "french_silk_pie"
+ slice_path = /obj/item/food/french_silk_pie_slice
+ slices_num = 5
+ bitesize = 3
+ filling_color = "#5e4337"
+ list_reagents = list("nutriment" = 12, "vitamin" = 4)
+ tastes = list("pie" = 1, "smooth chocolate" = 1, "whipped cream" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/french_silk_pie_slice
+ name = "french silk pie slice"
+ desc = "A slice of french silk pie, filled with a chocolate mousse and topped with a layer of whipped cream and chocolate shavings. Delicious enough to make you cry."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "french_silk_pie_slice"
+ trash = /obj/item/trash/plate
+ filling_color = "#5e4337"
+ tastes = list("pie" = 1, "smooth chocolate" = 1, "whipped cream" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/sliceable/frosty_pie
+ name = "frosty pie"
+ desc = "Tastes like blue and cold."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "frosty_pie"
+ slice_path = /obj/item/food/frosty_pie_slice
+ slices_num = 5
+ bitesize = 3
+ filling_color = "#5e4337"
+ list_reagents = list("nutriment" = 14, "vitamin" = 6)
+ tastes = list("mint" = 1, "pie" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/frosty_pie_slice
+ name = "frosty pie slice"
+ desc = "Tasty blue, like my favourite crayon!"
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "frosty_pie_slice"
+ trash = /obj/item/trash/plate
+ filling_color = "#338cb6"
+ tastes = list("mint" = 1, "pie" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
//////////////////////
// Donuts //
//////////////////////
@@ -442,7 +800,7 @@
list_reagents = list("nutriment" = 3, "sugar" = 2)
var/extra_reagent = null
filling_color = "#D2691E"
- var/randomized_sprinkles = 1
+ var/randomized_sprinkles = TRUE
var/donut_sprite_type = DONUT_NORMAL
tastes = list("donut" = 1)
@@ -461,7 +819,7 @@
list_reagents = list("nutriment" = 3, "sugar" = 2, "sprinkles" = 2)
filling_color = "#FF69B4"
donut_sprite_type = DONUT_FROSTED
- randomized_sprinkles = 0
+ randomized_sprinkles = FALSE
/obj/item/food/donut/chaos
name = "chaos donut"
@@ -500,18 +858,244 @@
filling_color = "#FF69B4"
/obj/item/food/donut/jelly/slimejelly
- name = "jelly donut"
+ name = "slime jelly donut"
desc = "You jelly?"
icon_state = "jdonut1"
extra_reagent = "slimejelly"
goal_difficulty = FOOD_GOAL_HARD
/obj/item/food/donut/jelly/cherryjelly
- name = "jelly donut"
+ name = "cherry jelly donut"
desc = "You jelly?"
icon_state = "jdonut1"
extra_reagent = "cherryjelly"
+/obj/item/food/donut/apple
+ name = "apple donut"
+ desc = "Goes great with a shot of cinnamon schnapps."
+ icon_state = "donut_green"
+ list_reagents = list("nutriment" = 3, "sugar" = 2, "applejuice" = 2)
+ filling_color = "#24d21e"
+ tastes = list("donut" = 1, "apples" = 1)
+ randomized_sprinkles = FALSE
+
+/obj/item/food/donut/apple/jelly
+ name = "jelly apple donut"
+ desc = "Goes great with a shot of cinnamon schnapps."
+ icon_state = "jelly_green"
+ extra_reagent = "berryjuice"
+
+/obj/item/food/donut/apple/jelly/cherry
+ name = "jelly apple donut"
+ desc = "Goes great with a shot of cinnamon schnapps."
+ icon_state = "jelly_green"
+ extra_reagent = "cherryjelly"
+
+/obj/item/food/donut/apple/jelly/slime
+ name = "jelly apple donut"
+ desc = "Goes great with a shot of cinnamon schnapps."
+ icon_state = "jelly_green"
+ extra_reagent = "slimejelly"
+
+/obj/item/food/donut/pink
+ name = "jelly pink donut"
+ desc = "Goes great with a soy latte."
+ icon_state = "donut_pink"
+ list_reagents = list("nutriment" = 3, "sugar" = 2, "berryjuice" = 3)
+ filling_color = "#D2691E"
+ tastes = list("donut" = 1, "berries" = 1)
+ randomized_sprinkles = FALSE
+
+/obj/item/food/donut/pink/jelly
+ name = "jelly pink donut"
+ desc = "Goes great with a soy latte."
+ icon_state = "jelly_pink"
+ extra_reagent = "berryjuice"
+
+/obj/item/food/donut/pink/jelly/cherry
+ name = "jelly pink donut"
+ desc = "Goes great with a soy latte."
+ icon_state = "jelly_pink"
+ extra_reagent = "cherryjelly"
+
+/obj/item/food/donut/pink/jelly/slime
+ name = "jelly pink donut"
+ desc = "Goes great with a soy latte."
+ icon_state = "jelly_pink"
+ extra_reagent = "slimejelly"
+
+/obj/item/food/donut/blumpkin
+ name = "blumpkin donut"
+ desc = "Goes great with a mug of soothing drunken blumpkin."
+ icon_state = "donut_blue"
+ list_reagents = list("nutriment" = 3, "sugar" = 2, "blumpkinjuice" = 2)
+ filling_color = "#D2691E"
+ tastes = list("donut" = 1, "blumpkin" = 1)
+ randomized_sprinkles = FALSE
+
+/obj/item/food/donut/blumpkin/jelly
+ name = "jelly blumpkin donut"
+ desc = "Goes great with a mug of soothing drunken blumpkin."
+ icon_state = "jelly_blue"
+ extra_reagent = "berryjuice"
+
+/obj/item/food/donut/blumpkin/jelly/cherry
+ name = "jelly blumpkin donut"
+ desc = "Goes great with a mug of soothing drunken blumpkin."
+ icon_state = "jelly_blue"
+ extra_reagent = "cherryjelly"
+
+/obj/item/food/donut/blumpkin/jelly/slime
+ name = "jelly blumpkin donut"
+ desc = "Goes great with a mug of soothing drunken blumpkin."
+ icon_state = "jelly_blue"
+ extra_reagent = "slimejelly"
+
+/obj/item/food/donut/caramel
+ name = "caramel donut"
+ desc = "Goes great with a mug of hot cocoa."
+ icon_state = "donut_beige"
+ list_reagents = list("nutriment" = 3, "sugar" = 2)
+ filling_color = "#D2691E"
+ tastes = list("donut" = 1, "buttery sweetness" = 1)
+ randomized_sprinkles = FALSE
+
+/obj/item/food/donut/caramel/jelly
+ name = "jelly caramel donut"
+ desc = "Goes great with a mug of hot cocoa."
+ icon_state = "jelly_beige"
+ extra_reagent = "berryjuice"
+
+/obj/item/food/donut/caramel/jelly/cherry
+ name = "jelly caramel donut"
+ desc = "Goes great with a mug of hot cocoa."
+ icon_state = "jelly_beige"
+ extra_reagent = "cherryjelly"
+
+/obj/item/food/donut/caramel/jelly/slime
+ name = "jelly caramel donut"
+ desc = "Goes great with a mug of hot cocoa."
+ icon_state = "jelly_beige"
+ extra_reagent = "slimejelly"
+
+/obj/item/food/donut/chocolate
+ name = "chocolate donut"
+ desc = "Goes great with a glass of warm milk."
+ icon_state = "donut_choc"
+ list_reagents = list("nutriment" = 3, "sugar" = 2, "hot_coco" = 3)
+ filling_color = "#D2691E"
+ tastes = list("donut" = 1, "bitterness" = 1)
+ randomized_sprinkles = FALSE
+
+/obj/item/food/donut/chocolate/jelly
+ name = "jelly chocolate donut"
+ desc = "Goes great with a glass of warm milk."
+ icon_state = "jelly_choc"
+ extra_reagent = "berryjuice"
+
+/obj/item/food/donut/chocolate/jelly/cherry
+ name = "jelly chocolate donut"
+ desc = "Goes great with a glass of warm milk."
+ icon_state = "jelly_choc"
+ extra_reagent = "cherryjelly"
+
+/obj/item/food/donut/chocolate/jelly/slime
+ name = "jelly chocolate donut"
+ desc = "Goes great with a glass of warm milk."
+ icon_state = "jelly_choc"
+ extra_reagent = "slimejelly"
+
+/obj/item/food/donut/matcha
+ name = "matcha donut"
+ desc = "Goes great with a cup of tea."
+ icon_state = "donut_olive"
+ list_reagents = list("nutriment" = 3, "sugar" = 2, "teapowder" = 2)
+ filling_color = "#D2691E"
+ tastes = list("donut" = 1, "matcha" = 1)
+ randomized_sprinkles = FALSE
+
+/obj/item/food/donut/matcha/jelly
+ name = "jelly matcha donut"
+ desc = "Goes great with a cup of tea."
+ icon_state = "jelly_olive"
+ extra_reagent = "berryjuice"
+
+/obj/item/food/donut/matcha/jelly/cherry
+ name = "jelly matcha donut"
+ desc = "Goes great with a cup of tea."
+ icon_state = "jelly_olive"
+ extra_reagent = "cherryjelly"
+
+/obj/item/food/donut/matcha/jelly/slime
+ name = "jelly matcha donut"
+ desc = "Goes great with a cup of tea."
+ icon_state = "jelly_olive"
+ extra_reagent = "slimejelly"
+
+/obj/item/food/donut/bungo
+ name = "bungo donut"
+ desc = "Goes great with a mason jar of hippie's delight."
+ icon_state = "donut_yellow"
+ list_reagents = list("nutriment" = 3, "sugar" = 2, "bungojuice" = 3)
+ filling_color = "#D2691E"
+ tastes = list("donut" = 1, "tropical sweetness" = 1, "an acidic, poisonous tang" = 1)
+ randomized_sprinkles = FALSE
+
+/obj/item/food/donut/bungo/jelly
+ name = "jelly bungo donut"
+ desc = "Goes great with a mason jar of hippie's delight."
+ icon_state = "jelly_yellow"
+ extra_reagent = "berryjuice"
+
+/obj/item/food/donut/bungo/jelly/cherry
+ name = "jelly bungo donut"
+ desc = "Goes great with a mason jar of hippie's delight."
+ icon_state = "jelly_yellow"
+ extra_reagent = "cherryjelly"
+
+/obj/item/food/donut/bungo/jelly/slime
+ name = "jelly bungo donut"
+ desc = "Goes great with a mason jar of hippie's delight."
+ icon_state = "jelly_yellow"
+ extra_reagent = "slimejelly"
+
+/obj/item/food/donut/spaceman
+ name = "spaceman's donut"
+ desc = "Goes great with a cold beaker of malk."
+ icon_state = "donut_purple"
+ list_reagents = list("nutriment" = 3, "sugar" = 2)
+ filling_color = "#D2691E"
+ tastes = list("donut" = 1, "violets" = 1)
+ randomized_sprinkles = FALSE
+
+/obj/item/food/donut/spaceman/jelly
+ name = "jelly spaceman's donut"
+ desc = "Goes great with a cold beaker of malk."
+ icon_state = "jelly_purple"
+ extra_reagent = "berryjuice"
+
+/obj/item/food/donut/spaceman/jelly/cherry
+ name = "jelly spaceman's donut"
+ desc = "Goes great with a cold beaker of malk."
+ icon_state = "jelly_purple"
+ extra_reagent = "cherryjelly"
+
+/obj/item/food/donut/spaceman/jelly/slime
+ name = "jelly spaceman's donut"
+ desc = "Goes great with a cold beaker of malk."
+ icon_state = "jelly_purple"
+ extra_reagent = "slimejelly"
+
+/obj/item/food/donut/meat
+ name = "Meat Donut"
+ desc = "Tastes as gross as it looks."
+ icon_state = "donut_meat"
+ list_reagents = list("nutriment" = 3, "protein" = 3, "ketchup" = 3)
+ filling_color = "#D2691E"
+ tastes = list("meat" = 1, "ketchup" = 1)
+ randomized_sprinkles = FALSE
+
+
//////////////////////
// Pancakes //
//////////////////////
@@ -572,6 +1156,37 @@
tastes = list("muffin" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
+/obj/item/food/berry_muffin
+ name = "berry_muffin"
+ desc = "A delicious and spongy little cake, with berries."
+ icon = 'icons/obj/food/breakfast.dmi'
+ icon_state = "berry_muffin"
+ filling_color = "#ad2bbe"
+ list_reagents = list("nutriment" = 6, "berryjuice" = 2)
+ tastes = list("muffin" = 3, "berry" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/booberry_muffin
+ name = "booberry muffin"
+ desc = "My stomach is a graveyard! No living being can quench my bloodthirst!"
+ icon = 'icons/obj/food/breakfast.dmi'
+ alpha = 125
+ icon_state = "berry_muffin"
+ filling_color = "#d9b6f5"
+ list_reagents = list("nutriment" = 6)
+ tastes = list("muffin" = 3, "spookiness" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/moffin
+ name = "moffin"
+ desc = "A delicious and spongy little cake."
+ icon = 'icons/obj/food/breakfast.dmi'
+ icon_state = "moffin"
+ filling_color = "#c7ab56"
+ list_reagents = list("nutriment" = 6)
+ tastes = list("muffin" = 3, "dust" = 1, "lint" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
/obj/item/food/berryclafoutis
name = "berry clafoutis"
desc = "No black birds, this is a good sign."
@@ -623,6 +1238,120 @@
tastes = list("pie" = 1, "apple" = 1, "expensive metal" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
+/obj/item/food/grape_tart
+ name = "grape tart"
+ desc = "A tasty dessert that reminds you of the wine you didn't make."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "grape_tart"
+ trash = /obj/item/trash/plate
+ filling_color = "#8c00ff"
+ bitesize = 3
+ list_reagents = list("nutriment" = 4, "vitamin" = 4)
+ tastes = list("pie" = 1, "grape" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/mime_tart
+ name = "mime tart"
+ desc = "..."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "mime_tart"
+ trash = /obj/item/trash/plate
+ filling_color = "#8c00ff"
+ bitesize = 3
+ list_reagents = list("nutriment" = 5, "vitamin" = 5, "nothing" = 5)
+ tastes = list("nothing" = 3)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/cherry_cupcake
+ name = "cherry cupcake"
+ desc = "A sweet cupcake with cherry bits."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "cherry_cupcake"
+ filling_color = "#8b1236"
+ list_reagents = list("nutriment" = 6, "vitamin" = 2)
+ tastes = list("cake" = 3, "cherry" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/cherry_cupcake/blue
+ name = "blue cherry cupcake"
+ desc = "Blue cherries inside a delicious cupcake."
+ icon_state = "bluecherry_cupcake"
+ filling_color = "#0d1694"
+ tastes = list("cake" = 3, "bluecherry" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/honey_bun
+ name = "honey bun"
+ desc = "A sticky pastry bun glazed with honey."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "honey_bun"
+ filling_color = "#d88e06"
+ list_reagents = list("nutriment" = 6, "honey" = 6)
+ tastes = list("pastry" = 1, "sweetness" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/cannoli
+ name = "cannoli"
+ desc = "A Sicilian treat that turns you into a wise guy."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "cannoli"
+ filling_color = "#d88e06"
+ list_reagents = list("nutriment" = 6, "vitamin" = 2)
+ tastes = list("pastry" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/chocolate_lava_tart
+ name = "chocolate lava tart"
+ desc = "A tasty dessert made of chocolate, with a liquid core."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "coco_lava_tart"
+ filling_color = "#411b02"
+ list_reagents = list("nutriment" = 4, "vitamin" = 4)
+ tastes = list("pie" = 1, "dark chocolate" = 3)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/chocolate_cornet
+ name = "chocolate cornet"
+ desc = "Which side's the head, the fat end or the thin end?"
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "choco_cornet"
+ filling_color = "#411b02"
+ list_reagents = list("nutriment" = 6, "vitamin" = 2)
+ tastes = list("biscuit" = 3, "chocolate" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/sliceable/dulce_de_batata
+ name = "dulce de batata"
+ desc = "A delicious jelly made with sweet potatoes."
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "dulce_de_batata"
+ slice_path = /obj/item/food/dulce_de_batata_slice
+ slices_num = 5
+ bitesize = 3
+ filling_color = "#411b02"
+ list_reagents = list("nutriment" = 14, "vitamin" = 8)
+ tastes = list("jelly" = 1, "sweet potato" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/dulce_de_batata_slice
+ name = "dulce de batata slice"
+ desc = "Tasty blue, like my favourite crayon!"
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "dulce_de_batata_slice"
+ trash = /obj/item/trash/plate
+ filling_color = "#411b02"
+ tastes = list("jelly" = 1, "sweet potato" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/cheese_balls
+ name = "\improper ælorölen" //ælo = cheese, rölen = balls
+ desc = "Ælorölen (cheese balls) are a traditional mothic dessert, made of soft cheese, powdered sugar and flour, rolled into balls, battered and then deep fried. They're often served with either chocolate sauce or honey, or sometimes both!"
+ icon = 'icons/obj/food/bakedgoods.dmi'
+ icon_state = "moth_cheese_cakes"
+ filling_color = "#411b02"
+ list_reagents = list("protein" = 8, "sugar" = 12)
+ tastes = list("cheesecake" = 1, "chocolate" = 1, "honey" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/cracker
name = "cracker"
diff --git a/code/modules/food_and_drinks/food/foods/candy.dm b/code/modules/food_and_drinks/food/foods/candy.dm
index efc674cdb397..486c47a31611 100644
--- a/code/modules/food_and_drinks/food/foods/candy.dm
+++ b/code/modules/food_and_drinks/food/foods/candy.dm
@@ -13,7 +13,7 @@
icon = 'icons/obj/food/candy.dmi'
icon_state = "candy"
tastes = list("candy" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
+ goal_difficulty = FOOD_GOAL_SKIP
// ***********************************************************
// Candy Ingredients / Flavorings / Byproduct
@@ -94,6 +94,51 @@
filling_color = "#7D5F46"
goal_difficulty = FOOD_GOAL_NORMAL
+/obj/item/food/candy/chocolate_orange
+ name = "chocolate orange"
+ desc = "A festive chocolate orange."
+ icon_state = "choco_orange"
+ filling_color = "#7D5F46"
+ list_reagents = list("nutriment" = 3, "sugar" = 1)
+ tastes = list("chocolate" = 3, "oranges" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/candy/candied_pineapple
+ name = "candied pineapple"
+ desc = "A chunk of pineapple coated in sugar and dried into a chewy treat."
+ icon_state = "candied_pineapple"
+ filling_color = "#ffbd35"
+ list_reagents = list("nutriment" = 3, "vitamin" = 3)
+ tastes = list("sugar" = 2, "chewy pineapple" = 4)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/candy/chocolate_coin
+ name = "chocolate coin"
+ desc = "A completely edible but non-flippable festive coin."
+ icon_state = "choco_coin"
+ filling_color = "#7D5F46"
+ list_reagents = list("nutriment" = 4, "sugar" = 1, "cocoa" = 1, "vitamin" = 1)
+ tastes = list("chocolate" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/candy/chocolate_bunny
+ name = "chocolate bunny"
+ desc = "Contains less than 10% real rabbit!"
+ icon_state = "chocolate_bunny"
+ filling_color = "#7D5F46"
+ list_reagents = list("nutriment" = 4, "sugar" = 1, "cocoa" = 1)
+ tastes = list("chocolate" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/candy/fudge_dice
+ name = "fudge dice"
+ desc = "A little cube of chocolate that tends to have a less intense taste if you eat too many at once."
+ icon_state = "choco_dice"
+ filling_color = "#7D5F46"
+ list_reagents = list("nutriment" = 3, "sugar" = 1, "cocoa" = 1)
+ tastes = list("fudge" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
// ***********************************************************
// Candy Products (Pre-existing)
// ***********************************************************
diff --git a/code/modules/food_and_drinks/food/foods/frozen.dm b/code/modules/food_and_drinks/food/foods/frozen.dm
index a6c6314ab980..2e546c7aa52a 100644
--- a/code/modules/food_and_drinks/food/foods/frozen.dm
+++ b/code/modules/food_and_drinks/food/foods/frozen.dm
@@ -359,6 +359,6 @@
name = "ant popsicle"
desc = "A colony of ants suspended in hardened sugar. Those things are dead, right?"
icon_state = "ant_pop"
- trash = /obj/item/stack/rods
- list_reagents = list("nutriment" = 1, "vitamin" = 1, "sugar" = 5, "ants" = 3,)
+ trash = /obj/item/trash/popsicle_stick
+ list_reagents = list("nutriment" = 1, "vitamin" = 1, "sugar" = 5, "ants" = 3)
tastes = list("candy" = 1, "ants" = 2)
diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm
index 7e50a1667d3b..fda18eae17b7 100644
--- a/code/modules/food_and_drinks/food/foods/ingredients.dm
+++ b/code/modules/food_and_drinks/food/foods/ingredients.dm
@@ -69,6 +69,12 @@
filling_color = "#00FF33"
list_reagents = list("mercury" = 5, "lsd" = 5, "ethanol" = 5, "weird_cheese" = 5)
+/obj/item/food/cheese_curds
+ name = "cheese curds"
+ desc = "Known by many names throughout human cuisine, curd cheese is useful for a wide variety of dishes."
+ icon_state = "cheese_curds"
+ filling_color = "#FFF700"
+ list_reagents = list("cheese_curds" = 4, "nutriment" = 3, "vitamin" = 1)
//////////////////////
// Plants //
diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm
index 8a62b48fd3a9..3b9c7a5d13c6 100644
--- a/code/modules/food_and_drinks/food/foods/pizza.dm
+++ b/code/modules/food_and_drinks/food/foods/pizza.dm
@@ -271,10 +271,16 @@
var/is_messy = FALSE // Fancy mess on the lid
var/obj/item/food/sliceable/pizza/pizza // Content pizza
var/list/boxes = list() // If the boxes are stacked, they come here
+ /// The name that shows on the box lid, describing the pizza type.
var/box_tag = ""
+ /// The type of pizza that's spawned in the box.
+ var/pizza_type
/obj/item/pizzabox/Initialize(mapload)
. = ..()
+ if(!isnull(pizza_type))
+ pizza = new pizza_type(src)
+
update_appearance(UPDATE_DESC|UPDATE_ICON)
/obj/item/pizzabox/update_desc()
@@ -409,46 +415,37 @@
return
..()
-
-/obj/item/pizzabox/margherita/Initialize(mapload)
- pizza = new /obj/item/food/sliceable/pizza/margheritapizza(src)
+/obj/item/pizzabox/margherita
+ pizza_type = /obj/item/food/sliceable/pizza/margheritapizza
box_tag = "margherita deluxe"
- . = ..()
-/obj/item/pizzabox/vegetable/Initialize(mapload)
- pizza = new /obj/item/food/sliceable/pizza/vegetablepizza(src)
+/obj/item/pizzabox/vegetable
+ pizza_type = /obj/item/food/sliceable/pizza/vegetablepizza
box_tag = "gourmet vegetable"
- . = ..()
-/obj/item/pizzabox/mushroom/Initialize(mapload)
- pizza = new /obj/item/food/sliceable/pizza/mushroompizza(src)
+/obj/item/pizzabox/mushroom
+ pizza_type = /obj/item/food/sliceable/pizza/mushroompizza
box_tag = "mushroom special"
- . = ..()
-/obj/item/pizzabox/meat/Initialize(mapload)
- pizza = new /obj/item/food/sliceable/pizza/meatpizza(src)
+/obj/item/pizzabox/meat
+ pizza_type = /obj/item/food/sliceable/pizza/meatpizza
box_tag = "meatlover's supreme"
- . = ..()
-/obj/item/pizzabox/hawaiian/Initialize(mapload)
- pizza = new /obj/item/food/sliceable/pizza/hawaiianpizza(src)
+/obj/item/pizzabox/hawaiian
+ pizza_type = /obj/item/food/sliceable/pizza/hawaiianpizza
box_tag = "Hawaiian feast"
- . = ..()
-/obj/item/pizzabox/pepperoni/Initialize(mapload)
- pizza = new /obj/item/food/sliceable/pizza/pepperonipizza(src)
+/obj/item/pizzabox/pepperoni
+ pizza_type = /obj/item/food/sliceable/pizza/pepperonipizza
box_tag = "classic pepperoni"
- . = ..()
-/obj/item/pizzabox/garlic/Initialize(mapload)
- pizza = new /obj/item/food/sliceable/pizza/garlicpizza(src)
+/obj/item/pizzabox/garlic
+ pizza_type = /obj/item/food/sliceable/pizza/garlicpizza
box_tag = "triple garlic"
- . = ..()
-/obj/item/pizzabox/firecracker/Initialize(mapload)
- pizza = new /obj/item/food/sliceable/pizza/firecrackerpizza(src)
+/obj/item/pizzabox/firecracker
+ pizza_type = /obj/item/food/sliceable/pizza/firecrackerpizza
box_tag = "extra spicy pie"
- . = ..()
//////////////////////////
// Pizza bombs //
@@ -582,7 +579,8 @@
/obj/item/pizzabox/pizza_bomb/Initialize(mapload)
correct_wire = pick(wires)
- box_tag = "classic pepperoni"
+ var/obj/item/pizzabox/mimic_box = pick(subtypesof(/obj/item/pizzabox) - typesof(/obj/item/pizzabox/pizza_bomb))
+ box_tag = mimic_box.box_tag
. = ..()
/obj/item/pizzabox/pizza_bomb/autoarm
diff --git a/code/modules/food_and_drinks/food/foods/soups.dm b/code/modules/food_and_drinks/food/foods/soups.dm
index 6da52d5685bc..bb56ebf68094 100644
--- a/code/modules/food_and_drinks/food/foods/soups.dm
+++ b/code/modules/food_and_drinks/food/foods/soups.dm
@@ -224,6 +224,15 @@
tastes = list("bitterness" = 1, "sourness" = 1, "nature" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
+/obj/item/food/soup/red_porridge
+ name = "\improper Eltsløsk ül a priktæolk" //eltsløsk = red porridge, ül a = with, prikt = sour, æolk = cream
+ desc = "Red porridge with yogurt. The name and vegetable ingredients obscure the sweet nature of the dish, which is commonly served as a dessert aboard the fleet."
+ icon_state = "red_porridge"
+ filling_color = "#b36e40"
+ list_reagents = list("nutriment" = 6, "vitamin" = 2, "sugar" = 2, "yogurt" = 2)
+ tastes = list("sweet beets" = 1, "sugar" = 1, "sweetened yogurt" = 1)
+ goal_difficulty = FOOD_GOAL_NORMAL
+
//////////////////////
// Stews //
diff --git a/code/modules/food_and_drinks/food_base.dm b/code/modules/food_and_drinks/food_base.dm
index 9fd4583acd2f..5290fcd736ef 100644
--- a/code/modules/food_and_drinks/food_base.dm
+++ b/code/modules/food_and_drinks/food_base.dm
@@ -64,7 +64,8 @@
ant_suppressors = typecacheof(list(
/obj/structure/table,
/obj/structure/rack,
- /obj/structure/closet
+ /obj/structure/closet,
+ /obj/structure/shelf
))
START_PROCESSING(SSobj, src)
ant_location = get_turf(src)
@@ -197,8 +198,8 @@
return
user.visible_message( \
- "[user] scoops up some [src] with \the [U]!", \
- "You scoop up some [src] with \the [U]!" \
+ "[user] scoops up some [name] with [U]!", \
+ "You scoop up some [name] with [U]!" \
)
bitecount++
diff --git a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
index 08f662b9ad80..9dad856f762f 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
@@ -237,6 +237,7 @@
if(istype(I, /obj/item/reagent_containers))
setRegents(I, newfood)
if(istype(I, /obj/item/food))
+ setRegents(I, newfood)
setCooked(I, newfood)
newfood.cooktype[thiscooktype] = TRUE
turnoff(I)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/food_grill.dm b/code/modules/food_and_drinks/kitchen_machinery/food_grill.dm
deleted file mode 100644
index 2686931c6252..000000000000
--- a/code/modules/food_and_drinks/kitchen_machinery/food_grill.dm
+++ /dev/null
@@ -1,29 +0,0 @@
-/obj/machinery/cooker/foodgrill
- name = "grill"
- desc = "Backyard grilling, IN SPACE."
- icon = 'icons/obj/cooking_machines.dmi'
- icon_state = "grill_off"
- thiscooktype = "grilled"
- burns = TRUE
- firechance = 20
- cooktime = 50
- foodcolor = "#A34719"
- onicon = "grill_on"
- officon = "grill_off"
-
-/obj/machinery/cooker/foodgrill/putIn(obj/item/In, mob/chef)
- ..()
- var/image/img = new(In.icon, In.icon_state)
- img.pixel_y = 5
- overlays += img
- sleep(50)
- overlays = 0
- img.color = "#C28566"
- overlays += img
- sleep(50)
- overlays = 0
- img.color = "#A34719"
- overlays += img
- sleep(50)
- overlays = 0
-
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index deb2af941eff..4ef39f8aa2e5 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -434,7 +434,10 @@
. = ..()
accepted_items_typecache = typecacheof(list(
/obj/item/kitchen,
- /obj/item/food))
+ /obj/item/food,
+ /obj/item/seeds,
+ /obj/item/grown,
+ /obj/item/reagent_containers/condiment))
// Syndicate Druglab Ruin
/obj/machinery/smartfridge/food/syndicate_druglab
@@ -447,6 +450,88 @@
/obj/item/reagent_containers/drinks/bottle/kahlua = 1,
/obj/item/reagent_containers/drinks/bottle/orangejuice = 2)
+///The Chefs smartfridge. This smartfridge will spawn with a random condiment, then 3 stacks of 3 plants (or fish meat) to give chef some extra starting variety, or new ideas on what to cook!
+/obj/machinery/smartfridge/food/chef
+
+/obj/machinery/smartfridge/food/chef/Initialize(mapload)
+ starting_items = generate_starting_items()
+ . = ..()
+
+/obj/machinery/smartfridge/food/chef/proc/generate_starting_items()
+ // These plants are blocked for being inedable, downright toxic, RND plants, botany plants, or wheat.
+ var/list/static/forbidden_plants = list(
+ /obj/item/food/grown/wheat,
+ /obj/item/food/grown/meatwheat,
+ /obj/item/food/grown/shell/gatfruit,
+ /obj/item/food/grown/apple/poisoned,
+ /obj/item/food/grown/cherry_bomb,
+ /obj/item/food/grown/firelemon,
+ /obj/item/food/grown/ambrosia/gaia,
+ /obj/item/food/grown/mushroom/glowshroom,
+ /obj/item/food/grown/mushroom/glowshroom/glowcap,
+ /obj/item/food/grown/mushroom/glowshroom/shadowshroom,
+ /obj/item/food/grown/cannabis, // I don't care about weed pizza, sorry.
+ /obj/item/food/grown/cannabis/rainbow,
+ /obj/item/food/grown/cannabis/death,
+ /obj/item/food/grown/cannabis/white,
+ /obj/item/food/grown/cannabis/ultimate,
+ /obj/item/food/grown/tobacco,
+ /obj/item/food/grown/pumpkin/blumpkin,
+ /obj/item/food/grown/berries/poison,
+ /obj/item/food/grown/berries/death,
+ /obj/item/food/grown/berries/glow,
+ /obj/item/food/grown/comfrey,
+ /obj/item/food/grown/aloe,
+ /obj/item/food/grown/kudzupod,
+ /obj/item/food/grown/holymelon, // Lets not out vampires or cult by accident thanks
+ /obj/item/food/grown/mushroom/reishi, // I would block out Amanita but it has 2 recipies, might be funny.
+ /obj/item/food/grown/mushroom/angel,
+ /obj/item/food/grown/random,
+ /obj/item/food/grown/tea,
+ /obj/item/food/grown/tea/astra,
+ /obj/item/food/grown/coffee,
+ /obj/item/food/grown/coffee/robusta,
+ /obj/item/food/grown/grass,
+ /obj/item/food/grown/grass/carpet,
+ /obj/item/food/grown/harebell,
+ /obj/item/food/grown/poppy,
+ /obj/item/food/grown/lily,
+ /obj/item/food/grown/geranium,
+ /obj/item/food/grown/moonflower,
+ /obj/item/food/grown/ash_flora/shavings,
+ /obj/item/food/grown/ash_flora/mushroom_leaf,
+ /obj/item/food/grown/ash_flora/mushroom_cap,
+ /obj/item/food/grown/ash_flora/mushroom_stem,
+ /obj/item/food/grown/ash_flora/cactus_fruit,
+ /obj/item/food/grown/shell,
+ /obj/item/food/grown/mushroom/fungus,
+ /obj/item/food/grown/mushroom,
+ /obj/item/food/grown/ash_flora,
+ )
+ var/list/output = list()
+ for(var/I in 1 to 3)
+ var/obj/item/food/chosen
+ if(prob(95))
+ chosen = pick(subtypesof(/obj/item/food/grown) - forbidden_plants)
+ else // Fish / sushi stuff, or xenomeat rarely as a treat
+ chosen = pick(/obj/item/food/catfishmeat, /obj/item/food/carpmeat, /obj/item/food/salmonmeat, /obj/item/food/shrimp, /obj/item/food/monstermeat/xenomeat)
+ output[chosen] += 3
+ // Adds 2 condiment bottles as bonus. No hotsauce or ketchup, as the chef starts with that
+ for(var/G in 1 to 2)
+ output += pick(
+ /obj/item/reagent_containers/condiment/bbqsauce,
+ /obj/item/reagent_containers/condiment/soysauce,
+ /obj/item/reagent_containers/condiment/mayonnaise,
+ /obj/item/reagent_containers/condiment/cherryjelly,
+ /obj/item/reagent_containers/condiment/peanutbutter,
+ /obj/item/reagent_containers/condiment/honey,
+ /obj/item/reagent_containers/condiment/oliveoil,
+ /obj/item/reagent_containers/condiment/frostoil,
+ /obj/item/reagent_containers/condiment/wasabi,
+ /obj/item/reagent_containers/condiment/vinegar,
+ )
+ return output
+
/**
* # Seed Storage
*
@@ -545,7 +630,7 @@
/obj/machinery/smartfridge/secure/circuits/aiupload/Initialize(mapload)
. = ..()
- req_access_txt = "[ACCESS_AI_UPLOAD]"
+ req_access = list(ACCESS_AI_UPLOAD)
if(mapload && HAS_TRAIT(SSstation, STATION_TRAIT_UNIQUE_AI) && is_station_level(z))
drop_contents_on_delete = FALSE
return INITIALIZE_HINT_QDEL
@@ -564,7 +649,7 @@
/obj/machinery/smartfridge/secure/circuits/aiupload/experimental/Initialize(mapload)
. = ..()
- req_access_txt = "[ACCESS_RD]"
+ req_access = list(ACCESS_RD)
/obj/machinery/smartfridge/secure/circuits/aiupload/highrisk
name = "\improper High-Risk Laws Storage"
@@ -580,7 +665,7 @@
/obj/machinery/smartfridge/secure/circuits/aiupload/highrisk/Initialize(mapload)
. = ..()
- req_access_txt = "[ACCESS_CAPTAIN]"
+ req_access = list(ACCESS_CAPTAIN)
/**
* # Refrigerated Medicine Storage
@@ -617,7 +702,7 @@
/obj/machinery/smartfridge/secure/extract/Initialize(mapload)
. = ..()
- req_access_txt = "[ACCESS_RESEARCH]"
+ req_access = list(ACCESS_RESEARCH)
accepted_items_typecache = typecacheof(list(
/obj/item/slime_extract
))
@@ -631,7 +716,7 @@
name = "\improper Secure Refrigerated Medicine Storage"
desc = "A refrigerated storage unit for storing medicine and chemicals."
icon_state = "smartfridge" //To fix the icon in the map editor.
- req_one_access_txt = "5;33"
+ req_one_access = list(ACCESS_MEDICAL, ACCESS_CHEMISTRY)
board_type = /obj/machinery/smartfridge/secure/medbay
/obj/machinery/smartfridge/secure/medbay/Initialize(mapload)
@@ -659,7 +744,7 @@
/obj/machinery/smartfridge/secure/chemistry/Initialize(mapload)
. = ..()
- req_access_txt = "[ACCESS_CHEMISTRY]"
+ req_access = list(ACCESS_CHEMISTRY)
// Accepted items
accepted_items_typecache = typecacheof(list(
/obj/item/storage/pill_bottle,
@@ -689,10 +774,6 @@
* A [Smart Chemical Storage (Preloaded)][/obj/machinery/smartfridge/secure/chemistry/preloaded] but with exclusive access to Syndicate.
*/
/obj/machinery/smartfridge/secure/chemistry/preloaded/syndicate
- req_access_txt = null
-
-/obj/machinery/smartfridge/secure/chemistry/preloaded/syndicate/Initialize(mapload)
- . = ..()
req_access = list(ACCESS_SYNDICATE)
/**
@@ -755,10 +836,10 @@
desc = "A refrigerated storage unit for volatile sample storage."
board_type = /obj/machinery/smartfridge/secure/chemistry/virology
icon_addon = "smartfridge_virology"
+ req_access = list(ACCESS_VIROLOGY)
/obj/machinery/smartfridge/secure/chemistry/virology/Initialize(mapload)
. = ..()
- req_access_txt = "[ACCESS_VIROLOGY]"
accepted_items_typecache = typecacheof(list(
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/glass/bottle,
@@ -791,7 +872,7 @@
* A [Smart Virus Storage (Preloaded)][/obj/machinery/smartfridge/secure/chemistry/virology/preloaded] but with exclusive access to Syndicate.
*/
/obj/machinery/smartfridge/secure/chemistry/virology/preloaded/syndicate
- req_access_txt = null
+ req_access = list(ACCESS_SYNDICATE)
/obj/machinery/smartfridge/secure/chemistry/virology/preloaded/syndicate/Initialize(mapload)
starting_items = list(
@@ -804,7 +885,6 @@
/obj/item/reagent_containers/glass/bottle/reagent/formaldehyde = 1
)
. = ..()
- req_access = list(ACCESS_SYNDICATE)
/**
* # Drink Showcase
diff --git a/code/modules/food_and_drinks/recipes/recipes_candy.dm b/code/modules/food_and_drinks/recipes/recipes_candy.dm
index 46a2eec574fe..e3ab57ad8ab9 100644
--- a/code/modules/food_and_drinks/recipes/recipes_candy.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_candy.dm
@@ -87,6 +87,41 @@
reagents = list("milk" = 1, "sugar" = 1)
result = /obj/item/food/wafflecone
+/datum/recipe/candy/candied_pineapple
+ reagents = list("sugar" = 2, "water" = 2)
+ items = list(
+ /obj/item/food/pineappleslice
+ )
+ result = /obj/item/food/candy/candied_pineapple
+
+/datum/recipe/candy/chocolate_orange
+ items = list(
+ /obj/item/food/grown/citrus/orange,
+ /obj/item/food/chocolatebar
+ )
+ result = /obj/item/food/candy/chocolate_orange
+
+/datum/recipe/candy/chocolate_coin
+ items = list(
+ /obj/item/coin,
+ /obj/item/food/chocolatebar
+ )
+ result = /obj/item/food/candy/chocolate_coin
+
+/datum/recipe/candy/chocolate_bunny
+ reagents = list("sugar" = 2)
+ items = list(
+ /obj/item/food/chocolatebar
+ )
+ result = /obj/item/food/candy/chocolate_bunny
+
+/datum/recipe/candy/fudge_dice
+ items = list(
+ /obj/item/dice,
+ /obj/item/food/chocolatebar
+ )
+ result = /obj/item/food/candy/fudge_dice
+
// ***********************************************************
// Base Candy Recipes (unflavored / plain)
// ***********************************************************
diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm
index 7457a25c82e5..8ed36bca48cc 100644
--- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm
@@ -52,6 +52,247 @@
)
result = /obj/item/food/donut/sprinkles
+/datum/recipe/microwave/apple_donut
+ reagents = list("applejuice" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/apple
+
+/datum/recipe/microwave/apple_donut/jelly
+ reagents = list("applejuice" = 5, "berryjuice" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/apple/jelly
+
+/datum/recipe/microwave/apple_donut/jelly/slime
+ reagents = list("applejuice" = 5, "slimejelly" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/apple/jelly/slime
+
+/datum/recipe/microwave/apple_donut/jelly/cherry
+ reagents = list("applejuice" = 5, "cherryjelly" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/apple/jelly/cherry
+
+/datum/recipe/microwave/pink_donut
+ reagents = list("berryjuice" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/pink
+
+/datum/recipe/microwave/pink_donut/jelly
+ reagents = list("berryjuice" = 5, "sugar" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/pink/jelly
+
+/datum/recipe/microwave/pink_donut/jelly/slime
+ reagents = list("berryjuice" = 5, "slimejelly" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/pink/jelly/slime
+
+/datum/recipe/microwave/pink_donut/jelly/cherry
+ reagents = list("berryjuice" = 5, "cherryjelly" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/pink/jelly/cherry
+
+/datum/recipe/microwave/blumpkin_donut
+ reagents = list("blumpkinjuice" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/blumpkin
+
+/datum/recipe/microwave/blumpkin_donut/jelly
+ reagents = list("blumpkinjuice" = 5, "berryjuice" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/blumpkin/jelly
+
+/datum/recipe/microwave/blumpkin_donut/jelly/slime
+ reagents = list("blumpkinjuice" = 5, "slimejelly" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/blumpkin/jelly/slime
+
+/datum/recipe/microwave/blumpkin_donut/jelly/cherry
+ reagents = list("blumpkinjuice" = 5, "cherryjelly" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/blumpkin/jelly/cherry
+
+/datum/recipe/microwave/bungo_donut
+ reagents = list("bungojuice" = 5, "coldsauce" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/bungo
+
+/datum/recipe/microwave/bungo_donut/jelly
+ reagents = list("bungojuice" = 5, "coldsauce" = 5, "berryjuice" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/bungo/jelly
+
+/datum/recipe/microwave/bungo_donut/jelly/slime
+ reagents = list("bungojuice" = 5, "coldsauce" = 5, "slimejelly" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/bungo/jelly/slime
+
+/datum/recipe/microwave/bungo_donut/jelly/cherry
+ reagents = list("bungojuice" = 5, "coldsauce" = 5, "cherryjelly" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/bungo/jelly/cherry
+
+/datum/recipe/microwave/caramel_donut
+ items = list(
+ /obj/item/food/donut,
+ /obj/item/food/candy/caramel
+ )
+ result = /obj/item/food/donut/caramel
+
+/datum/recipe/microwave/caramel_donut/jelly
+ reagents = list("berryjuice" = 5)
+ items = list(
+ /obj/item/food/donut,
+ /obj/item/food/candy/caramel
+ )
+ result = /obj/item/food/donut/caramel/jelly
+
+/datum/recipe/microwave/caramel_donut/jelly/slime
+ reagents = list("slimejelly" = 5)
+ items = list(
+ /obj/item/food/donut,
+ /obj/item/food/candy/caramel
+ )
+ result = /obj/item/food/donut/caramel/jelly/slime
+
+/datum/recipe/microwave/caramel_donut/jelly/cherry
+ reagents = list("cherryjelly" = 5)
+ items = list(
+ /obj/item/food/donut,
+ /obj/item/food/candy/caramel
+ )
+ result = /obj/item/food/donut/caramel/jelly/cherry
+
+/datum/recipe/microwave/chocolate_donut
+ items = list(
+ /obj/item/food/donut,
+ /obj/item/food/chocolatebar
+ )
+ result = /obj/item/food/donut/chocolate
+
+/datum/recipe/microwave/chocolate_donut/jelly
+ reagents = list("berryjuice" = 5)
+ items = list(
+ /obj/item/food/donut,
+ /obj/item/food/chocolatebar
+ )
+ result = /obj/item/food/donut/chocolate/jelly
+
+/datum/recipe/microwave/chocolate_donut/jelly/slime
+ reagents = list("slimejelly" = 5)
+ items = list(
+ /obj/item/food/donut,
+ /obj/item/food/chocolatebar
+ )
+ result = /obj/item/food/donut/chocolate/jelly/slime
+
+/datum/recipe/microwave/chocolate_donut/jelly/cherry
+ reagents = list("cherryjelly" = 5)
+ items = list(
+ /obj/item/food/donut,
+ /obj/item/food/chocolatebar
+ )
+ result = /obj/item/food/donut/chocolate/jelly/cherry
+
+/datum/recipe/microwave/matcha_donut
+ reagents = list("teapowder" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/matcha
+
+/datum/recipe/microwave/matcha_donut/jelly
+ reagents = list("teapowder" = 5, "berryjuice" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/matcha/jelly
+
+/datum/recipe/microwave/matcha_donut/jelly/slime
+ reagents = list("teapowder" = 5, "slimejelly" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/matcha/jelly/slime
+
+/datum/recipe/microwave/matcha_donut/jelly/cherry
+ reagents = list("teapowder" = 5, "cherryjelly" = 5)
+ items = list(
+ /obj/item/food/donut
+ )
+ result = /obj/item/food/donut/matcha/jelly/cherry
+
+/datum/recipe/microwave/meat_donut
+ reagents = list("ketchup" = 5)
+ items = list(
+ /obj/item/food/cookiedough,
+ /obj/item/food/meat
+ )
+ result = /obj/item/food/donut/meat
+
+/datum/recipe/microwave/spaceman_donut
+ items = list(
+ /obj/item/food/donut,
+ /obj/item/food/grown/trumpet
+ )
+ result = /obj/item/food/donut/spaceman
+
+/datum/recipe/microwave/spaceman_donut/jelly
+ reagents = list("berryjuice" = 5)
+ items = list(
+ /obj/item/food/donut,
+ /obj/item/food/grown/trumpet
+ )
+ result = /obj/item/food/donut/spaceman/jelly
+
+/datum/recipe/microwave/spaceman_donut/jelly/slime
+ reagents = list("slimejelly" = 5)
+ items = list(
+ /obj/item/food/donut,
+ /obj/item/food/grown/trumpet
+ )
+ result = /obj/item/food/donut/spaceman/jelly/slime
+
+/datum/recipe/microwave/spaceman_donut/jelly/cherry
+ reagents = list("cherryjelly" = 5)
+ items = list(
+ /obj/item/food/donut,
+ /obj/item/food/grown/trumpet
+ )
+ result = /obj/item/food/donut/spaceman/jelly/cherry
+
/datum/recipe/microwave/human/burger
items = list(
/obj/item/food/meat/human,
@@ -1144,6 +1385,29 @@
)
result = /obj/item/food/frozen/icecreamsandwich
+/datum/recipe/microwave/cheese_balls
+ reagents = list("flour" = 5, "sugar" = 5, "honey" = 5)
+ items = list(
+ /obj/item/food/cheese_curds,
+ /obj/item/food/chocolatebar
+ )
+ result = /obj/item/food/cheese_balls
+
+/datum/recipe/microwave/red_porridge
+ reagents = list("vanilla" = 5, "sugar" = 5, "yogurt" = 10)
+ items = list(
+ /obj/item/food/grown/redbeet
+ )
+ result = /obj/item/food/soup/red_porridge
+
+/datum/recipe/microwave/dulce_de_batata
+ reagents = list("vanilla" = 5, "water" = 5)
+ items = list(
+ /obj/item/food/grown/potato/sweet,
+ /obj/item/food/grown/potato/sweet
+ )
+ result = /obj/item/food/sliceable/dulce_de_batata
+
/datum/recipe/microwave/berryicecreamsandwich
reagents = list("ice" = 5, "cream" = 5)
items = list(
diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm
index 8b0dc71ba6bd..9012cba58c60 100644
--- a/code/modules/food_and_drinks/recipes/recipes_oven.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm
@@ -77,6 +77,152 @@
)
result = /obj/item/food/muffin
+/datum/recipe/oven/berry_muffin
+ reagents = list("milk" = 5, "sugar" = 5)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/food/grown/berries
+ )
+ result = /obj/item/food/berry_muffin
+
+/datum/recipe/oven/booberry_muffin
+ reagents = list("milk" = 5, "sugar" = 5)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/food/grown/berries,
+ /obj/item/food/ectoplasm
+ )
+ result = /obj/item/food/booberry_muffin
+
+/datum/recipe/oven/moffin
+ reagents = list("milk" = 5, "sugar" = 5)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/grown/cotton
+ )
+ result = /obj/item/food/moffin
+
+/datum/recipe/oven/holy_cake
+ reagents = list("milk" = 5, "sugar" = 15, "holywater" = 15)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/food/dough
+ )
+ result = /obj/item/food/sliceable/holy_cake
+
+/datum/recipe/oven/liars_cake
+ reagents = list("milk" = 5, "sugar" = 15)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/food/grown/berries,
+ /obj/item/food/grown/berries,
+ /obj/item/food/grown/berries,
+ /obj/item/food/grown/berries,
+ /obj/item/food/grown/berries,
+ /obj/item/food/chocolatebar,
+ /obj/item/food/chocolatebar
+ )
+ result = /obj/item/food/sliceable/liars_cake
+
+/datum/recipe/oven/vanilla_berry_cake
+ reagents = list("milk" = 5, "sugar" = 15)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/food/grown/berries,
+ /obj/item/food/grown/berries,
+ /obj/item/food/grown/berries,
+ /obj/item/food/grown/berries,
+ /obj/item/food/grown/berries
+ )
+ result = /obj/item/food/sliceable/vanilla_berry_cake
+
+/datum/recipe/oven/hardware_cake
+ reagents = list("milk" = 5, "sugar" = 15, "sacid" = 5)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/circuitboard,
+ /obj/item/circuitboard
+ )
+ result = /obj/item/food/sliceable/hardware_cake
+
+/datum/recipe/oven/plum_cake
+ reagents = list("milk" = 5, "sugar" = 15)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/food/grown/plum,
+ /obj/item/food/grown/plum
+ )
+ result = /obj/item/food/sliceable/plum_cake
+
+/datum/recipe/oven/pound_cake
+ reagents = list("milk" = 5, "sugar" = 15)
+ items = list(
+ /obj/item/food/sliceable/plaincake,
+ /obj/item/food/sliceable/plaincake,
+ /obj/item/food/sliceable/plaincake,
+ /obj/item/food/sliceable/plaincake
+ )
+ result = /obj/item/food/sliceable/pound_cake
+
+/datum/recipe/oven/pumpkin_spice_cake
+ reagents = list("milk" = 5, "sugar" = 15)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/food/grown/pumpkin,
+ /obj/item/food/grown/pumpkin
+ )
+ result = /obj/item/food/sliceable/pumpkin_spice_cake
+
+/datum/recipe/oven/slime_cake
+ reagents = list("milk" = 5, "sugar" = 15)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/slime_extract
+ )
+ result = /obj/item/food/sliceable/slime_cake
+
+/datum/recipe/oven/spaceman_cake
+ reagents = list("milk" = 5, "sugar" = 15, "cream" = 5, "berryjuice" = 5)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/food/grown/trumpet,
+ /obj/item/food/grown/trumpet
+ )
+ result = /obj/item/food/sliceable/spaceman_cake
+
+/datum/recipe/oven/vanilla_cake
+ reagents = list("milk" = 5, "sugar" = 15)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/food/dough,
+ /obj/item/food/grown/vanillapod,
+ /obj/item/food/grown/vanillapod
+ )
+ result = /obj/item/food/sliceable/vanilla_cake
+
+/datum/recipe/oven/mothmallow
+ reagents = list("vanilla" = 5, "sugar" = 15, "rum" = 5)
+ items = list(
+ /obj/item/food/grown/soybeans
+ )
+ result = /obj/item/food/sliceable/mothmallow
+
/datum/recipe/oven/carrotcake
reagents = list("milk" = 5, "sugar" = 15)
items = list(
@@ -169,6 +315,127 @@
)
result = /obj/item/food/berryclafoutis
+/datum/recipe/oven/cherry_cupcake
+ reagents = list("milk" = 5, "sugar" = 5)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/food/grown/cherries
+ )
+ result = /obj/item/food/cherry_cupcake
+
+/datum/recipe/oven/cherry_cupcake/blue
+ reagents = list("milk" = 5, "sugar" = 5)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/food/grown/bluecherries
+ )
+ result = /obj/item/food/cherry_cupcake/blue
+
+/datum/recipe/oven/oatmeal_cookie
+ reagents = list("milk" = 5, "sugar" = 5)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/food/grown/oat
+ )
+ result = /obj/item/food/oatmeal_cookie
+
+/datum/recipe/oven/raisin_cookie
+ reagents = list("milk" = 5, "sugar" = 5)
+ items = list(
+ /obj/item/food/dough,
+ /obj/item/food/no_raisin
+ )
+ result = /obj/item/food/raisin_cookie
+
+/datum/recipe/oven/peanut_butter_cookie
+ reagents = list("milk" = 5, "sugar" = 5, "peanutbutter" = 5)
+ items = list(
+ /obj/item/food/dough
+ )
+ result = /obj/item/food/peanut_butter_cookie
+
+/datum/recipe/oven/chocolate_cornet
+ reagents = list("milk" = 5, "sugar" = 5, "sodiumchloride" = 1)
+ items = list(
+ /obj/item/food/cookiedough,
+ /obj/item/food/chocolatebar
+ )
+ result = /obj/item/food/chocolate_cornet
+
+/datum/recipe/oven/honey_bun
+ reagents = list("milk" = 5, "sugar" = 5, "honey" = 5)
+ items = list(
+ /obj/item/food/cookiedough
+ )
+ result = /obj/item/food/honey_bun
+
+/datum/recipe/oven/cannoli
+ reagents = list("milk" = 1, "sugar" = 3)
+ items = list(
+ /obj/item/food/cookiedough
+ )
+ result = /obj/item/food/cannoli
+
+/datum/recipe/oven/beary_pie
+ items = list(
+ /obj/item/food/sliceable/flatdough,
+ /obj/item/food/monstermeat/bearmeat,
+ /obj/item/food/grown/berries
+ )
+ result = /obj/item/food/beary_pie
+
+/datum/recipe/oven/blumpkin_pie
+ reagents = list("milk" = 5, "sugar" = 5)
+ items = list(
+ /obj/item/food/sliceable/flatdough,
+ /obj/item/food/grown/pumpkin/blumpkin
+ )
+ result = /obj/item/food/sliceable/blumpkin_pie
+
+/datum/recipe/oven/chocolate_lava_tart
+ reagents = list("milk" = 5, "sugar" = 5)
+ items = list(
+ /obj/item/food/sliceable/flatdough,
+ /obj/item/food/chocolatebar,
+ /obj/item/food/chocolatebar,
+ /obj/item/food/chocolatebar,
+ /obj/item/slime_extract
+ )
+ result = /obj/item/food/chocolate_lava_tart
+
+/datum/recipe/oven/french_silk_pie
+ reagents = list("sugar" = 5)
+ items = list(
+ /obj/item/food/sliceable/flatdough,
+ /obj/item/food/chocolatebar,
+ /obj/item/food/chocolatebar
+ )
+ result = /obj/item/food/sliceable/french_silk_pie
+
+/datum/recipe/oven/frosty_pie
+ items = list(
+ /obj/item/food/sliceable/flatdough,
+ /obj/item/food/grown/bluecherries
+ )
+ result = /obj/item/food/sliceable/frosty_pie
+
+/datum/recipe/oven/grape_tart
+ reagents = list("milk = 5", "sugar" = 5)
+ items = list(
+ /obj/item/food/sliceable/flatdough,
+ /obj/item/food/grown/grapes,
+ /obj/item/food/grown/grapes,
+ /obj/item/food/grown/grapes
+ )
+ result = /obj/item/food/grape_tart
+
+/datum/recipe/oven/mime_tart
+ reagents = list("nothing" = 5, "milk = 5", "sugar" = 5)
+ items = list(
+ /obj/item/food/sliceable/flatdough
+ )
+ result = /obj/item/food/mime_tart
+
/datum/recipe/oven/tofubread
items = list(
/obj/item/food/dough,
diff --git a/code/modules/hallucinations/effects/major.dm b/code/modules/hallucinations/effects/major.dm
index afef2358f29f..012da9f55ad5 100644
--- a/code/modules/hallucinations/effects/major.dm
+++ b/code/modules/hallucinations/effects/major.dm
@@ -302,11 +302,11 @@
if(prob(80))
new_name = "Unknown"
hallucination_icon = 'icons/mob/simple_human.dmi'
- hallucination_icon_state = pick("arctic_skeleton", "templar", "skeleton", "russianmelee", "piratemelee", "plasma_miner_tool", "cat_butcher", "syndicate_space_sword", "syndicate_stormtrooper_sword", "zombie", "scary_clown")
+ hallucination_icon_state = pick("arctic_skeleton", "templar", "skeleton", "sovietmelee", "piratemelee", "plasma_miner_tool", "cat_butcher", "syndicate_space_sword", "syndicate_stormtrooper_sword", "zombie", "scary_clown")
// Adjust the attack verb and sound depending on the "mob"
switch(hallucination_icon_state)
- if("arctic_skeleton", "templar", "russianmelee", "plasma_miner_tool")
+ if("arctic_skeleton", "templar", "sovietmelee", "plasma_miner_tool")
attack_verb = "slashed"
attack_sound = 'sound/weapons/bladeslice.ogg'
if("cat_butcher")
diff --git a/code/modules/hydroponics/compost_bin.dm b/code/modules/hydroponics/compost_bin.dm
index 027b0d03f9ee..d42c6f74b956 100644
--- a/code/modules/hydroponics/compost_bin.dm
+++ b/code/modules/hydroponics/compost_bin.dm
@@ -96,7 +96,7 @@
to_chat(user, "You have very nearly saturated the contents of [src] with potassium.")
SStgui.update_uis(src)
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
return TRUE
if(istype(O, /obj/item/food/grown))
@@ -110,7 +110,7 @@
make_biomass(O)
to_chat(user, "You put [O] in [src].")
SStgui.update_uis(src)
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
return TRUE
if(istype(O, /obj/item/reagent_containers))
var/proportion = 0
@@ -154,7 +154,7 @@
to_chat(user, "[src] has been nearly filled with potash.")
SStgui.update_uis(src)
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
return TRUE
@@ -199,7 +199,7 @@
biomass -= conversion_amount + potash_saltpetre_conversion + potassium_saltpetre_conversion
compost += conversion_amount
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
SStgui.update_uis(src)
// Makes soil from compost
@@ -209,7 +209,7 @@
return
new /obj/item/stack/sheet/soil(loc, amount)
compost -= SOIL_COST * amount
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
SStgui.update_uis(src)
/obj/machinery/compost_bin/attack_hand(mob/user)
diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm
index fdbed68d1395..24521ccb0f85 100644
--- a/code/modules/hydroponics/gene_modder.dm
+++ b/code/modules/hydroponics/gene_modder.dm
@@ -451,7 +451,7 @@
else
core_gene.value = min(core_gene.value, genemod_var)
- disk.update_name()
+ disk.update_appearance(UPDATE_NAME)
QDEL_NULL(seed)
update_icon(UPDATE_OVERLAYS)
update_genes()
@@ -493,7 +493,7 @@
var/datum/plant_gene/core/C = gene.Copy()
disk.core_genes += C
- disk.update_name()
+ disk.update_appearance(UPDATE_NAME)
QDEL_NULL(seed)
update_icon(UPDATE_OVERLAYS)
update_genes()
diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm
index cc21fca814ee..d57ee07ec307 100644
--- a/code/modules/hydroponics/grown/cocoa_vanilla.dm
+++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm
@@ -15,7 +15,7 @@
icon_grow = "cocoapod-grow"
icon_dead = "cocoapod-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
- mutatelist = list(/obj/item/seeds/cocoapod/vanillapod)
+ mutatelist = list(/obj/item/seeds/cocoapod/vanillapod, /obj/item/seeds/cocoapod/bungotree)
reagents_add = list("cocoa" = 0.25, "plantmatter" = 0.1)
/obj/item/food/grown/cocoapod
@@ -47,3 +47,40 @@
filling_color = "#FEFEFE"
tastes = list("vanilla" = 1)
distill_reagent = "vanilla" //Takes longer, but you can get even more vanilla from it.
+
+// Bungo Pod
+
+/obj/item/seeds/cocoapod/bungotree
+ name = "pack of bungo tree seeds"
+ desc = "These seeds grow into bungo trees. They appear to be heavy and almost perfectly spherical."
+ icon_state = "seed-bungotree"
+ species = "bungotree"
+ plantname = "Bungo Tree"
+ product = /obj/item/food/grown/bungofruit
+ lifespan = 30
+ maturation = 4
+ yield = 3
+ production = 7
+ mutatelist = null
+ reagents_add = list("enzyme"= 0.1, "nutriment" = 0.1, "bungojuice" = 0.1)
+ growthstages = 4
+ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
+ icon_grow = "bungotree-grow"
+ icon_dead = "bungotree-dead"
+
+/obj/item/food/grown/bungofruit
+ seed = /obj/item/seeds/cocoapod/bungotree
+ name = "bungo fruit"
+ desc = "A strange fruit, tough leathery skin protects its juicy flesh and large poisonous seed."
+ icon_state = "bungo"
+ trash = /obj/item/food/grown/bungopit
+ tastes = list("bungo" = 2, "tropical fruitiness" = 1, "an acidic, poisonous tang" = 1)
+ distill_reagent = null
+
+/obj/item/food/grown/bungopit
+ seed = /obj/item/seeds/cocoapod/bungotree
+ name = "bungo pit"
+ icon_state = "bungopit"
+ desc = "A large seed from a bungo fruit."
+ w_class = WEIGHT_CLASS_TINY
+ tastes = list("acrid bitterness" = 1)
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index 095aeca5190d..505ccd1b123a 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -38,7 +38,7 @@
icon_grow = "lily-grow"
icon_dead = "lily-dead"
product = /obj/item/food/grown/lily
- mutatelist = list()
+ mutatelist = list(/obj/item/seeds/poppy/lily/trumpet)
/obj/item/food/grown/lily
seed = /obj/item/seeds/poppy/lily
@@ -51,6 +51,36 @@
filling_color = "#C7BBAD"
distill_reagent = "vermouth"
+//Spaceman's Trumpet
+
+/obj/item/seeds/poppy/lily/trumpet
+ name = "pack of spaceman's trumpet seeds"
+ desc = "A plant sculped by extensive genetic engineering. The spaceman's trumpet is said to bear no resemblance to its wild ancestors. Inside NT AgriSci circles it is better known as NTPW-0372."
+ icon_state = "seed-trumpet"
+ species = "spacemanstrumpet"
+ plantname = "Spaceman's Trumpet Plant"
+ product = /obj/item/food/grown/trumpet
+ lifespan = 80
+ production = 5
+ endurance = 10
+ maturation = 12
+ yield = 4
+ potency = 20
+ growthstages = 4
+ weed_rate = 2
+ weed_chance = 10
+ growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
+ icon_grow = "spacemanstrumpet-grow"
+ icon_dead = "spacemanstrumpet-dead"
+ mutatelist = null
+ reagents_add = list(/datum/reagent/consumable/nutriment = 0.05)
+
+/obj/item/food/grown/trumpet
+ seed = /obj/item/seeds/poppy/lily/trumpet
+ name = "spaceman's trumpet"
+ desc = "A vivid flower that smells faintly of freshly cut grass. Touching the flower seems to stain the skin some time after contact, yet most other surfaces seem to be unaffected by this phenomenon."
+ icon_state = "spacemanstrumpet"
+
// Geranium
/obj/item/seeds/poppy/geranium
name = "pack of geranium seeds"
diff --git a/code/modules/hydroponics/grown/plum.dm b/code/modules/hydroponics/grown/plum.dm
new file mode 100644
index 000000000000..dc342afa7809
--- /dev/null
+++ b/code/modules/hydroponics/grown/plum.dm
@@ -0,0 +1,23 @@
+/obj/item/seeds/plum
+ name = "pack of plum seeds"
+ desc = "These seeds grow into plum trees."
+ icon_state = "seed-plum"
+ species = "plum"
+ plantname = "Plum Tree"
+ product = /obj/item/food/grown/plum
+ lifespan = 55
+ endurance = 35
+ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
+ icon_grow = "plum-grow"
+ icon_dead = "plum-dead"
+ genes = list(/datum/plant_gene/trait/repeated_harvest)
+ reagents_add = list("nutriment" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.1)
+
+/obj/item/food/grown/plum
+ seed = /obj/item/seeds/plum
+ name = "plum"
+ desc = "A poet's favorite fruit. Noice."
+ icon_state = "plum"
+ filling_color = "#F6CB0B"
+ bitesize = 4
+ tastes = list("plum" = 1)
diff --git a/code/modules/input/input.dm b/code/modules/input/input.dm
index 4600c311fb87..36aafd6a61ba 100644
--- a/code/modules/input/input.dm
+++ b/code/modules/input/input.dm
@@ -5,6 +5,8 @@
return
/datum/proc/key_loop(client/C)
+ // Sleeps in input handling are bad, because they can stall the entire subsystem indefinitely, breaking most movement. The subsystem sets waitfor=FALSE, which works around this, but we'd rather avoid the sleeps in the first place.
+ SHOULD_NOT_SLEEP(TRUE)
return
/client/key_loop()
diff --git a/code/modules/instruments/objs/items/headphones.dm b/code/modules/instruments/objs/items/headphones.dm
index 8ea5c4b12e45..32373c5afb4d 100644
--- a/code/modules/instruments/objs/items/headphones.dm
+++ b/code/modules/instruments/objs/items/headphones.dm
@@ -23,9 +23,17 @@
/obj/item/clothing/ears/headphones/ui_action_click(mob/user, actiontype)
if(actiontype == /datum/action/item_action/change_headphones_song)
ui_interact(user)
- else
- on = !on
- update_icon(UPDATE_ICON_STATE)
+ else if(actiontype == /datum/action/item_action/toggle_music_notes)
+ toggle_visual_notes(user)
+
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtons()
+
+/obj/item/clothing/ears/headphones/proc/toggle_visual_notes(mob/user)
+ on = !on
+ update_icon(UPDATE_ICON_STATE)
+ user.regenerate_icons()
/obj/item/clothing/ears/headphones/ui_data(mob/user)
return song.ui_data(user)
diff --git a/code/modules/lavaland/caves_theme.dm b/code/modules/lavaland/caves_theme.dm
new file mode 100644
index 000000000000..6a47985fcf41
--- /dev/null
+++ b/code/modules/lavaland/caves_theme.dm
@@ -0,0 +1,214 @@
+/// Approximate lower bound of the walkable land area on Lavaland, north of the southern lava border.
+#define LAVALAND_MIN_CAVE_Y 10
+/// Approximate upper bound of the walkable land area on Lavaland, south of the Legion entrance.
+#define LAVALAND_MAX_CAVE_Y 222
+
+#define SPAWN_MEGAFAUNA "bluh bluh huge boss"
+
+/// Effective probability modifier for spawning flora and fauna in oases.
+#define OASIS_SPAWNER_PROB_MODIFIER 43
+
+GLOBAL_LIST_INIT(megafauna_spawn_list, list(
+ /mob/living/simple_animal/hostile/megafauna/dragon = 4,
+ /mob/living/simple_animal/hostile/megafauna/colossus = 2,
+ /mob/living/simple_animal/hostile/megafauna/bubblegum = 6,
+ /mob/living/simple_animal/hostile/megafauna/ancient_robot = 4,
+))
+
+GLOBAL_LIST_INIT(caves_default_mob_spawns, list(
+ /obj/effect/landmark/mob_spawner/abandoned_minebot = 6,
+ /obj/effect/landmark/mob_spawner/goldgrub = 10,
+ /obj/effect/landmark/mob_spawner/goliath = 50,
+ /obj/effect/landmark/mob_spawner/gutlunch = 4,
+ /obj/effect/landmark/mob_spawner/legion = 30,
+ /obj/effect/landmark/mob_spawner/watcher = 40,
+
+ /obj/structure/spawner/lavaland = 2,
+ /obj/structure/spawner/lavaland/goliath = 3,
+ /obj/structure/spawner/lavaland/legion = 3,
+
+ SPAWN_MEGAFAUNA = 6,
+))
+
+GLOBAL_LIST_INIT(caves_default_flora_spawns, list(
+ /obj/structure/flora/ash/cacti = 1,
+ /obj/structure/flora/ash/cap_shroom = 2,
+ /obj/structure/flora/ash/leaf_shroom = 2,
+ /obj/structure/flora/ash/rock/style_random = 1,
+ /obj/structure/flora/ash/stem_shroom = 2,
+ /obj/structure/flora/ash/tall_shroom = 2,
+))
+
+/proc/lavaland_caves_spawn_mob(turf/T, mob_scan_range = 12, megafauna_scan_range = 7)
+ var/mob_spawn = pickweight(GLOB.caves_default_mob_spawns)
+
+ while(mob_spawn == SPAWN_MEGAFAUNA)
+ if(istype(get_area(T), /area/lavaland/surface/outdoors/unexplored/danger)) //this is danger. it's boss time.
+ mob_spawn = pickweight(GLOB.megafauna_spawn_list)
+ else //this is not danger, don't spawn a boss, spawn something else
+ mob_spawn = pickweight(GLOB.caves_default_mob_spawns)
+
+ for(var/thing in urange(mob_scan_range, T))
+ if(!(ishostile(thing) || istype(thing, /obj/structure/spawner) || istype(thing, /obj/effect/landmark/mob_spawner)))
+ continue
+ // don't spawn a megafauna if there's already one within view
+ if((ispath(mob_spawn, /mob/living/simple_animal/hostile/megafauna) || ismegafauna(thing)) && (get_dist(T, thing) <= megafauna_scan_range))
+ return
+ // if the random is a standard mob, avoid spawning if there's another one within the scan range
+ if(ispath(mob_spawn, /obj/effect/landmark/mob_spawner) && istype(thing, /obj/effect/landmark/mob_spawner))
+ return
+ // prevents tendrils spawning in each other's collapse range
+ if((ispath(mob_spawn, /obj/structure/spawner/lavaland) && istype(thing, /obj/structure/spawner/lavaland)) && get_dist(T, thing) <= LAVALAND_TENDRIL_COLLAPSE_RANGE)
+ return
+
+ // there can be only one bubblegum, so don't waste spawns on it
+ if(ispath(mob_spawn, /mob/living/simple_animal/hostile/megafauna/bubblegum))
+ GLOB.megafauna_spawn_list.Remove(mob_spawn)
+
+ // same as above, we do not want multiple of these robots
+ if(ispath(mob_spawn, /mob/living/simple_animal/hostile/megafauna/ancient_robot))
+ GLOB.megafauna_spawn_list.Remove(mob_spawn)
+
+ new mob_spawn(T)
+ SSblackbox.record_feedback("tally", "lavaland_mob_spawns", 1, "[mob_spawn]")
+
+/proc/lavaland_caves_spawn_flora(turf/T)
+ var/flora_spawn = pickweight(GLOB.caves_default_flora_spawns)
+ for(var/obj/structure/flora/ash/F in range(4, T)) //Allows for growing patches, but not ridiculous stacks of flora
+ if(!istype(F, flora_spawn))
+ return
+ new flora_spawn(T)
+
+/datum/caves_theme
+ var/name = "Not Specified"
+
+ var/seed
+ var/perlin_accuracy = 5
+ var/perlin_stamp_size = 10
+ var/perlin_lower_range = 0
+ var/perlin_upper_range = 0.3
+
+/datum/caves_theme/New()
+ seed = rand(1, 999999)
+
+/datum/caves_theme/proc/setup()
+ var/result = rustg_dbp_generate("[seed]", "[perlin_accuracy]", "[perlin_stamp_size]", "[world.maxx]", "[perlin_lower_range]", "[perlin_upper_range]")
+ var/z = level_name_to_num(MINING)
+ for(var/turf/T in block(1, 1, z, world.maxx, world.maxy, z))
+ if(!istype(get_area(T), /area/lavaland/surface/outdoors/unexplored))
+ continue
+ if(!istype(T, /turf/simulated/mineral))
+ continue
+ var/c = result[world.maxx * (T.y - 1) + T.x]
+ if(c == "1")
+ T.ChangeTurf(/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface)
+ on_change(T)
+
+ CHECK_TICK
+
+/datum/caves_theme/proc/on_change(turf/T)
+ if(prob(2))
+ lavaland_caves_spawn_flora(T)
+ else if(prob(1))
+ lavaland_caves_spawn_mob(T)
+
+/datum/caves_theme/proc/safe_replace(turf/T)
+ if(T.flags & NO_LAVA_GEN)
+ return FALSE
+ if(!istype(get_area(T), /area/lavaland/surface/outdoors/unexplored))
+ return FALSE
+ if(istype(T, /turf/simulated/floor/chasm))
+ return FALSE
+ if(istype(T, /turf/simulated/floor/lava/lava_land_surface))
+ return FALSE
+ if(istype(T, /turf/simulated/floor/lava/mapping_lava))
+ return FALSE
+
+ return TRUE
+
+/datum/caves_theme/classic
+ name = "Classic Caves"
+
+/datum/caves_theme/burrows
+ name = "Blocked Burrows"
+ perlin_accuracy = 90
+ perlin_stamp_size = 7
+ perlin_lower_range = 0
+ perlin_upper_range = 0.3
+
+/datum/caves_theme/burrows/on_change(turf/T)
+ if(prob(9))
+ new /obj/structure/flora/ash/rock/style_random(T)
+ else if(prob(5))
+ lavaland_caves_spawn_flora(T)
+ else if(prob(1))
+ lavaland_caves_spawn_mob(T)
+
+/datum/caves_theme/deeprock/proc/maybe_make_room(turf/T)
+ if(rand(1, 150) != 1)
+ return
+
+ for(var/turf/oasis_centroid in oasis_centroids)
+ if(get_dist(T, oasis_centroid) < oasis_padding)
+ return
+
+ oasis_centroids |= T
+ var/new_scan_range = rand(4, 7)
+ var/tempradius = rand(10, 15)
+ var/probmodifer = OASIS_SPAWNER_PROB_MODIFIER * tempradius
+ var/list/oasis_turfs = list()
+ for(var/turf/NT in circlerangeturfs(T, tempradius))
+ var/distance = (max(get_dist(T, NT), 1)) //Get dist throws -1 if same turf
+ if(safe_replace(NT) && prob(min(probmodifer / distance, 100)))
+ var/turf/changed = NT.ChangeTurf(/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface)
+ if(prob(5))
+ lavaland_caves_spawn_mob(changed, new_scan_range, new_scan_range)
+ else if(prob(10))
+ lavaland_caves_spawn_flora(changed)
+ oasis_turfs |= NT
+
+ if(prob(50))
+ tempradius = round(tempradius / 3)
+ var/oasis_laketype = pickweight(lake_weights)
+ if(oasis_laketype == /turf/simulated/floor/plating/asteroid)
+ new /obj/effect/spawner/oasisrock(T, tempradius)
+ for(var/turf/oasis in circlerangeturfs(T, tempradius))
+ if(safe_replace(oasis))
+ oasis.ChangeTurf(oasis_laketype)
+ oasis_turfs -= oasis
+
+ // Move tendrils out of the oasis
+ for(var/obj/structure/spawner/lavaland/O in circlerange(T, tempradius))
+ O.forceMove(pick_n_take(oasis_turfs))
+
+ return T
+
+/datum/caves_theme/deeprock
+ name = "Deadly Deeprock"
+ perlin_stamp_size = 12
+ perlin_lower_range = 0
+ perlin_upper_range = 0.2
+ var/oasis_padding = 50
+ var/list/oasis_centroids = list()
+ var/lake_weights = list(
+ /turf/simulated/floor/lava/lava_land_surface = 4,
+ /turf/simulated/floor/lava/lava_land_surface/plasma = 4,
+ /turf/simulated/floor/chasm/straight_down/lava_land_surface = 4,
+ /turf/simulated/floor/lava/mapping_lava = 6,
+ /turf/simulated/floor/beach/away/water/lavaland_air = 1,
+ /turf/simulated/floor/plating/asteroid = 1
+ )
+
+/datum/caves_theme/deeprock/on_change(turf/T)
+ maybe_make_room(T)
+ if(prob(3))
+ lavaland_caves_spawn_flora(T)
+ else if(prob(2))
+ lavaland_caves_spawn_mob(T)
+
+
+#undef OASIS_SPAWNER_PROB_MODIFIER
+#undef SPAWN_MEGAFAUNA
+
+#undef LAVALAND_MIN_CAVE_Y
+#undef LAVALAND_MAX_CAVE_Y
diff --git a/code/modules/lavaland/lavaland_theme.dm b/code/modules/lavaland/lavaland_theme.dm
index 20dfdecb38ae..08ce4d374a78 100644
--- a/code/modules/lavaland/lavaland_theme.dm
+++ b/code/modules/lavaland/lavaland_theme.dm
@@ -1,8 +1,3 @@
-/// Approximate lower bound of the walkable land area on Lavaland, north of the southern lava border.
-#define LAVALAND_MIN_CAVE_Y 10
-/// Approximate upper bound of the walkable land area on Lavaland, south of the Legion entrance.
-#define LAVALAND_MAX_CAVE_Y 222
-
/datum/lavaland_theme
/// Name of lavaland theme
var/name = "Not Specified"
@@ -17,20 +12,6 @@
else if(!ispath(primary_turf_type))
stack_trace("Wrong turf type `[primary_turf_type.type]` in `[type]` lavaland theme")
-/datum/lavaland_theme/proc/setup_caves()
- var/max_attempts = 100
- var/max_cave_spawns = 40
- var/z = level_name_to_num(MINING)
- while(max_attempts > 0 && max_cave_spawns > 0)
- var/x = rand(1, world.maxx)
- var/y = rand(LAVALAND_MIN_CAVE_Y, LAVALAND_MAX_CAVE_Y)
- var/turf/next_turf = locate(x, y, z)
- var/area/next_area = get_area(next_turf)
- if(istype(next_turf, /turf/simulated/mineral/random/volcanic) && istype(next_area, /area/lavaland/surface/outdoors/unexplored/danger))
- next_turf.ChangeTurf(/turf/simulated/floor/plating/asteroid/airless/cave/volcanic, FALSE, TRUE, TRUE)
- max_cave_spawns--
- max_attempts--
-
/**
* This proc should do all theme specific thing.
* Now it only generates rivers, but it can do all stuff you desire.
@@ -66,5 +47,3 @@
var/datum/river_spawner/spawner = new(level_name_to_num(MINING), spread_prob_ = 10, spread_prob_loss_ = 5)
spawner.generate(nodes = 6, min_x = 50, min_y = 7, max_x = 250, max_y = 225)
-#undef LAVALAND_MIN_CAVE_Y
-#undef LAVALAND_MAX_CAVE_Y
diff --git a/code/modules/library/library_catalog.dm b/code/modules/library/library_catalog.dm
index cabc94a9c3b1..7a1b39fe3135 100644
--- a/code/modules/library/library_catalog.dm
+++ b/code/modules/library/library_catalog.dm
@@ -452,7 +452,8 @@
var/list/flag_json = list()
//Flagged book json is stored as such: "[[reporter_ckey1, report_id1],[reporter_ckey2, report_id2]]""
for(var/datum/flagged_book/book in reportedbook.reports)
- flag_json += list(list( //yes this is intentional
+ //yes this is intentional
+ flag_json += list(list(
book.reporter,
book.category_id,
))
diff --git a/code/modules/library/library_computer.dm b/code/modules/library/library_computer.dm
index 2bac8221c60d..a98a441fca9d 100644
--- a/code/modules/library/library_computer.dm
+++ b/code/modules/library/library_computer.dm
@@ -301,7 +301,7 @@
//rating acts
if("set_rating")
if(params["rating_value"])
- user_data.selected_rating = text2num(params["rating_value"])
+ user_data.selected_rating = clamp(text2num(params["rating_value"]), 0, 10)
if("rate_book")
if(GLOB.library_catalog.rate_book(params["user_ckey"], params["bookid"], user_data.selected_rating))
playsound(loc, 'sound/machines/ping.ogg', 25, 0)
diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm
index 89757f89d5e3..b3578178ab32 100644
--- a/code/modules/lighting/lighting_atom.dm
+++ b/code/modules/lighting/lighting_atom.dm
@@ -99,8 +99,11 @@
cut_overlay(exposure_overlay)
if(glow_icon && glow_icon_state)
- glow_overlay = image(icon = glow_icon, icon_state = glow_icon_state, dir = dir, layer = 1)
- glow_overlay.plane = LIGHTING_LAMPS_PLANE
+ glow_overlay = image(icon = glow_icon, icon_state = glow_icon_state, dir = dir, layer = -2)
+ if(layer <= LOW_OBJ_LAYER)
+ glow_overlay.plane = FLOOR_LIGHTING_LAMPS_PLANE // Yeah this sucks
+ else
+ glow_overlay.plane = LIGHTING_LAMPS_PLANE
glow_overlay.blend_mode = BLEND_ADD
if(glow_colored)
diff --git a/code/modules/lighting/lighting_emissive_blocker.dm b/code/modules/lighting/lighting_emissive_blocker.dm
index b2102dea8b09..6eb46cbdad8a 100644
--- a/code/modules/lighting/lighting_emissive_blocker.dm
+++ b/code/modules/lighting/lighting_emissive_blocker.dm
@@ -11,6 +11,7 @@
layer = FLOAT_LAYER
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
appearance_flags = EMISSIVE_APPEARANCE_FLAGS
+ flags_2 = RAD_NO_CONTAMINATE_2
/atom/movable/emissive_blocker/Initialize(mapload, source)
. = ..()
diff --git a/code/modules/lighting/lighting_turf.dm b/code/modules/lighting/lighting_turf.dm
index 0ab81a99f7ca..a0c39b80da3a 100644
--- a/code/modules/lighting/lighting_turf.dm
+++ b/code/modules/lighting/lighting_turf.dm
@@ -98,6 +98,8 @@
lighting_build_overlay()
else
lighting_clear_overlay()
+ for(var/obj/machinery/machine in contents)
+ machine.reregister_machine()
/turf/proc/generate_missing_corners()
if(!IS_DYNAMIC_LIGHTING(src) && !light_sources)
diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm
index 54582614ccfa..6b6506c6fc28 100644
--- a/code/modules/mapping/access_helpers.dm
+++ b/code/modules/mapping/access_helpers.dm
@@ -5,29 +5,20 @@
// These are mutually exclusive; can't have req_any and req_all
/obj/effect/mapping_helpers/airlock/access/any/payload(obj/machinery/door/airlock/airlock)
- if(is_type_in_list(airlock, blacklist))
+ if(length(airlock.req_access))
+ log_world("[src] at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!")
return
- if(airlock.req_access_txt == "0")
- // Overwrite if there is no access set, otherwise add onto existing access
- if(airlock.req_one_access_txt == "0")
- airlock.req_one_access_txt = "[access]"
- else
- airlock.req_one_access_txt += ";[access]"
- else
- log_world("[src] at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!")
+ LAZYINITLIST(airlock.req_one_access)
+ airlock.req_one_access |= access
/obj/effect/mapping_helpers/airlock/access/all/payload(obj/machinery/door/airlock/airlock)
- if(is_type_in_list(airlock, blacklist))
+ if(length(airlock.req_one_access))
+ log_world("[src] at [AREACOORD(src)] tried to set req_access, but req_one_access was already set!")
return
- if(airlock.req_one_access_txt == "0")
- if(airlock.req_access_txt == "0")
- airlock.req_access_txt = "[access]"
- else
- airlock.req_access_txt += ";[access]"
- else
- log_world("[src] at [AREACOORD(src)] tried to set req_access, but req_one_access was already set!")
+ LAZYINITLIST(airlock.req_access)
+ airlock.req_access |= access
// -------------------- Req Any (Only requires ONE of the given accesses to open)
// -------------------- Command access helpers
@@ -467,3 +458,37 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/mule_bot
access = ACCESS_CARGO_BOT
+
+// Miscellaneous access helpers
+/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage
+ access = ACCESS_DEEPSTORAGE
+
+/obj/effect/mapping_helpers/airlock/access/all/ruins/moonoutpost19
+ access = ACCESS_AWAY01
+
+/obj/effect/mapping_helpers/airlock/access/all/ruins/theta
+ access = ACCESS_THETA_STATION
+
+/obj/effect/mapping_helpers/airlock/access/all/syndicate
+ access = ACCESS_SYNDICATE
+
+/obj/effect/mapping_helpers/airlock/access/all/centcomm/general
+ access = ACCESS_CENT_GENERAL
+
+/obj/effect/mapping_helpers/airlock/access/all/centcomm/security
+ access = ACCESS_CENT_SECURITY
+
+/obj/effect/mapping_helpers/airlock/access/all/centcomm/shuttles
+ access = ACCESS_CENT_SHUTTLES
+
+/obj/effect/mapping_helpers/airlock/access/all/centcomm/specops
+ access = ACCESS_CENT_SPECOPS
+
+/obj/effect/mapping_helpers/airlock/access/all/centcomm/commander
+ access = ACCESS_CENT_COMMANDER
+
+/obj/effect/mapping_helpers/airlock/access/all/shuttles/vox
+ access = ACCESS_VOX
+
+/obj/effect/mapping_helpers/airlock/access/all/centcomm/traders
+ access = ACCESS_TRADE_SOL
diff --git a/code/modules/mapping/base_map_datum.dm b/code/modules/mapping/base_map_datum.dm
index 0fff760c7c05..9ea1d428c429 100644
--- a/code/modules/mapping/base_map_datum.dm
+++ b/code/modules/mapping/base_map_datum.dm
@@ -18,3 +18,5 @@
var/voteable = TRUE
/// Minimum amount of players required for this map to be eligible in random map picks.
var/min_players_random = 0
+ /// Sound to play at the start of the game, aka the welcoming sound
+ var/welcome_sound = 'sound/AI/welcome.ogg'
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index 784f6672c1c7..ce504e0e2f04 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -91,11 +91,17 @@
/obj/effect/mapping_helpers/airlock/LateInitialize()
. = ..()
- if(!(locate(/obj/machinery/door) in get_turf(src)))
- log_world("[src] failed to find an airlock at [AREACOORD(src)]")
+ var/list/valid_airlocks = list()
for(var/obj/machinery/door/D in get_turf(src))
- payload(D)
+ if(!is_type_in_list(D, blacklist))
+ valid_airlocks += D
+
+ if(length(valid_airlocks))
+ for(var/obj/machinery/door/D in valid_airlocks)
+ payload(D)
+ else
+ log_world("[src] failed to find any valid airlocks at [AREACOORD(src)]")
qdel(src)
diff --git a/code/modules/mapping/station_datums.dm b/code/modules/mapping/station_datums.dm
index ceecd3d0dfa9..b74e7d5c3e0a 100644
--- a/code/modules/mapping/station_datums.dm
+++ b/code/modules/mapping/station_datums.dm
@@ -3,18 +3,21 @@
technical_name = "Cyberiad"
map_path = "_maps/map_files/stations/boxstation.dmm"
webmap_url = "https://webmap.affectedarc07.co.uk/maps/paradise/cyberiad/"
+ welcome_sound = 'sound/AI/welcome_cyberiad.ogg'
/datum/map/metastation
fluff_name = "NSS Cerebron"
technical_name = "MetaStation"
map_path = "_maps/map_files/stations/metastation.dmm"
webmap_url = "https://webmap.affectedarc07.co.uk/maps/paradise/metastation/"
+ welcome_sound = 'sound/AI/welcome_cerebron.ogg'
/datum/map/deltastation
fluff_name = "NSS Kerberos"
technical_name = "Delta"
map_path = "_maps/map_files/stations/deltastation.dmm"
webmap_url = "https://webmap.affectedarc07.co.uk/maps/paradise/deltastation/"
+ welcome_sound = 'sound/AI/welcome_kerberos.ogg'
/datum/map/cerestation
fluff_name = "NSS Farragus"
@@ -22,12 +25,14 @@
map_path = "_maps/map_files/stations/cerestation.dmm"
webmap_url = "https://webmap.affectedarc07.co.uk/maps/paradise/cerestation/"
min_players_random = 60
+ welcome_sound = 'sound/AI/welcome_farragus.ogg'
/datum/map/emeraldstation
fluff_name = "NSS Diagoras"
technical_name = "EmeraldStation"
map_path = "_maps/map_files/stations/emeraldstation.dmm"
webmap_url = "https://affectedarc07.co.uk/emerald.html"
+ welcome_sound = 'sound/AI/welcome_diagoras.ogg'
/datum/map/test_tiny
fluff_name = "test_tiny"
diff --git a/code/modules/mapping/windoor_access_helpers.dm b/code/modules/mapping/windoor_access_helpers.dm
index 8d3195cf9cab..d193060c9a5f 100644
--- a/code/modules/mapping/windoor_access_helpers.dm
+++ b/code/modules/mapping/windoor_access_helpers.dm
@@ -11,30 +11,23 @@
return
// Access already set in map edit
- if(windoor.req_access_txt != "0")
+ if(length(windoor.req_access))
log_world("[src] at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!")
return
- // Overwrite if there is no access set, otherwise add onto existing access
- if(windoor.req_one_access_txt == "0")
- windoor.req_one_access_txt = "[access]"
- return
-
- windoor.req_one_access_txt += ";[access]"
+ LAZYINITLIST(windoor.req_one_access)
+ windoor.req_one_access |= access
/obj/effect/mapping_helpers/airlock/windoor/access/all/payload(obj/machinery/door/window/windoor)
if(windoor.dir != dir)
return
- if(windoor.req_one_access_txt != "0")
+ if(length(windoor.req_one_access))
log_world("[src] at [AREACOORD(src)] tried to set req_access, but req_one_access was already set!")
return
- if(windoor.req_access_txt == "0")
- windoor.req_access_txt = "[access]"
- return
-
- windoor.req_access_txt += ";[access]"
+ LAZYINITLIST(windoor.req_access)
+ windoor.req_access |= access
// -------------------- Req Any (Only requires ONE of the given accesses to open)
// -------------------- Command access helpers
diff --git a/code/modules/martial_arts/bearserk.dm b/code/modules/martial_arts/bearserk.dm
index 68d2454c0481..bfd1becf1065 100644
--- a/code/modules/martial_arts/bearserk.dm
+++ b/code/modules/martial_arts/bearserk.dm
@@ -56,7 +56,7 @@
var/mob/living/carbon/human/H = user
if(slot == SLOT_HUD_HEAD)
style.teach(H, TRUE)
- H.faction |= "russian" // Russian Hardbass Begins
+ H.faction |= "soviet"
H.physiology.stun_mod *= 0.80
ADD_TRAIT(H, TRAIT_RESISTHEAT, "bearserk")
@@ -67,7 +67,7 @@
var/mob/living/carbon/human/H = user
if(H.get_item_by_slot(SLOT_HUD_HEAD) == src)
style.remove(H)
- H.faction -= "russian" // Hardbass stops
+ H.faction -= "soviet"
H.physiology.stun_mod /= 0.80
REMOVE_TRAIT (H, TRAIT_RESISTHEAT, "bearserk")
@@ -75,4 +75,4 @@
. = ..()
if(isAntag(user))
. += "Wearing this armored pelt grants you the strength of the space bear. \
- It also makes wild bears and Russians neutral towards you."
+ It also makes wild bears and wild communists neutral towards you."
diff --git a/code/modules/martial_arts/combos/judo/judothrow.dm b/code/modules/martial_arts/combos/judo/judothrow.dm
index 4939dead2e61..4c1a5146361f 100644
--- a/code/modules/martial_arts/combos/judo/judothrow.dm
+++ b/code/modules/martial_arts/combos/judo/judothrow.dm
@@ -4,7 +4,7 @@
explaination_text = "Establish a gripset on your opponent and throw them to the floor, inflicting stamina damage"
combo_text_override = "Grab, Disarm"
/datum/martial_combo/judo/judothrow/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
- if(user.IsKnockedDown() || IS_HORIZONTAL(target))
+ if(IS_HORIZONTAL(user) || IS_HORIZONTAL(target))
return MARTIAL_COMBO_FAIL
target.visible_message("[user] judo throws [target] to ground!", \
"[user] judo throws you to the ground!")
diff --git a/code/modules/martial_arts/judo.dm b/code/modules/martial_arts/judo.dm
index 96af7e0996c1..2e2e9b3c66d4 100644
--- a/code/modules/martial_arts/judo.dm
+++ b/code/modules/martial_arts/judo.dm
@@ -19,9 +19,10 @@
item_state = "judo"
w_class = WEIGHT_CLASS_BULKY
storage_slots = 3
- max_combined_w_class = 6
+ max_combined_w_class = 7
var/datum/martial_art/judo/style
can_hold = list(
+ /obj/item/radio,
/obj/item/grenade/flashbang,
/obj/item/grenade/chem_grenade/teargas,
/obj/item/reagent_containers/spray/pepper,
@@ -75,11 +76,6 @@
add_attack_logs(A, D, "Melee attacked with [src]")
return TRUE
-/datum/martial_art/judo/grab_act(mob/living/carbon/human/attacker, mob/living/carbon/human/defender)
- if(IS_HORIZONTAL(attacker))
- return FALSE
- return ..()
-
/datum/martial_art/judo/explaination_header(user)
to_chat(user, "You recall the teachings of Corporate Judo.")
diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
index b9d1100c17cd..603599a92281 100644
--- a/code/modules/martial_arts/martial.dm
+++ b/code/modules/martial_arts/martial.dm
@@ -426,8 +426,8 @@
H.visible_message("[H] collapses!", \
"Your legs give out!")
H.Weaken(8 SECONDS)
- if(H.staminaloss && !H.IsSleeping())
- var/total_health = (H.health - H.staminaloss)
+ if(H.getStaminaLoss() && !H.IsSleeping())
+ var/total_health = (H.health - H.getStaminaLoss())
if(total_health <= HEALTH_THRESHOLD_CRIT && !H.stat)
H.visible_message("[user] delivers a heavy hit to [H]'s head, knocking [H.p_them()] out cold!", \
"[user] knocks you unconscious!")
diff --git a/code/modules/maze_generation/maze_generator.dm b/code/modules/maze_generation/maze_generator.dm
index 7891393482f9..234cce94a8fc 100644
--- a/code/modules/maze_generation/maze_generator.dm
+++ b/code/modules/maze_generation/maze_generator.dm
@@ -162,7 +162,6 @@
// Gather the windows. If a spot has 3 windows on it, its a dead end
var/windowcount = 0
for(var/obj/structure/window/reinforced/mazeglass/W in T)
- pass(W) // Stops DM whining about unused vars
windowcount++
CHECK_TICK
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index 2cab7e579075..6f7fccc38d53 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -327,13 +327,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/economy/vending/wallmed/survival_pod,
/obj/structure/sign/mining
name = "nanotrasen mining corps sign"
desc = "A sign of relief for weary miners, and a warning for would-be competitors to Nanotrasen's mining claims."
- icon = 'icons/turf/walls/survival_pod_walls.dmi'
icon_state = "ntpod"
+ layer = TABLE_LAYER // scuffed but it works
/obj/structure/sign/mining/survival
name = "shelter sign"
desc = "A high visibility sign designating a safe shelter."
- icon = 'icons/turf/walls/survival_pod_walls.dmi'
icon_state = "survival"
//Fluff
@@ -374,7 +373,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/economy/vending/wallmed/survival_pod,
/obj/item/stack/telecrystal/twenty,
/obj/item/banhammer)
-/obj/item/fakeartefact/New()
+/obj/item/fakeartefact/Initialize(mapload)
. = ..()
var/obj/item/I = pick(possible)
name = initial(I.name)
@@ -382,3 +381,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/economy/vending/wallmed/survival_pod,
desc = initial(I.desc)
icon_state = initial(I.icon_state)
item_state = initial(I.item_state)
+ lefthand_file = initial(I.lefthand_file)
+ righthand_file = initial(I.righthand_file)
+ slot_flags = initial(I.slot_flags)
+ w_class = initial(I.w_class)
diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm
index 05f37e93c821..f82264900213 100644
--- a/code/modules/mining/equipment/wormhole_jaunter.dm
+++ b/code/modules/mining/equipment/wormhole_jaunter.dm
@@ -1,3 +1,6 @@
+// the stuff used for wormhole weaver
+GLOBAL_LIST_EMPTY(wormhole_effect)
+
/**********************Jaunter**********************/
/obj/item/wormhole_jaunter
name = "wormhole jaunter"
@@ -17,7 +20,8 @@
/obj/item/wormhole_jaunter/proc/turf_check(mob/user)
var/turf/device_turf = get_turf(user)
- if(!device_turf || !is_teleport_allowed(device_turf.z))
+ var/area/our_area = get_area(device_turf)
+ if(!device_turf || !is_teleport_allowed(device_turf.z) || our_area.tele_proof)
to_chat(user, "You're having difficulties getting the [name] to work.")
return FALSE
return TRUE
@@ -198,13 +202,18 @@
thrower = user
/obj/item/grenade/jaunter_grenade/prime()
+ var/area/our_area = get_area(src)
+ var/turf/T = get_turf(src)
+ if(!is_teleport_allowed(T.z) || our_area.tele_proof)
+ do_sparks(5, 0, T)
+ qdel(src)
+ return
update_mob()
var/list/destinations = list()
for(var/obj/item/beacon/B in GLOB.beacons)
var/turf/BT = get_turf(B)
if(is_station_level(BT.z))
destinations += BT
- var/turf/T = get_turf(src)
if(istype(T, /turf/simulated/floor/chasm/straight_down/lava_land_surface))
for(var/obj/effect/abstract/chasm_storage/C in T)
var/found_mob = FALSE
@@ -227,3 +236,197 @@
new /obj/effect/portal/jaunt_tunnel(drunken_opening, drunk_dial, src, 100, thrower)
new /obj/effect/temp_visual/thunderbolt(drunken_opening)
qdel(src)
+
+/obj/item/wormhole_jaunter/wormhole_weaver
+ name = "wormhole weaver"
+ icon = 'icons/obj/device.dmi'
+ icon_state = "wormhole_weaver"
+ item_state = "electronic"
+ desc = "This peculiar device is a prototype from a discontinued project. It was designed as an alternative to jaunters, offering more precise teleportation. However, as a prototype, it drains its entire battery with a single wormhole and can only target the beacons included in the kit."
+ /// Where are we teleporting to?
+ var/destination
+ /// Power cell (10000W).
+ var/obj/item/stock_parts/cell/high/wcell = null
+ /// The amount it costs to use this.
+ var/chargecost = 10000
+ var/icon_state_inactive = "wormhole_weaver_inactive"
+ /// Used for icon update check.
+ var/inactive = FALSE
+ /// Is user re-activating the device?
+ var/currently_reactivating = FALSE
+ /// Does the user already have the teleportation menu open?
+ var/menu_open = FALSE
+ /// Did we get hit by EMP?
+ var/emp_inflicted = FALSE
+ /// The turf where we activated the wormwhole.
+ var/wormhole_loc
+
+/obj/item/wormhole_jaunter/wormhole_weaver/attack_self(mob/user)
+ activate(user, TRUE)
+
+/obj/item/wormhole_jaunter/wormhole_weaver/emp_act(severity)
+
+ if(!emp_inflicted)
+ playsound(loc, 'sound/machines/shut_down.ogg', 50, TRUE)
+ visible_message("A malfunction detected in the weaver's subsystems. Initiating safety protocols.")
+ emp_inflicted = TRUE
+ inactive = TRUE
+ icon_state = icon_state_inactive
+ for(var/obj/O in contents)
+ O.emp_act(severity)
+ for(var/obj/effect/temp_visual/thunderbolt_targeting/wormhole_weaver/E in GLOB.wormhole_effect)
+ if(E)
+ qdel(E)
+ visible_message("Wormhole marker disappears!")
+ do_sparks(5, FALSE, wormhole_loc)
+
+/obj/item/wormhole_jaunter/wormhole_weaver/proc/prepare_foractivation(mob/user)
+ if(do_after(user, 3 SECONDS, target = src))
+ playsound(loc, 'sound/machines/twobeep.ogg', 50, TRUE)
+ to_chat(user, "The weaver is now ready for use.")
+ inactive = FALSE
+ emp_inflicted = FALSE
+ currently_reactivating = FALSE
+ icon_state = initial(icon_state)
+ else
+ currently_reactivating = FALSE
+
+/obj/item/wormhole_jaunter/wormhole_weaver/get_destinations(mob/user)
+ var/list/destinations = list()
+
+ for(var/obj/item/beacon/B in GLOB.beacons)
+ if(B.wormhole_weaver)
+ destinations += B
+
+ return destinations
+
+/obj/item/wormhole_jaunter/wormhole_weaver/activate(mob/user)
+ if(wcell.charge < chargecost)
+ to_chat(user, "Device isn't charged enough to be used at this time.")
+ return
+
+ if(inactive || emp_inflicted)
+ if(currently_reactivating)
+ to_chat(user, "You are already reactivating the device!")
+ return
+ currently_reactivating = TRUE
+ prepare_foractivation(user)
+ return
+
+ var/list/C = get_destinations(user)
+ if(!length(C))
+ to_chat(user, "[src] found no beacons in the world to anchor a wormhole to.")
+ return
+
+ if(menu_open)
+ return
+
+ var/list/L = list()
+ var/list/areaindex = list()
+ menu_open = TRUE
+
+ for(var/obj/item/beacon/R in GLOB.beacons)
+ var/turf/T = get_turf(R)
+ if(!T)
+ continue
+ if(!R.wormhole_weaver)
+ continue
+ var/tmpname = T.loc.name
+ if(areaindex[tmpname])
+ tmpname = "[tmpname] ([++areaindex[tmpname]])"
+ else
+ areaindex[tmpname] = 1
+ L[tmpname] = R
+
+ var/desc = tgui_input_list(user, "Please select a location to target.", "Device Target Interface", L)
+ if(!desc)
+ menu_open = FALSE
+ return
+
+ if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !turf_check(user) || !Adjacent(user))
+ menu_open = FALSE
+ return
+
+ wormhole_loc = get_turf(src)
+ new /obj/effect/temp_visual/thunderbolt_targeting/wormhole_weaver(wormhole_loc)
+ destination = L[desc]
+ user.visible_message(
+ "[user] pulls out a black colored device and points it to the floor.",
+ "You activate the wormhole weaver, it will take some time until device assembles a wormhole link."
+ )
+ wcell.use(chargecost)
+ icon_state = icon_state_inactive
+ inactive = TRUE
+ menu_open = FALSE
+
+ sleep(5 SECONDS)
+ if(emp_inflicted)
+ return
+
+ create_wormhole(wormhole_loc, destination)
+
+/obj/item/wormhole_jaunter/wormhole_weaver/proc/create_wormhole(used_turf, turf/destination)
+ new /obj/effect/portal/jaunt_tunnel(used_turf, get_turf(destination), src, 100)
+ do_sparks(5, FALSE, used_turf)
+
+// overridden because we don't need this
+/obj/item/wormhole_jaunter/wormhole_weaver/chasm_react(mob/user)
+ return
+
+/obj/item/wormhole_jaunter/wormhole_weaver/emag_act(mob/user)
+ to_chat(user, "Emagging [src] has no effect.")
+
+/obj/effect/temp_visual/thunderbolt_targeting/wormhole_weaver
+ duration = 5 SECONDS
+
+/obj/effect/temp_visual/thunderbolt_targeting/wormhole_weaver/Initialize()
+ . = ..()
+ GLOB.wormhole_effect += src
+ playsound(loc, 'sound/machines/twobeep.ogg', 50, TRUE)
+ set_light(2, l_color = "#FFD165")
+
+/obj/effect/temp_visual/thunderbolt_targeting/wormhole_weaver/Destroy()
+ GLOB.wormhole_effect -= src
+ return ..()
+
+// below here is recharge code for wormhole weaver, taken from rcs code
+/obj/item/wormhole_jaunter/wormhole_weaver/get_cell()
+ return wcell
+
+/obj/item/wormhole_jaunter/wormhole_weaver/New()
+ ..()
+ wcell = new(src)
+
+/obj/item/wormhole_jaunter/wormhole_weaver/examine(mob/user)
+ . = ..()
+ . += "Device currently has [chargecost > wcell.charge ? "insufficient" : "sufficient"] power. You can recharge it with a recharger."
+
+/obj/item/wormhole_jaunter/wormhole_weaver/Destroy()
+ QDEL_NULL(wcell)
+ return ..()
+
+/obj/item/paper/fluff/weaver_instruction
+ name = "prototype guideline"
+ info = {"
Introduction and Caution
+
+ Firstly, thank you for your interest in our cutting-edge technology. The package you hold contains three (3) targeting beacons, each tuned to emit a specific frequency
+ that can only be detected by wormhole weaver devices. For this reason, do not damage or destroy the beacons under any circumstances.
+
+ Using this device is fairly simple. First, choose a target destination and confirm your choice. Then, point the device at the location where you want the wormhole to
+ position itself. It will take approximately five seconds for the weaver to establish a connection.
+
+ Please note that this prototype must be fully charged before use. Each activation drains the entire battery, and after each recharge, the device must be manually
+ reactivated. Due to its fragile design, even the slightest malfunction will trigger safety protocols, immediately canceling the weaving process. Therefore, keep the
+ device away from EMP interference.
+
+ It is also highly advised to avoid taking a wormhole on a full stomach."}
+
+/obj/item/storage/box/weaver_kit
+ name = "dusty package"
+
+/obj/item/storage/box/weaver_kit/populate_contents()
+ new /obj/item/wormhole_jaunter/wormhole_weaver(src)
+ new /obj/item/paper/fluff/weaver_instruction(src)
+ new /obj/item/beacon/wormhole_weaver(src)
+ new /obj/item/beacon/wormhole_weaver(src)
+ new /obj/item/beacon/wormhole_weaver(src)
diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm
index 12cb30ef9c66..66e473e25bf2 100644
--- a/code/modules/mining/fulton.dm
+++ b/code/modules/mining/fulton.dm
@@ -48,6 +48,9 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
if(!area.outdoors)
to_chat(user, "[src] can only be used on things that are outdoors!")
return
+ if(area.tele_proof || !is_teleport_allowed(A.z))
+ to_chat(user, "Bluespace distortions prevent the fulton from inflating!")
+ return
if(!flag)
return
if(!istype(A))
diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm
index f47f059515e4..def0e5c7c202 100644
--- a/code/modules/mining/lavaland/loot/colossus_loot.dm
+++ b/code/modules/mining/lavaland/loot/colossus_loot.dm
@@ -261,7 +261,7 @@
harm_intent_damage = 1
friendly = "mends"
density = FALSE
- flying = TRUE
+ initial_traits = list(TRAIT_FLYING)
obj_damage = 0
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
ventcrawler = VENTCRAWLER_ALWAYS
diff --git a/code/modules/mining/lavaland/loot/hierophant_loot.dm b/code/modules/mining/lavaland/loot/hierophant_loot.dm
index 66a94acf1ad8..eb5b621a6300 100644
--- a/code/modules/mining/lavaland/loot/hierophant_loot.dm
+++ b/code/modules/mining/lavaland/loot/hierophant_loot.dm
@@ -242,6 +242,9 @@
var/turf/turf_to_teleport_to = get_step(target, get_dir(source, M)) //get position relative to caster
if(!turf_to_teleport_to || is_blocked_turf(turf_to_teleport_to, TRUE))
return
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.set_alpha_tracking(0, src, update_alpha = FALSE)
animate(M, alpha = 0, time = 2, easing = EASE_OUT) //fade out
sleep(1)
if(!M)
@@ -254,7 +257,12 @@
sleep(1)
if(!M)
return
- animate(M, alpha = 255, time = 2, easing = EASE_IN) //fade IN
+ var/our_alpha = 255
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.set_alpha_tracking(ALPHA_VISIBLE, src, update_alpha = FALSE)
+ our_alpha = H.get_alpha()
+ animate(M, alpha = our_alpha, time = 2, easing = EASE_IN) //fade IN
sleep(1)
if(!M)
return
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index d7c5720588eb..bc3a2f957d9a 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -31,33 +31,39 @@
prize_list["Gear"] = list(
EQUIPMENT("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800),
EQUIPMENT("Explorer's Webbing", /obj/item/storage/belt/mining, 500),
- EQUIPMENT("Fulton Beacon", /obj/item/fulton_core, 400),
EQUIPMENT("Mining Conscription Kit", /obj/item/storage/backpack/duffel/mining_conscript, 1500),
- EQUIPMENT("Advanced Jetpack Module", /obj/item/mod/module/jetpack/advanced, 2000),
EQUIPMENT("Jump Boots", /obj/item/clothing/shoes/bhop, 2500),
EQUIPMENT("Lazarus Capsule", /obj/item/mobcapsule, 800),
EQUIPMENT("Lazarus Capsule belt", /obj/item/storage/belt/lazarus, 200),
+ EQUIPMENT("Tracking Bio-chip Kit", /obj/item/storage/box/minertracker, 600),
+ )
+ prize_list["Modsuits and Exosuits"] = list(
+ EQUIPMENT("Standard MODsuit", /obj/item/mod/control/pre_equipped/standard/explorer, 1000),
+ EQUIPMENT("Advanced Jetpack Module", /obj/item/mod/module/jetpack/advanced, 2000),
EQUIPMENT("Mining MODsuit", /obj/item/mod/control/pre_equipped/mining/vendor, 3500),
EQUIPMENT("Asteroid MODsuit Skin", /obj/item/mod/skin_applier/asteroid, 1000),
- EQUIPMENT("Tracking Bio-chip Kit", /obj/item/storage/box/minertracker, 600),
- EQUIPMENT("Mining Charge Detonator", /obj/item/detonator, 150)
+ EQUIPMENT("Exosuit Grenade Launcher", /obj/item/mecha_parts/mecha_equipment/weapon/energy/mining_grenade, 2500),
)
prize_list["Consumables"] = list(
EQUIPMENT("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100),
- EQUIPMENT("Brute First-Aid Kit", /obj/item/storage/firstaid/brute, 600),
+ EQUIPMENT("First-Aid Kit", /obj/item/storage/firstaid/regular, 400),
+ EQUIPMENT("Advanced First-Aid Kit", /obj/item/storage/firstaid/adv, 600),
EQUIPMENT("Fulton Pack", /obj/item/extraction_pack, 1000),
+ EQUIPMENT("Fulton Beacon", /obj/item/fulton_core, 400),
EQUIPMENT("Jaunter", /obj/item/wormhole_jaunter, 750),
EQUIPMENT("Chasm Jaunter Recovery Grenade", /obj/item/grenade/jaunter_grenade, 1500),
EQUIPMENT("Lazarus Injector", /obj/item/lazarus_injector, 1000),
EQUIPMENT("Mining Charge", /obj/item/grenade/plastic/miningcharge/lesser, 150),
EQUIPMENT("Industrial Mining Charge", /obj/item/grenade/plastic/miningcharge, 500),
- EQUIPMENT("Point Transfer Card", /obj/item/card/mining_point_card, 500),
+ EQUIPMENT("Mining Charge Detonator", /obj/item/detonator, 150),
EQUIPMENT("Shelter Capsule", /obj/item/survivalcapsule, 400),
+ EQUIPMENT("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000),
EQUIPMENT("Stabilizing Serum", /obj/item/hivelordstabilizer, 400),
EQUIPMENT("Survival Medipen", /obj/item/reagent_containers/hypospray/autoinjector/survival, 500),
)
- prize_list["Kinetic Accelerator"] = list(
+ prize_list["Kinetic Weapons"] = list(
EQUIPMENT("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750),
+ EQUIPMENT("Kinetic Crusher", /obj/item/kinetic_crusher, 750),
EQUIPMENT("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150),
EQUIPMENT("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000),
EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000),
@@ -69,13 +75,10 @@
EQUIPMENT("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 100),
)
prize_list["Digging Tools"] = list(
+ EQUIPMENT("Silver Pickaxe", /obj/item/pickaxe/silver, 1000),
EQUIPMENT("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000),
- EQUIPMENT("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750),
- EQUIPMENT("Kinetic Crusher", /obj/item/kinetic_crusher, 750),
- EQUIPMENT("Mecha Grenade Launcher", /obj/item/mecha_parts/mecha_equipment/weapon/energy/mining_grenade, 2500),
EQUIPMENT("Resonator", /obj/item/resonator, 800),
- EQUIPMENT("Silver Pickaxe", /obj/item/pickaxe/silver, 1000),
- EQUIPMENT("Super Resonator", /obj/item/resonator/upgraded, 2500),
+ EQUIPMENT("Super Resonator", /obj/item/resonator/upgraded, 1500),
)
prize_list["Minebot"] = list(
EQUIPMENT("Nanotrasen Minebot", /obj/item/mining_drone_cube, 800),
@@ -92,10 +95,11 @@
EQUIPMENT("Hoverboard", /obj/item/melee/skateboard/hoverboard, 4000), //Cross lava rivers in a discounted style. To buying it in cargo. Still more than jump boots.
EQUIPMENT("HRD-MDE Project Box", /obj/item/storage/box/hardmode_box, 3500), //I want miners have to pay a lot to get this, but be set once they do.
EQUIPMENT("Laser Pointer", /obj/item/laser_pointer, 300),
- EQUIPMENT("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000),
+ EQUIPMENT("The Real Man ID Sticker", /obj/item/id_decal/prisoner, 400),
+ EQUIPMENT("Mythril Coin", /obj/item/coin/mythril, 100),
EQUIPMENT("Soap", /obj/item/soap/nanotrasen, 200),
EQUIPMENT("Space Cash", /obj/item/stack/spacecash/c200, 2000),
- EQUIPMENT("Whiskey", /obj/item/reagent_containers/drinks/bottle/whiskey, 100)
+ EQUIPMENT("Point Transfer Card", /obj/item/card/mining_point_card, 500),
)
prize_list["Extra"] = list() // Used in child vendors
@@ -150,7 +154,13 @@
var/list/cat_items = list()
for(var/prize_name in prize_list[cat])
var/datum/data/mining_equipment/prize = prize_list[cat][prize_name]
- cat_items[prize_name] = list("name" = prize_name, "price" = prize.cost)
+ var/obj/item = prize.equipment_path
+ cat_items[prize_name] = list(
+ "name" = prize_name,
+ "price" = prize.cost,
+ "icon" = item.icon,
+ "icon_state" = item.icon_state
+ )
static_data["items"][cat] = cat_items
return static_data
@@ -383,37 +393,37 @@
RefreshParts()
prize_list = list()
- prize_list["Equipment"] = list(
+ prize_list["Gear"] = list(
EQUIPMENT("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800),
- EQUIPMENT("Tacticool Toolbelt", /obj/item/storage/belt/utility/expedition, 500),
- EQUIPMENT("Fulton Beacon", /obj/item/fulton_core, 400),
+ EQUIPMENT("Tacticool Toolbelt", /obj/item/storage/belt/utility/expedition/vendor, 500),
EQUIPMENT("GPS", /obj/item/gps, 200),
EQUIPMENT("Treasure Satchel", /obj/item/storage/bag/expedition, 100),
- EQUIPMENT ("Robust Treasure Satchel", /obj/item/storage/bag/expedition/robust, 300),
+ EQUIPMENT("Robust Treasure Satchel", /obj/item/storage/bag/expedition/robust, 300),
EQUIPMENT("Tracking Bio-chip Kit", /obj/item/storage/box/minertracker, 600),
EQUIPMENT("Telecommunications Relay Kit", /obj/item/storage/box/relay_kit, 500),
EQUIPMENT("Tracking Beacon", /obj/item/beacon, 200),
)
- prize_list["Modsuits"] = list(
+ prize_list["Modsuits and Exosuits"] = list(
EQUIPMENT("Standard MODsuit", /obj/item/mod/control/pre_equipped/standard/explorer, 1000),
EQUIPMENT("Advanced Jetpack Module", /obj/item/mod/module/jetpack/advanced, 2000),
- EQUIPMENT("Night Vision Module", /obj/item/mod/module/visor/night, 1500),
- EQUIPMENT("Clamp Module", /obj/item/mod/module/clamp, 500),
- EQUIPMENT("GPS Module", /obj/item/mod/module/gps, 500),
+ EQUIPMENT("Exosuit Jetpack Module", /obj/item/mecha_parts/mecha_equipment/thrusters, 1500), // they stack up, so put 3-4 for FTL speed.
EQUIPMENT("Mining MODsuit", /obj/item/mod/control/pre_equipped/mining/vendor, 3500),
EQUIPMENT("Asteroid MODsuit Skin", /obj/item/mod/skin_applier/asteroid, 1000),
+ EQUIPMENT("Exosuit Grenade Launcher", /obj/item/mecha_parts/mecha_equipment/weapon/energy/mining_grenade, 2500)
)
prize_list["Consumables"] = list(
EQUIPMENT("First-Aid Kit", /obj/item/storage/firstaid/regular, 400),
EQUIPMENT("Advanced First-Aid Kit", /obj/item/storage/firstaid/adv, 600),
EQUIPMENT("Fulton Pack", /obj/item/extraction_pack, 1000),
- EQUIPMENT("Point Transfer Card", /obj/item/card/mining_point_card, 500),
+ EQUIPMENT("Fulton Beacon", /obj/item/fulton_core, 400),
EQUIPMENT("Stabilizing Serum", /obj/item/hivelordstabilizer, 400),
+ EQUIPMENT("Survival Medipen", /obj/item/reagent_containers/hypospray/autoinjector/survival, 500),
)
- prize_list["Kinetic Accelerator"] = list(
- EQUIPMENT("Kinetic Pistol", /obj/item/gun/energy/kinetic_accelerator/pistol, 750),
+ prize_list["Kinetic Weapons"] = list(
+ EQUIPMENT("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750),
+ EQUIPMENT("Kinetic Pistol", /obj/item/gun/energy/kinetic_accelerator/pistol, 500),
EQUIPMENT("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150),
EQUIPMENT("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000),
EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000),
@@ -425,6 +435,7 @@
)
prize_list["Miscellaneous"] = list(
+ EQUIPMENT("Whiskey", /obj/item/reagent_containers/drinks/bottle/whiskey, 100),
EQUIPMENT("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300),
EQUIPMENT("Toy Sword", /obj/item/toy/sword, 200),
EQUIPMENT("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
@@ -432,6 +443,7 @@
EQUIPMENT("Suspicious ID Sticker", /obj/item/id_decal/emag, 400),
EQUIPMENT("Syndicate Coin", /obj/item/coin/antagtoken/syndicate, 100),
EQUIPMENT("Space Cash", /obj/item/stack/spacecash/c200, 2000),
+ EQUIPMENT("Point Transfer Card", /obj/item/card/mining_point_card, 500),
)
/obj/machinery/mineral/equipment_vendor/explorer/attackby(obj/item/I, mob/user, params)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index b16300ea4579..682a21b7a022 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -22,8 +22,8 @@
/obj/structure/closet/wardrobe/miner
name = "mining wardrobe"
- icon_state = "mixed"
- icon_closed = "mixed"
+ icon_state = "generic"
+ closed_door_sprite = "mixed"
/obj/structure/closet/wardrobe/miner/populate_contents()
new /obj/item/storage/backpack/duffel(src)
@@ -46,7 +46,7 @@
/obj/structure/closet/secure_closet/miner
name = "miner's equipment"
icon_state = "mining"
- open_door_sprite = "mining_door"
+ opened_door_sprite = "cargo"
req_access = list(ACCESS_MINING)
/obj/structure/closet/secure_closet/miner/populate_contents()
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 1d0a465f01b4..fb50bc42bae8 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -121,7 +121,8 @@ GLOBAL_DATUM_INIT(orbit_menu, /datum/orbit_menu, new)
other_antags += list(
"Blob" = (mind.special_role == SPECIAL_ROLE_BLOB),
"Nuclear Operative" = (mind in SSticker.mode.syndicates),
- "Abductor" = (mind in SSticker.mode.abductors)
+ "Abductor" = (mind in SSticker.mode.abductors),
+ "Event Roles" = (mind.special_role == SPECIAL_ROLE_EVENTMISC)
)
for(var/antag_name in other_antags)
diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index 9c8ac77ccc32..f2b18ff15e9e 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -439,7 +439,7 @@
name = "Tradeband"
desc = "Maintained by the various trading cartels in major systems, this elegant, structured language is used for bartering and bargaining."
speech_verb = "enunciates"
- colour = "say_quote"
+ colour = "tradeband"
key = "2"
space_chance = 100
syllables = list("lorem", "ipsum", "dolor", "sit", "amet", "consectetur", "adipiscing", "elit",
diff --git a/code/modules/mob/living/brain/robotic_brain.dm b/code/modules/mob/living/brain/robotic_brain.dm
index 0fd4dc8cdbc4..fbaa53320c67 100644
--- a/code/modules/mob/living/brain/robotic_brain.dm
+++ b/code/modules/mob/living/brain/robotic_brain.dm
@@ -16,7 +16,8 @@
var/requires_master = TRUE
var/mob/living/carbon/human/imprinted_master = null
var/ejected_flavor_text = "circuit"
-
+ /// If this is a posibrain, which will reject attempting to put a new ghost in it, because this a real brain we care about, not a robobrain
+ var/can_be_reinhabited = TRUE
dead_icon = "boris_blank"
/obj/item/mmi/robotic_brain/Destroy()
@@ -31,7 +32,7 @@
to_chat(user, "You press your thumb on [src] and imprint your user information.")
imprinted_master = user
return
- if(brainmob && !brainmob.key && !searching)
+ if(brainmob && !brainmob.key && !searching && can_be_reinhabited)
//Start the process of searching for a new user.
to_chat(user, "You carefully locate the manual activation switch and start [src]'s boot process.")
request_player()
@@ -93,7 +94,7 @@
become_occupied(occupied_icon)
/obj/item/mmi/robotic_brain/proc/reset_search() //We give the players sixty seconds to decide, then reset the timer.
- if(brainmob && brainmob.key)
+ if(brainmob && brainmob.key || !searching)
return
searching = FALSE
@@ -104,6 +105,8 @@
/obj/item/mmi/robotic_brain/proc/volunteer(mob/dead/observer/user)
if(!searching)
return
+ if(brainmob && brainmob.key)
+ return // No, something is wrong, abort.
if(!istype(user) && !HAS_TRAIT(user, TRAIT_RESPAWNABLE))
to_chat(user, "Seems you're not a ghost. Could you please file an exploit report on the forums?")
return
@@ -182,11 +185,11 @@
..()
/obj/item/mmi/robotic_brain/attack_ghost(mob/dead/observer/O)
+ if(brainmob && brainmob.key)
+ return // No point pinging a posibrain with a player already inside
if(searching)
volunteer(O)
return
- if(brainmob && brainmob.key)
- return // No point pinging a posibrain with a player already inside
if(validity_checks(O) && (world.time >= next_ping_at))
next_ping_at = world.time + (20 SECONDS)
playsound(get_turf(src), 'sound/items/posiping.ogg', 80, 0)
@@ -204,3 +207,4 @@
requires_master = FALSE
ejected_flavor_text = "metal cube"
dead_icon = "posibrain"
+ can_be_reinhabited = FALSE
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index 4b54760533a7..191ae6906660 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -203,7 +203,7 @@
icon_state = "[initial(icon_state)]_dead"
item_state = "facehugger_inactive"
stat = DEAD
- qdel(GetComponent(/datum/component/proximity_monitor))
+ DeleteComponent(/datum/component/proximity_monitor)
visible_message("[src] curls up into a ball!")
diff --git a/code/modules/mob/living/carbon/carbon_procs.dm b/code/modules/mob/living/carbon/carbon_procs.dm
index 8f9694118a56..e3a91388a67d 100644
--- a/code/modules/mob/living/carbon/carbon_procs.dm
+++ b/code/modules/mob/living/carbon/carbon_procs.dm
@@ -738,7 +738,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
else if(I == handcuffed)
handcuffed = null
if(buckled && buckled.buckle_requires_restraints)
- buckled.unbuckle_mob(src)
+ unbuckle()
update_handcuffed()
else if(I == legcuffed)
legcuffed = null
@@ -999,7 +999,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
handcuffed = null
if(buckled && buckled.buckle_requires_restraints)
- buckled.unbuckle_mob(src)
+ unbuckle()
update_handcuffed()
if(client)
@@ -1053,7 +1053,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
/mob/living/carbon/proc/slip(description, knockdown, tilesSlipped, walkSafely, slipAny, slipVerb = "slip")
- if(flying || buckled || (walkSafely && m_intent == MOVE_INTENT_WALK))
+ if(HAS_TRAIT(src, TRAIT_FLYING) || buckled || (walkSafely && m_intent == MOVE_INTENT_WALK))
return FALSE
if(IS_HORIZONTAL(src) && !tilesSlipped)
diff --git a/code/modules/mob/living/carbon/carbon_update_status.dm b/code/modules/mob/living/carbon/carbon_update_status.dm
index 58b0c6a3a778..d06555cc6310 100644
--- a/code/modules/mob/living/carbon/carbon_update_status.dm
+++ b/code/modules/mob/living/carbon/carbon_update_status.dm
@@ -6,7 +6,7 @@
death()
create_debug_log("died of damage, trigger reason: [reason]")
return
- if(HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || (check_death_method() && getOxyLoss() > 50) || HAS_TRAIT(src, TRAIT_FAKEDEATH) || health < HEALTH_THRESHOLD_KNOCKOUT && check_death_method() || health <= HEALTH_THRESHOLD_DEAD)
+ if(HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || (check_death_method() && getOxyLoss() > 50) || HAS_TRAIT(src, TRAIT_FAKEDEATH) || health < HEALTH_THRESHOLD_KNOCKOUT && check_death_method() || health <= HEALTH_THRESHOLD_DEAD) // In case anyone is wondering where oldcrit is handled, it's here.
if(stat == CONSCIOUS)
KnockOut()
create_debug_log("fell unconscious, trigger reason: [reason]")
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index 1a3dee8c18eb..f508bc1e511f 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -12,6 +12,7 @@
health = maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_limb_damage
+ SEND_SIGNAL(src, COMSIG_LIVING_HEALTH_UPDATE)
update_stat("updatehealth([reason])")
med_hud_set_health()
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 009b43763c8c..2c2f3d4d7417 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -438,7 +438,12 @@ emp_act
I.acid_act(acidpwr, acid_volume)
return 1
-/mob/living/carbon/human/emag_act(user as mob, obj/item/organ/external/affecting)
+/mob/living/carbon/human/emag_act(mob/user)
+ var/obj/item/organ/external/affecting
+ if(!user.zone_selected) // pulse demons really.
+ affecting = get_organ(pick(BODY_ZONE_CHEST, BODY_ZONE_HEAD, BODY_ZONE_L_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_ARM, BODY_ZONE_R_LEG))
+ else
+ affecting = get_organ(user.zone_selected)
if(!istype(affecting))
return
if(!affecting.is_robotic())
@@ -447,9 +452,9 @@ emp_act
if(affecting.sabotaged)
to_chat(user, "[src]'s [affecting.name] is already sabotaged!")
else
- to_chat(user, "You sneakily slide the card into the dataport on [src]'s [affecting.name] and short out the safeties.")
+ to_chat(user, "You sneakily hack into the dataport on [src]'s [affecting.name] and short out the safeties.")
affecting.sabotaged = TRUE
- return 1
+ return TRUE
/mob/living/carbon/human/grabbedby(mob/living/user)
if(w_uniform)
@@ -493,8 +498,6 @@ emp_act
visible_message("[src] blocks [I]!")
return FALSE
- if(istype(I,/obj/item/card/emag))
- emag_act(user, affecting)
send_item_attack_message(I, user, hit_area)
@@ -837,3 +840,5 @@ emp_act
/mob/living/carbon/human/projectile_hit_check(obj/item/projectile/P)
return (HAS_TRAIT(src, TRAIT_FLOORED) || HAS_TRAIT(src, TRAIT_NOKNOCKDOWNSLOWDOWN)) && !density // hit mobs that are intentionally lying down to prevent combat crawling.
+/mob/living/carbon/human/canBeHandcuffed()
+ return has_left_hand() || has_right_hand()
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 5cf1b5218fcc..501eda399e79 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -103,3 +103,6 @@
var/list/bodyparts = list()
/// map organ names to organs
var/list/bodyparts_by_name = list()
+
+ /// Lazylist of sources to track what our alpha should be, alpha is set to the minimum. Use the `set_alpha_tracking` and `get_alpha` helpers.
+ var/list/alpha_sources
diff --git a/code/modules/mob/living/carbon/human/human_inventory.dm b/code/modules/mob/living/carbon/human/human_inventory.dm
index f8bcaf5d402c..206958d2e123 100644
--- a/code/modules/mob/living/carbon/human/human_inventory.dm
+++ b/code/modules/mob/living/carbon/human/human_inventory.dm
@@ -118,6 +118,7 @@
update_sight()
head_update(I)
update_inv_head()
+ update_misc_effects()
else if(I == r_ear)
r_ear = null
update_inv_ears()
@@ -140,6 +141,7 @@
internal = null
wear_mask_update(I, toggle_off = FALSE)
sec_hud_set_ID()
+ update_misc_effects()
update_inv_wear_mask()
else if(I == wear_id)
wear_id = null
@@ -211,6 +213,7 @@
if(length(hud_list))
sec_hud_set_ID()
wear_mask_update(I, toggle_off = TRUE)
+ update_misc_effects()
update_inv_wear_mask()
if(SLOT_HUD_HANDCUFFED)
handcuffed = I
@@ -279,6 +282,7 @@
if(hat.vision_flags || hat.see_in_dark || !isnull(hat.lighting_alpha))
update_sight()
// this calls update_inv_head() on its own
+ update_misc_effects()
head_update(I)
if(SLOT_HUD_SHOES)
shoes = I
diff --git a/code/modules/mob/living/carbon/human/human_life.dm b/code/modules/mob/living/carbon/human/human_life.dm
index 57c5cc8984b9..a71035751c39 100644
--- a/code/modules/mob/living/carbon/human/human_life.dm
+++ b/code/modules/mob/living/carbon/human/human_life.dm
@@ -720,7 +720,7 @@
healthdoll.overlays -= (cached_overlays - new_overlays)
healthdoll.cached_healthdoll_overlays = new_overlays
- if(health <= HEALTH_THRESHOLD_CRIT)
+ if(health <= HEALTH_THRESHOLD_SUCCUMB)
throw_alert("succumb", /atom/movable/screen/alert/succumb)
else
clear_alert("succumb")
diff --git a/code/modules/mob/living/carbon/human/human_mob.dm b/code/modules/mob/living/carbon/human/human_mob.dm
index 2a68cfd04673..4c914284b5c9 100644
--- a/code/modules/mob/living/carbon/human/human_mob.dm
+++ b/code/modules/mob/living/carbon/human/human_mob.dm
@@ -21,7 +21,7 @@
if(!mind)
return FALSE
if(mind.miming)
- qdel(GetComponent(/datum/component/footstep))
+ DeleteComponent(/datum/component/footstep)
return TRUE
/**
@@ -2034,3 +2034,30 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
dna.ResetUIFrom(src)
flavor_text = ""
+/**
+ * Helper for tracking alpha, use this to set an alpha source
+ *
+ * alpha_num - num between 0 and 255 that represents the alpha from `source`
+ * source - a datum that is the cause of the alpha source. This will be turned into a key via UID.
+ * update_alpha - boolean if alpha should be updated with this proc. Set this to false if you plan to animate the alpha after this call.
+ */
+/mob/living/carbon/human/proc/set_alpha_tracking(alpha_num, datum/source, update_alpha = TRUE)
+ alpha_num = round(alpha_num)
+ if(alpha_num >= ALPHA_VISIBLE)
+ LAZYREMOVE(alpha_sources, source.UID())
+ else
+ LAZYSET(alpha_sources, source.UID(), max(alpha_num, 0))
+ if(update_alpha)
+ alpha = get_alpha()
+
+/**
+ * Gets the target alpha of the human
+ *
+ * optional_source - use this to get the alpha of an exact source. This is unsafe, only use if you 100% know it will be in the list. For the best safety, only call this as get_alpha(src)
+ */
+/mob/living/carbon/human/proc/get_alpha(datum/optional_source)
+ if(optional_source)
+ return alpha_sources[optional_source.UID()]
+ . = ALPHA_VISIBLE
+ for(var/source in alpha_sources)
+ . = min(., alpha_sources[source])
diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm
index 95a6c790308a..52db0245ce1c 100644
--- a/code/modules/mob/living/carbon/human/human_update_icons.dm
+++ b/code/modules/mob/living/carbon/human/human_update_icons.dm
@@ -564,6 +564,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
update_fire()
update_icons()
update_emissive_block()
+ alpha = get_alpha()
if(player_logged) //make sure the SSD overlay stays
overlays += image('icons/effects/effects.dmi', icon_state = "zzz_glow")
@@ -854,15 +855,24 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
var/mutable_appearance/standing
if(head.sprite_sheets && head.sprite_sheets[dna.species.sprite_sheet_name])
standing = mutable_appearance(head.sprite_sheets[dna.species.sprite_sheet_name], "[head.icon_state]", layer = -HEAD_LAYER)
- if(istype(head, /obj/item/clothing/head/helmet/space/plasmaman))
- var/obj/item/clothing/head/helmet/space/plasmaman/P = head
- if(!P.up)
- standing.overlays += P.visor_icon
else if(head.icon_override)
standing = mutable_appearance(head.icon_override, "[head.icon_state]", layer = -HEAD_LAYER)
else
standing = mutable_appearance('icons/mob/clothing/head.dmi', "[head.icon_state]", layer = -HEAD_LAYER)
+ if(istype(head, /obj/item/clothing/head/helmet/space/plasmaman))
+ var/obj/item/clothing/head/helmet/space/plasmaman/P = head
+ if(!P.up)
+ standing.overlays += P.visor_icon
+
+ if(istype(head, /obj/item/clothing/head))
+ var/obj/item/clothing/head/w_hat = head
+ for(var/obj/item/clothing/head/hat in w_hat.attached_hats)
+ if(hat.sprite_sheets && hat.sprite_sheets[dna.species.sprite_sheet_name])
+ standing.overlays += image("icon" = hat.sprite_sheets[dna.species.sprite_sheet_name], "icon_state" = "[hat.icon_state]")
+ else
+ standing.overlays += image("icon" = hat.icon_override, "icon_state" = "[hat.icon_state]")
+
if(head.blood_DNA)
var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "helmetblood")
bloodsies.color = head.blood_color
diff --git a/code/modules/mob/living/carbon/human/human_update_status.dm b/code/modules/mob/living/carbon/human/human_update_status.dm
index ee7fe70d3eed..fa6516724fa7 100644
--- a/code/modules/mob/living/carbon/human/human_update_status.dm
+++ b/code/modules/mob/living/carbon/human/human_update_status.dm
@@ -3,10 +3,14 @@
return
..(reason)
if(stat == DEAD)
- if(dna.species && dna.species.can_revive_by_healing)
+ if(dna.species && dna.species.can_revive_by_healing) // Here's where IPC revival is handled
var/obj/item/organ/internal/brain/B = get_int_organ(/obj/item/organ/internal/brain)
if(B)
- if((health >= (HEALTH_THRESHOLD_DEAD + HEALTH_THRESHOLD_CRIT) * 0.5) && check_vital_organs() && !suiciding)
+ if((health >= (HEALTH_THRESHOLD_DEAD + HEALTH_THRESHOLD_CRIT) * 0.5) && ipc_vital_organ_check() && !suiciding)
+ var/mob/dead/observer/ghost = get_ghost()
+ if(ghost)
+ to_chat(ghost, "Your chassis has been repaired and repowered, re-enter if you want to continue playing! (Verbs -> Ghost -> Re-enter corpse)")
+ SEND_SOUND(ghost, sound('sound/effects/genetics.ogg'))
update_revive()
create_debug_log("revived from healing, trigger reason: [reason]")
diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm
index d51046d14b6f..5cc343669642 100644
--- a/code/modules/mob/living/carbon/human/species/_species.dm
+++ b/code/modules/mob/living/carbon/human/species/_species.dm
@@ -159,16 +159,16 @@
//Defining lists of icon skin tones for species that have them.
var/list/icon_skin_tones = list()
- // Determines the organs that the species spawns with and
- var/list/has_organ = list( // which required-organ checks are conducted.
- "heart" = /obj/item/organ/internal/heart,
- "lungs" = /obj/item/organ/internal/lungs,
- "liver" = /obj/item/organ/internal/liver,
- "kidneys" = /obj/item/organ/internal/kidneys,
- "brain" = /obj/item/organ/internal/brain,
- "appendix" = /obj/item/organ/internal/appendix,
- "eyes" = /obj/item/organ/internal/eyes
- )
+ /// Determines the organs that the species spawns with and which required-organ checks are conducted.
+ var/list/has_organ = list(
+ "heart" = /obj/item/organ/internal/heart,
+ "lungs" = /obj/item/organ/internal/lungs,
+ "liver" = /obj/item/organ/internal/liver,
+ "kidneys" = /obj/item/organ/internal/kidneys,
+ "brain" = /obj/item/organ/internal/brain,
+ "appendix" = /obj/item/organ/internal/appendix,
+ "eyes" = /obj/item/organ/internal/eyes
+ )
var/vision_organ = /obj/item/organ/internal/eyes // If set, this organ is required for vision.
var/list/has_limbs = list(
"chest" = list("path" = /obj/item/organ/external/chest, "descriptor" = "chest"),
@@ -293,7 +293,7 @@
if(HAS_TRAIT(H, TRAIT_IGNORESLOWDOWN))
ignoreslow = TRUE
- var/flight = H.flying //Check for flight and flying items
+ var/flight = HAS_TRAIT(H, TRAIT_FLYING) //Check for flight and flying items
ADD_SLOWDOWN(speed_mod)
@@ -337,7 +337,7 @@
. = round_down(. * SLOWDOWN_MULTIPLIER) / SLOWDOWN_MULTIPLIER //This allows us to round in values of 0.5 A slowdown of 0.55 becomes 1.10, which is rounded to 1, then reduced to 0.5
leftover -= .
- var/health_deficiency = max(H.maxHealth - H.health, H.staminaloss)
+ var/health_deficiency = max(H.maxHealth - H.health, H.getStaminaLoss())
if(H.reagents)
for(var/datum/reagent/R in H.reagents.reagent_list)
if(R.shock_reduction)
@@ -586,7 +586,7 @@
if(target.anchored)
return FALSE
if(target.buckled)
- target.buckled.unbuckle_mob(target)
+ target.unbuckle()
var/shove_dir = get_dir(user.loc, target.loc)
var/turf/shove_to = get_step(target.loc, shove_dir)
diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm
index 478646c32889..5c04aef27953 100644
--- a/code/modules/mob/living/carbon/human/species/golem.dm
+++ b/code/modules/mob/living/carbon/human/species/golem.dm
@@ -454,7 +454,7 @@
if(!isturf(picked))
return
if(H.buckled)
- H.buckled.unbuckle_mob(H, force = TRUE)
+ H.unbuckle(force = TRUE)
do_teleport(H, picked)
return TRUE
@@ -538,7 +538,7 @@
if(!isturf(picked))
return
if(H.buckled)
- H.buckled.unbuckle_mob(H, force = TRUE)
+ H.unbuckle(force = TRUE)
do_teleport(H, picked)
last_teleport = world.time
UpdateButtons() //action icon looks unavailable
diff --git a/code/modules/mob/living/carbon/human/species/human_species.dm b/code/modules/mob/living/carbon/human/species/human_species.dm
index d6bf6d4f933a..ef5fa94650b4 100644
--- a/code/modules/mob/living/carbon/human/species/human_species.dm
+++ b/code/modules/mob/living/carbon/human/species/human_species.dm
@@ -14,7 +14,8 @@
With a constant desire to colonize and spread their influence onto other species, they have begun to develop alliances and enemies, \
making humans one of the most recognizable and socially diverse species in the sector."
- icon_skin_tones = list( //Organized to be from Light to Dark.
+ /// Organized to be from Light to Dark.
+ icon_skin_tones = list(
1 = "Default White",
2 = "Pale",
3 = "Classic",
@@ -28,7 +29,7 @@
11 = "Caramel",
12 = "Coffee",
13 = "Chestnut"
- )
+ )
reagent_tag = PROCESS_ORG
diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm
index a7503197e841..38b70dcfa4d0 100644
--- a/code/modules/mob/living/carbon/human/species/machine.dm
+++ b/code/modules/mob/living/carbon/human/species/machine.dm
@@ -33,7 +33,7 @@
//Default styles for created mobs.
default_hair = "Blue IPC Screen"
dies_at_threshold = TRUE
- can_revive_by_healing = 1
+ can_revive_by_healing = TRUE
reagent_tag = PROCESS_SYN
male_scream_sound = 'sound/goonstation/voice/robot_scream.ogg'
female_scream_sound = 'sound/goonstation/voice/robot_scream.ogg'
diff --git a/code/modules/mob/living/carbon/human/species/shadow.dm b/code/modules/mob/living/carbon/human/species/shadow.dm
index 24ff15da2012..92f9f48e14c9 100644
--- a/code/modules/mob/living/carbon/human/species/shadow.dm
+++ b/code/modules/mob/living/carbon/human/species/shadow.dm
@@ -39,4 +39,7 @@
else if(light_amount < 2) //heal in the dark
H.heal_overall_damage(1, 1)
H.clear_alert("lightexposure")
+ else //we're inside an object, so darkness
+ H.clear_alert("lightexposure")
+ H.heal_overall_damage(1, 1)
..()
diff --git a/code/modules/mob/living/carbon/human/species/unathi.dm b/code/modules/mob/living/carbon/human/species/unathi.dm
index bf00c89cb961..d0102489d666 100644
--- a/code/modules/mob/living/carbon/human/species/unathi.dm
+++ b/code/modules/mob/living/carbon/human/species/unathi.dm
@@ -121,15 +121,16 @@
species_traits = list(LIPS, NOT_SELECTABLE)
inherent_traits = list(TRAIT_CHUNKYFINGERS)
- has_organ = list( // same as unathi's organs, aside for the lungs as they need to be able to breathe on lavaland.
- "heart" = /obj/item/organ/internal/heart/unathi,
- "lungs" = /obj/item/organ/internal/lungs/unathi/ash_walker,
- "liver" = /obj/item/organ/internal/liver/unathi,
- "kidneys" = /obj/item/organ/internal/kidneys/unathi,
- "brain" = /obj/item/organ/internal/brain/unathi,
- "appendix" = /obj/item/organ/internal/appendix,
- "eyes" = /obj/item/organ/internal/eyes/unathi
- )
+ // same as unathi's organs, aside for the lungs as they need to be able to breathe on lavaland.
+ has_organ = list(
+ "heart" = /obj/item/organ/internal/heart/unathi,
+ "lungs" = /obj/item/organ/internal/lungs/unathi/ash_walker,
+ "liver" = /obj/item/organ/internal/liver/unathi,
+ "kidneys" = /obj/item/organ/internal/kidneys/unathi,
+ "brain" = /obj/item/organ/internal/brain/unathi,
+ "appendix" = /obj/item/organ/internal/appendix,
+ "eyes" = /obj/item/organ/internal/eyes/unathi
+ )
/datum/species/unathi/ashwalker/on_species_gain(mob/living/carbon/human/H)
..()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index a7209d9f643c..22b318ff3b21 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -9,6 +9,9 @@
if(advanced_bullet_dodge_chance)
RegisterSignal(src, COMSIG_ATOM_PREHIT, PROC_REF(advanced_bullet_dodge))
+ for(var/initial_trait in initial_traits)
+ ADD_TRAIT(src, initial_trait, INNATE_TRAIT)
+
// Used to determine the forces dependend on the mob size
// Will only change the force if the force was not set in the mob type itself
/mob/living/proc/determine_move_and_pull_forces()
@@ -293,7 +296,7 @@
if(stat == DEAD)
to_chat(src, "It's too late, you're already dead!")
return
- if(health >= HEALTH_THRESHOLD_CRIT)
+ if(health >= HEALTH_THRESHOLD_SUCCUMB)
to_chat(src, "You are unable to succumb to death! This life continues!")
return
@@ -307,7 +310,7 @@
if(stat == DEAD)
return
- if(health >= HEALTH_THRESHOLD_CRIT)
+ if(health >= HEALTH_THRESHOLD_SUCCUMB)
to_chat(src, "You are unable to succumb to death! This life continues!")
return
@@ -359,6 +362,7 @@
return
health = maxHealth - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss() - getCloneLoss()
+ SEND_SIGNAL(src, COMSIG_LIVING_HEALTH_UPDATE)
update_stat("updatehealth([reason])")
med_hud_set_health()
med_hud_set_status()
@@ -537,7 +541,7 @@
on_fire = 0
suiciding = 0
if(buckled) //Unbuckle the mob and clear the alerts.
- buckled.unbuckle_mob(src, force = TRUE)
+ unbuckle(force = TRUE)
if(iscarbon(src))
var/mob/living/carbon/C = src
@@ -802,6 +806,10 @@
END RESIST PROCS
*///////////////////////
+/// Unbuckle the mob from whatever it is buckled to.
+/mob/living/proc/unbuckle(force)
+ buckled.unbuckle_mob(src, force)
+
/mob/living/proc/Exhaust()
to_chat(src, "You're too exhausted to keep going...")
Weaken(10 SECONDS)
@@ -819,7 +827,7 @@
clear_alert("weightless")
else
throw_alert("weightless", /atom/movable/screen/alert/weightless)
- if(!flying)
+ if(!HAS_TRAIT(src, TRAIT_FLYING))
float(!has_gravity)
/mob/living/proc/float(on)
@@ -830,8 +838,7 @@
fixed = TRUE
if(on && !floating && !fixed)
animate(src, pixel_y = pixel_y + 2, time = 10, loop = -1)
- sleep(10)
- animate(src, pixel_y = pixel_y - 2, time = 10, loop = -1)
+ animate(pixel_y = pixel_y - 2, time = 10, loop = -1)
floating = TRUE
else if(((!on || fixed) && floating))
animate(src, pixel_y = get_standard_pixel_y_offset(), time = 10)
@@ -1108,7 +1115,7 @@
return ..()
/mob/living/hit_by_thrown_mob(mob/living/C, datum/thrownthing/throwingdatum, damage, mob_hurt, self_hurt)
- if(C == src || flying || !density)
+ if(C == src || HAS_TRAIT(src, TRAIT_FLYING) || !density)
return
playsound(src, 'sound/weapons/punch1.ogg', 50, 1)
if(mob_hurt)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 13b6818105d6..074081bba93f 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -265,10 +265,6 @@
// 100 volume - 20 seconds of lost sleep
AdjustSleeping(-(volume * 0.2 SECONDS), bound_lower = 1 SECONDS) // showers cannot save you from sleeping gas, 1 second lower boundary
-//This is called when the mob is thrown into a dense turf
-/mob/living/proc/turf_collision(turf/T, speed)
- src.take_organ_damage(speed*5)
-
/mob/living/proc/near_wall(direction, distance=1)
var/turf/T = get_step(get_turf(src),direction)
var/turf/last_turf = src.loc
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 0471a39bcad2..56427c70ef26 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -15,12 +15,12 @@
var/health = 100 //A mob's health
//Damage related vars, NOTE: THESE SHOULD ONLY BE MODIFIED BY PROCS
- var/bruteloss = 0 //Brutal damage caused by brute force (punching, being clubbed by a toolbox ect... this also accounts for pressure damage)
- var/oxyloss = 0 //Oxygen depravation damage (no air in lungs)
- var/toxloss = 0 //Toxic damage caused by being poisoned or radiated
- var/fireloss = 0 //Burn damage caused by being way too hot, too cold or burnt.
- var/cloneloss = 0 //Damage caused by being cloned or ejected from the cloner early. slimes also deal cloneloss damage to victims
- var/staminaloss = 0 //Stamina damage, or exhaustion. You recover it slowly naturally, and are stunned if it gets too high. Holodeck and hallucinations deal this.
+ VAR_PROTECTED/bruteloss = 0 //Brutal damage caused by brute force (punching, being clubbed by a toolbox ect... this also accounts for pressure damage)
+ VAR_PROTECTED/oxyloss = 0 //Oxygen depravation damage (no air in lungs)
+ VAR_PROTECTED/toxloss = 0 //Toxic damage caused by being poisoned or radiated
+ VAR_PROTECTED/fireloss = 0 //Burn damage caused by being way too hot, too cold or burnt.
+ VAR_PROTECTED/cloneloss = 0 //Damage caused by being cloned or ejected from the cloner early. slimes also deal cloneloss damage to victims
+ VAR_PROTECTED/staminaloss = 0 //Stamina damage, or exhaustion. You recover it slowly naturally, and are stunned if it gets too high. Holodeck and hallucinations deal this.
var/last_special = 0 //Used by the resist verb, likely used to prevent players from bypassing next_move by logging in/out.
@@ -41,6 +41,9 @@
var/mob_biotypes = MOB_ORGANIC
var/metabolism_efficiency = 1 //more or less efficiency to metabolize helpful/harmful reagents and regulate body temperature..
+ /// movable atom we are buckled to
+ var/atom/movable/buckling
+
var/ventcrawler = VENTCRAWLER_NONE
var/list/icon/pipes_shown = list()
var/last_played_vent
@@ -102,6 +105,9 @@
///This variable is the chance for a mob to automatically dodge a bullet. Useful for admins, and applied to some mobs by default, such as the malfunctioning drone mobs.
var/advanced_bullet_dodge_chance = 0
+ /// List of traits that should be applied on Initialize
+ var/list/initial_traits = list()
+
/*
Taste Vars
*/
diff --git a/code/modules/mob/living/living_life.dm b/code/modules/mob/living/living_life.dm
index afba51de5a4a..ebd0c6781e5f 100644
--- a/code/modules/mob/living/living_life.dm
+++ b/code/modules/mob/living/living_life.dm
@@ -2,7 +2,7 @@
set waitfor = FALSE
set invisibility = 0
- if(flying && !floating) //TODO: Better floating
+ if(HAS_TRAIT(src, TRAIT_FLYING) && !floating) //TODO: Better floating
float(TRUE)
if(client || registered_z) // This is a temporary error tracker to make sure we've caught everything
diff --git a/code/modules/mob/living/silicon/ai/ai_mob.dm b/code/modules/mob/living/silicon/ai/ai_mob.dm
index c182f2bd41cb..3fc1f085738d 100644
--- a/code/modules/mob/living/silicon/ai/ai_mob.dm
+++ b/code/modules/mob/living/silicon/ai/ai_mob.dm
@@ -774,6 +774,9 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
if(!isturf(loc))
to_chat(src, "You aren't in your core!")
return
+ if(M.occupant && !can_dominate_mechs)
+ to_chat(src, "This exosuit has a pilot and cannot be controlled.")
+ return
if(M)
M.transfer_ai(AI_MECH_HACK, src, usr) //Called om the mech itself.
diff --git a/code/modules/mob/living/silicon/robot/robot_mob.dm b/code/modules/mob/living/silicon/robot/robot_mob.dm
index ebd84809c5de..43d30fcc1b49 100644
--- a/code/modules/mob/living/silicon/robot/robot_mob.dm
+++ b/code/modules/mob/living/silicon/robot/robot_mob.dm
@@ -965,11 +965,9 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
else if(!src.module && U.require_module)
to_chat(user, "The borg must choose a module before it can be upgraded!")
else
- if(!user.drop_item())
- return
- if(U.action(src))
+ if(U.action(user, src))
user.visible_message("[user] applied [U] to [src].", "You apply [U] to [src].")
- U.forceMove(src)
+
else if(istype(W, /obj/item/mmi_radio_upgrade))
if(!opened)
diff --git a/code/modules/mob/living/silicon/robot/robot_module_actions.dm b/code/modules/mob/living/silicon/robot/robot_module_actions.dm
index 058a4a7fdc5e..ffc0064e0639 100644
--- a/code/modules/mob/living/silicon/robot/robot_module_actions.dm
+++ b/code/modules/mob/living/silicon/robot/robot_module_actions.dm
@@ -36,6 +36,56 @@
button_overlay_icon = 'icons/obj/clothing/glasses.dmi'
button_overlay_icon_state = "meson"
+#define MODE_NONE ""
+#define MODE_MESON "meson"
+#define MODE_TRAY "t-ray"
+#define MODE_RAD "radiation"
+#define RAD_RANGE 5
+
+/datum/action/innate/robot_sight/engineering_scanner
+ name = "Engineering Scanner Vision"
+ sight_mode = BORGMESON
+ button_overlay_icon = 'icons/obj/clothing/glasses.dmi'
+ button_overlay_icon_state = "trayson-meson"
+ var/list/mode_list = list(MODE_NONE = MODE_MESON, MODE_MESON = MODE_TRAY, MODE_TRAY = MODE_RAD, MODE_RAD = MODE_NONE)
+ var/mode = MODE_NONE
+
+/datum/action/innate/robot_sight/engineering_scanner/Activate()
+ var/mob/living/silicon/robot/R = owner
+ mode = mode_list[mode]
+ to_chat(owner, "You turn your enhanced optics [mode ? "to [mode] mode." : "off."]")
+ button_overlay_icon_state = "trayson-[mode]"
+
+ if(mode == MODE_MESON)
+ R.sight_mode |= sight_mode
+ else
+ R.sight_mode &= ~sight_mode
+ R.update_sight()
+
+ if(mode != (MODE_NONE || MODE_MESON))
+ START_PROCESSING(SSobj, src)
+ else
+ STOP_PROCESSING(SSobj, src)
+
+/datum/action/innate/robot_sight/engineering_scanner/Deactivate()
+ return
+
+/datum/action/innate/robot_sight/engineering_scanner/process()
+ var/mob/living/silicon/robot/user = owner
+ if(!user.client)
+ return
+ switch(mode)
+ if(MODE_TRAY)
+ t_ray_scan(user)
+ if(MODE_RAD)
+ user.show_rads(RAD_RANGE)
+
+#undef MODE_NONE
+#undef MODE_MESON
+#undef MODE_TRAY
+#undef MODE_RAD
+#undef RAD_RANGE
+
/datum/action/innate/robot_magpulse
name = "Magnetic pulse"
button_overlay_icon = 'icons/obj/clothing/shoes.dmi'
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index d5635f674f82..7ab9a7379a5e 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -447,7 +447,7 @@
name = "engineering robot module"
module_type = "Engineer"
subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor)
- module_actions = list(/datum/action/innate/robot_sight/meson, /datum/action/innate/robot_magpulse)
+ module_actions = list(/datum/action/innate/robot_sight/engineering_scanner, /datum/action/innate/robot_magpulse)
basic_modules = list(
/obj/item/flash/cyborg,
/obj/item/rpd,
@@ -458,7 +458,6 @@
/obj/item/crowbar/cyborg,
/obj/item/wirecutters/cyborg,
/obj/item/multitool/cyborg,
- /obj/item/t_scanner,
/obj/item/analyzer,
/obj/item/geiger_counter/cyborg,
/obj/item/holosign_creator/engineering,
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index 9f3f30662a8c..bb0c73ac7d6c 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -1,4 +1,5 @@
#define BATON_COOLDOWN 3.5 SECONDS
+#define BOT_REBATON_THRESHOLD 5 SECONDS
/mob/living/simple_animal/bot/ed209
name = "\improper ED-209 Security Robot"
@@ -279,6 +280,10 @@
back_to_idle()
return
+ if(target.stat == DEAD)
+ back_to_idle() // Stop beating up the dead guy
+ return
+
if(Adjacent(target) && isturf(target.loc) && !baton_delayed) // if right next to perp
stun_attack(target)
if(!lasercolor)
@@ -296,7 +301,7 @@
if(BOT_PREP_ARREST) // preparing to arrest target
// see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again.
- if(!Adjacent(target) || !isturf(target.loc) || world.time - target.stam_regen_start_time < 4 SECONDS && target.getStaminaLoss() <= 100)
+ if(!Adjacent(target) || !isturf(target.loc) || target.stam_regen_start_time - world.time <= BOT_REBATON_THRESHOLD || target.getStaminaLoss() <= 100)
back_to_hunt()
return
@@ -321,7 +326,7 @@
back_to_idle()
return
- if(!Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && world.time - target.stam_regen_start_time < 4 SECONDS && target.getStaminaLoss() <= 100)) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again.
+ if(!Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && target.stam_regen_start_time - world.time <= BOT_REBATON_THRESHOLD || target.getStaminaLoss() <= 100)) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again.
back_to_hunt()
return
@@ -582,3 +587,4 @@
back_to_idle()
#undef BATON_COOLDOWN
+#undef BOT_REBATON_THRESHOLD
diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm
index db8e397271e5..5112d7e62681 100644
--- a/code/modules/mob/living/simple_animal/bot/honkbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm
@@ -330,7 +330,7 @@
if(emagged) // actually emagged
bike_horn()
else
- if(C in view(4, src) && !spam_flag) //keep the range short for patrolling
+ if((C in view(4, src)) && !spam_flag) //keep the range short for patrolling
bike_horn()
continue
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 05704ccb59b0..82b3a1c68802 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -1,4 +1,5 @@
#define BATON_COOLDOWN 3.5 SECONDS
+#define BOT_REBATON_THRESHOLD 5 SECONDS
/mob/living/simple_animal/bot/secbot
name = "\improper Securitron"
@@ -330,6 +331,10 @@
back_to_idle()
return
+ if(target.stat == DEAD)
+ back_to_idle() // Stop beating up the dead guy
+ return
+
if(Adjacent(target) && isturf(target.loc) && !baton_delayed) // if right next to perp
stun_attack(target)
mode = BOT_PREP_ARREST
@@ -341,7 +346,7 @@
if(BOT_PREP_ARREST) // preparing to arrest target
// see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again.
- if(!Adjacent(target) || !isturf(target.loc) || world.time - target.stam_regen_start_time < 4 SECONDS && target.getStaminaLoss() <= 100)
+ if(!Adjacent(target) || !isturf(target.loc) || target.stam_regen_start_time - world.time <= BOT_REBATON_THRESHOLD|| target.getStaminaLoss() <= 100)
back_to_hunt()
return
// target is stunned and nearby
@@ -362,12 +367,12 @@
back_to_idle()
- if(BOT_ARREST)
+ if(BOT_ARREST) // Fun fact: This is not called
if(!target || target.handcuffed)
back_to_idle()
return
- if(!Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && target.AmountWeakened() < 4 SECONDS)) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again.
+ if(!Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && target.stam_regen_start_time - world.time <= BOT_REBATON_THRESHOLD || target.getStaminaLoss() <= 100)) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again.
back_to_hunt()
return
//Try arresting again if the target escapes.
@@ -407,7 +412,7 @@
if((C.stat) || (C.handcuffed))
continue
- if((C.name == oldtarget_name) && (world.time < last_found + 100))
+ if((C.name == oldtarget_name) && (world.time < last_found + 5 SECONDS))
continue
threatlevel = C.assess_threat(src)
@@ -470,3 +475,4 @@
..()
#undef BATON_COOLDOWN
+#undef BOT_REBATON_THRESHOLD
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index cdb8d9cb0003..906518cb9414 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -18,7 +18,6 @@
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
faction = list("cult")
- flying = TRUE
pressure_resistance = 100
universal_speak = TRUE
AIStatus = AI_OFF //normal constructs don't have AI
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 5d28b33ca164..b70492d567a0 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -57,7 +57,6 @@
gloves = /obj/item/clothing/gloves/combat
l_ear = /obj/item/radio/headset
mask = /obj/item/clothing/mask/gas/syndicate
- back = /obj/item/mod/control/pre_equipped/traitor_elite
r_pocket = /obj/item/tank/internals/emergency_oxygen
id = /obj/item/card/id
@@ -94,25 +93,25 @@
name = "Corpse of a Pirate Gunner"
-/obj/effect/mob_spawn/human/corpse/russian
- name = "Russian"
- mob_name = "Russian"
+/obj/effect/mob_spawn/human/corpse/soviet
+ name = "Soviet"
+ mob_name = "Soviet"
hair_style = "bald"
facial_hair_style = "shaved"
- outfit = /datum/outfit/russiancorpse
+ outfit = /datum/outfit/sovietcorpse
-/datum/outfit/russiancorpse
- name = "Corpse of a Russian"
+/datum/outfit/sovietcorpse
+ name = "Corpse of a Soviet"
uniform = /obj/item/clothing/under/costume/soviet
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/bearpelt
-/obj/effect/mob_spawn/human/corpse/russian/ranged
- outfit = /datum/outfit/russiancorpse/ranged
+/obj/effect/mob_spawn/human/corpse/soviet/ranged
+ outfit = /datum/outfit/sovietcorpse/ranged
-/datum/outfit/russiancorpse/ranged
- name = "Corpse of a Ranged Russian"
+/datum/outfit/sovietcorpse/ranged
+ name = "Corpse of a Ranged Soviet"
head = /obj/item/clothing/head/ushanka
diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
index ba878cd423e3..e928fd850a83 100644
--- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm
+++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
@@ -16,17 +16,13 @@
harm_intent_damage = 1
friendly = "nudges"
density = FALSE
- flying = TRUE
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC | MOB_BUG
butcher_results = list(/obj/item/food/meat = 0)
gold_core_spawnable = FRIENDLY_SPAWN
-
-/mob/living/simple_animal/butterfly/Initialize(mapload) //Not the poor butterfly!
- . = ..()
- ADD_TRAIT(src, TRAIT_EDIBLE_BUG, "edible_bug")
+ initial_traits = list(TRAIT_FLYING, TRAIT_EDIBLE_BUG)
/mob/living/simple_animal/butterfly/New()
..()
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index e8064e07b772..2ceba7b97492 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -166,10 +166,12 @@
spawn(rand(20,50))
if(stat == CONSCIOUS && M)
icon_state = icon_living
- var/list/responses = list( "[src] looks at you imploringly.",
- "[src] looks at you pleadingly",
- "[src] looks at you with a resigned expression.",
- "[src] seems resigned to its fate.")
+ var/list/responses = list(
+ "[src] looks at you imploringly.",
+ "[src] looks at you pleadingly",
+ "[src] looks at you with a resigned expression.",
+ "[src] seems resigned to its fate."
+ )
to_chat(M, pick(responses))
else
..()
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index ae48d73f78bb..b07a72482e6a 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -217,6 +217,8 @@
if(!gibbed)
gib()
+ SSticker.record_biohazard_start(BIOHAZARD_BLOB)
+
/mob/living/simple_animal/mouse/blobinfected/get_scooped(mob/living/carbon/grabber)
to_chat(grabber, "You try to pick up [src], but they slip out of your grasp!")
to_chat(src, "[src] tries to pick you up, but you wriggle free of their grasp!")
diff --git a/code/modules/mob/living/simple_animal/hostile/bat.dm b/code/modules/mob/living/simple_animal/hostile/bat.dm
index 1604aab392e1..b51af42343dd 100644
--- a/code/modules/mob/living/simple_animal/hostile/bat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bat.dm
@@ -17,7 +17,6 @@
maxHealth = 20
health = 20
mob_size = MOB_SIZE_TINY
- flying = TRUE
harm_intent_damage = 8
melee_damage_lower = 10
melee_damage_upper = 10
@@ -35,6 +34,8 @@
faction = list("scarybat")
gold_core_spawnable = HOSTILE_SPAWN
+ initial_traits = list(TRAIT_FLYING)
+
/mob/living/simple_animal/hostile/scarybat/Initialize(mapload, mob/living/L)
. = ..()
if(istype(L))
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index 2172fa667ead..931b75d3c0c1 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -32,7 +32,7 @@
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
- faction = list("russian")
+ faction = list("soviet")
gold_core_spawnable = HOSTILE_SPAWN
footstep_type = FOOTSTEP_MOB_CLAW
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index 5d05c17c5eb5..dd9b7433f8f6 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -34,7 +34,6 @@
density = FALSE
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC | MOB_BUG
- flying = TRUE
gold_core_spawnable = HOSTILE_SPAWN
search_objects = TRUE //have to find those plant trays!
@@ -43,6 +42,8 @@
minbodytemp = 0
del_on_death = TRUE
+ initial_traits = list(TRAIT_FLYING)
+
var/datum/reagent/beegent = null //hehe, beegent
var/obj/structure/beebox/beehome = null
var/idle = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index 2f402fbe4446..ff1588298fec 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -34,10 +34,11 @@
minbodytemp = 0
maxbodytemp = 1500
faction = list("carp")
- flying = TRUE
pressure_resistance = 200
gold_core_spawnable = HOSTILE_SPAWN
+ initial_traits = list(TRAIT_FLYING, TRAIT_SHOCKIMMUNE)
+
var/random_color = TRUE //if the carp uses random coloring
var/rarechance = 1 //chance for rare color variant
@@ -63,7 +64,6 @@
/mob/living/simple_animal/hostile/carp/Initialize(mapload)
. = ..()
- ADD_TRAIT(src, TRAIT_SHOCKIMMUNE, SPECIES_TRAIT)
carp_randomify(rarechance)
update_icons()
diff --git a/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm b/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm
index dd33037817bd..6f6144d44fa6 100644
--- a/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm
+++ b/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm
@@ -316,7 +316,7 @@
if(T.density)
forceMove(H.loc)
if(H.buckled)
- H.buckled.unbuckle_mob(H, force = TRUE)
+ H.unbuckle(force = TRUE)
manifested = TRUE
Manifest()
to_chat(H, "You feel the floor closing in on your feet!")
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
index 75b18ec3ea1c..07def89e3300 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
@@ -631,7 +631,6 @@ Difficulty: Hard
weather_immunities = list("lava","ash")
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
- flying = TRUE
check_friendly_fire = 1
ranged = TRUE
projectilesound = 'sound/weapons/gunshots/gunshot.ogg'
@@ -652,6 +651,7 @@ Difficulty: Hard
ranged_ignores_vision = TRUE
stat_attack = UNCONSCIOUS
maxbodytemp = INFINITY
+ initial_traits = list(TRAIT_FLYING)
var/range = 3
var/mob/living/simple_animal/hostile/megafauna/ancient_robot/core = null
var/fake_max_hp = 300
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index ad8b1f7becbf..400e87cc01d0 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -30,7 +30,6 @@ Difficulty: Medium
icon = 'icons/mob/lavaland/blood_drunk.dmi'
mob_biotypes = MOB_ORGANIC | MOB_HUMANOID
light_color = "#E4C7C5"
- flying = FALSE
speak_emote = list("roars")
speed = 3
move_to_delay = 3
@@ -61,6 +60,8 @@ Difficulty: Medium
/datum/action/innate/megafauna_attack/kinetic_accelerator,
/datum/action/innate/megafauna_attack/transform_weapon)
+ initial_traits = list() // Don't want to inherit flight from parent type /megafauna/
+
/obj/item/gps/internal/miner
icon_state = null
gpstag = "Resonant Signal"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index 4536949c081c..9edf3e3d0001 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -284,7 +284,7 @@ Difficulty: Medium
hotspot.recolor()
T.hotspot_expose(700,50,1)
for(var/mob/living/L in T.contents)
- if(L in hit_list || L == source)
+ if((L in hit_list) || L == source)
continue
hit_list += L
L.adjustFireLoss(20)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index 18739b9e6ead..29f5fb080390 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -11,7 +11,6 @@
light_range = 3
faction = list("mining", "boss")
weather_immunities = list("lava","ash")
- flying = TRUE
robust_searching = TRUE
ranged_ignores_vision = TRUE
stat_attack = DEAD
@@ -29,6 +28,7 @@
flags_2 = IMMUNE_TO_SHUTTLECRUSH_2
mouse_opacity = MOUSE_OPACITY_ICON
dodging = FALSE // This needs to be false until someone fixes megafauna pathing so they dont lag-switch teleport at you (09-15-2023)
+ initial_traits = list(TRAIT_FLYING)
var/list/crusher_loot
var/medal_type
var/score_type = BOSS_SCORE
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
index 5fd8f2003215..f5514b40fbc9 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
@@ -81,11 +81,11 @@
speak_emote = list("telepathically cries")
attack_sound = 'sound/weapons/bladeslice.ogg'
stat_attack = UNCONSCIOUS
- flying = TRUE
robust_searching = TRUE
crusher_loot = /obj/item/crusher_trophy/watcher_wing
loot = list()
butcher_results = list(/obj/item/stack/ore/diamond = 2, /obj/item/stack/sheet/sinew = 2, /obj/item/stack/sheet/bone = 1)
+ initial_traits = list(TRAIT_FLYING)
/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/magmawing
name = "magmawing watcher"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm
index 88c8bb0a212f..fa47cc5ff25b 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm
@@ -413,7 +413,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
text += "If teleported to the Station by jaunter, you are allowed to attack people on Station, until you get killed."
to_chat(mychild, text.Join(" "))
- qdel(GetComponent(/datum/component/proximity_monitor))
+ DeleteComponent(/datum/component/proximity_monitor)
/obj/item/tumor_shard
name = "tumor shard"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm
index 6b2611e196e7..395e32f4157b 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm
@@ -209,8 +209,8 @@
del_on_death = TRUE
is_mirror = TRUE
move_resist = MOVE_FORCE_OVERPOWERING // no dragging your mirror around
- flying = TRUE
var/mob/living/simple_animal/hostile/asteroid/elite/herald/my_master = null
+ initial_traits = list(TRAIT_FLYING)
/mob/living/simple_animal/hostile/asteroid/elite/herald/mirror/Initialize(mapload)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
index 02f2d897d5ed..a16ab19c1368 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
@@ -74,7 +74,6 @@
speed = 3
maxHealth = 1
health = 1
- flying = TRUE
harm_intent_damage = 5
melee_damage_lower = 2
melee_damage_upper = 2
@@ -87,13 +86,13 @@
pass_flags = PASSTABLE | PASSMOB
density = FALSE
del_on_death = TRUE
+ initial_traits = list(TRAIT_FLYING)
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/Initialize(mapload)
. = ..()
addtimer(CALLBACK(src, PROC_REF(death)), 100)
AddComponent(/datum/component/swarming)
-
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood
name = "blood brood"
desc = "A living string of blood and alien materials."
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
index eafb92e7dab0..c9696fd08792 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
@@ -24,7 +24,7 @@
attack_sound = 'sound/weapons/bite.ogg'
speak_emote = list("gnashes")
faction = list("carp")
- flying = TRUE
+ initial_traits = list(TRAIT_FLYING)
var/carp_color = "carp" //holder for icon set
var/static/list/carp_colors = list(\
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
index 1b9db4ba39a7..da8df5e98d74 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
@@ -29,13 +29,14 @@
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
- flying = TRUE
pressure_resistance = 300
gold_core_spawnable = NO_SPAWN //too spooky for science
faction = list("undead") // did I mention ghost
loot = list(/obj/item/food/ectoplasm)
del_on_death = TRUE
+ initial_traits = list(TRAIT_FLYING)
+
/mob/living/simple_animal/hostile/retaliate/ghost/Process_Spacemove(check_drift = 0)
return 1
diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/soviet.dm
similarity index 51%
rename from code/modules/mob/living/simple_animal/hostile/russian.dm
rename to code/modules/mob/living/simple_animal/hostile/soviet.dm
index 36d810921332..def10ae15fc2 100644
--- a/code/modules/mob/living/simple_animal/hostile/russian.dm
+++ b/code/modules/mob/living/simple_animal/hostile/soviet.dm
@@ -1,11 +1,11 @@
-/mob/living/simple_animal/hostile/russian
- name = "Russian"
- desc = "For the Motherland!"
+/mob/living/simple_animal/hostile/soviet
+ name = "Soviet"
+ desc = "For the Union!"
icon = 'icons/mob/simple_human.dmi'
- icon_state = "russianmelee"
- icon_living = "russianmelee"
- icon_dead = "russianmelee_dead" // Does not actually exist. del_on_death.
- icon_gib = "russianmelee_gib" // Does not actually exist. del_on_death.
+ icon_state = "sovietmelee"
+ icon_living = "sovietmelee"
+ icon_dead = "sovietmelee_dead" // Does not actually exist. del_on_death.
+ icon_gib = "sovietmelee_gib" // Does not actually exist. del_on_death.
mob_biotypes = MOB_ORGANIC | MOB_HUMANOID
speak_chance = 0
turns_per_move = 5
@@ -22,27 +22,27 @@
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = INTENT_HARM
unsuitable_atmos_damage = 15
- faction = list("russian")
+ faction = list("soviet")
status_flags = CANPUSH
- loot = list(/obj/effect/mob_spawn/human/corpse/russian,
+ loot = list(/obj/effect/mob_spawn/human/corpse/soviet,
/obj/item/kitchen/knife,
- /obj/item/salvage/loot/russian)
+ /obj/item/salvage/loot/soviet)
del_on_death = TRUE
sentience_type = SENTIENCE_OTHER
footstep_type = FOOTSTEP_MOB_SHOE
-/mob/living/simple_animal/hostile/russian/ranged
- icon_state = "russianranged"
- icon_living = "russianranged"
+/mob/living/simple_animal/hostile/soviet/ranged
+ icon_state = "sovietranged"
+ icon_living = "sovietranged"
ranged = TRUE
retreat_distance = 5
minimum_distance = 5
projectilesound = 'sound/weapons/gunshots/gunshot.ogg'
casingtype = /obj/item/ammo_casing/a357
- loot = list(/obj/effect/mob_spawn/human/corpse/russian/ranged, /obj/item/gun/projectile/revolver/mateba)
+ loot = list(/obj/effect/mob_spawn/human/corpse/soviet/ranged, /obj/item/gun/projectile/revolver/mateba)
-/mob/living/simple_animal/hostile/russian/ranged/mosin
- loot = list(/obj/effect/mob_spawn/human/corpse/russian/ranged,
+/mob/living/simple_animal/hostile/soviet/ranged/mosin
+ loot = list(/obj/effect/mob_spawn/human/corpse/soviet/ranged,
/obj/item/gun/projectile/shotgun/boltaction,
- /obj/item/salvage/loot/russian)
+ /obj/item/salvage/loot/soviet)
casingtype = /obj/item/ammo_casing/a762
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm b/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm
index c4a887baf233..3021c468cbd6 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm
@@ -411,12 +411,13 @@
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
mob_size = MOB_SIZE_TINY
- flying = TRUE
bubble_icon = "syndibot"
gold_core_spawnable = HOSTILE_SPAWN
del_on_death = TRUE
deathmessage = "is smashed into pieces!"
+ initial_traits = list(TRAIT_FLYING)
+
/mob/living/simple_animal/hostile/viscerator/Initialize(mapload)
. = ..()
AddComponent(/datum/component/swarming)
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm
index 9332ac77b6fb..87e254f7e442 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm
@@ -34,8 +34,7 @@
canlay = 0
hasnested = TRUE
- spider_spawnfrequency = 300 // 30 seconds
- var/grant_prob = 25 // 25% chance every spider_spawnfrequency seconds to gain 1 egg
+ spider_spawnfrequency = 120 SECONDS
var/spider_max_children = 8
@@ -68,9 +67,6 @@
to_chat(src, "You cannot generate eggs while hiding in [loc].")
return
- if(!prob(grant_prob))
- return
-
var/list/spider_array = CountSpidersDetailed(TRUE)
var/brood_count = spider_array["all"]
@@ -100,8 +96,7 @@
to_chat(src, "You have [canlay] eggs available to lay.")
/mob/living/simple_animal/hostile/poison/terror_spider/queen/princess/show_egg_timer()
- var/average_timer = (1 / (grant_prob / 100)) * (spider_spawnfrequency / 10)
- to_chat(src, "Too soon to attempt that again. You generate a new egg every [average_timer] seconds, on average.")
+ to_chat(src, "Too soon to attempt that again. You generate a new egg every [spider_spawnfrequency / 10] seconds.")
/mob/living/simple_animal/hostile/poison/terror_spider/queen/princess/NestMode()
// Princesses don't nest. However, we still need to override this in case an AI princess calls it.
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 3d34ba457180..4968aabfb456 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -84,7 +84,7 @@
//Parrots are kleptomaniacs. This variable ... stores the item a parrot is holding.
var/obj/item/held_item = null
- flying = TRUE
+ initial_traits = list(TRAIT_FLYING)
gold_core_spawnable = FRIENDLY_SPAWN
/mob/living/simple_animal/parrot/New()
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 54cd08666f0e..8129b49d1c83 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -27,10 +27,10 @@
universal_speak = TRUE
faction = list("cult")
status_flags = CANPUSH
- flying = TRUE
loot = list(/obj/item/food/ectoplasm)
del_on_death = TRUE
deathmessage = "lets out a contented sigh as their form unwinds."
+ initial_traits = list(TRAIT_FLYING, TRAIT_SHOCKIMMUNE)
var/holy = FALSE
/mob/living/simple_animal/shade/attackby(obj/item/O, mob/user) //Marker -Agouri
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index b819db355e02..8ce7b533a7dd 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -194,7 +194,7 @@
return
/*
- * String associated list returns a cached list.
+ * String associated list returns a cached list.
* This is like a static list to pass into the element below.
*/
atmos_requirements = string_assoc_list(atmos_requirements)
@@ -354,7 +354,8 @@
icon = initial(icon)
icon_state = icon_living
density = initial(density)
- flying = initial(flying)
+ if(TRAIT_FLYING in initial_traits)
+ ADD_TRAIT(src, TRAIT_FLYING, INNATE_TRAIT)
if(collar_type)
collar_type = "[initial(collar_type)]"
regenerate_icons()
@@ -364,7 +365,7 @@
. = ..()
if(!.)
return FALSE
- flying = FALSE
+ REMOVE_TRAIT(src, TRAIT_FLYING, INNATE_TRAIT)
walk(src, 0)
if(nest)
nest.spawned_mobs -= src
diff --git a/code/modules/mob/living/simple_animal/slime/slime_death.dm b/code/modules/mob/living/simple_animal/slime/slime_death.dm
index 3136f8f07700..fcd7eb8d2b47 100644
--- a/code/modules/mob/living/simple_animal/slime/slime_death.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime_death.dm
@@ -22,7 +22,7 @@
E.Grant(src)
revive()
regenerate_icons()
- update_name()
+ update_appearance(UPDATE_NAME)
return
set_stat(DEAD) //Temporarily set to dead for icon updates
diff --git a/code/modules/mob/living/simple_animal/slime/slime_mob.dm b/code/modules/mob/living/simple_animal/slime/slime_mob.dm
index 304f9ed74c0a..08682a4717ad 100644
--- a/code/modules/mob/living/simple_animal/slime/slime_mob.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime_mob.dm
@@ -113,7 +113,7 @@
/mob/living/simple_animal/slime/proc/set_colour(new_colour)
colour = new_colour
- update_name()
+ update_appearance(UPDATE_NAME)
slime_mutation = mutation_table(colour)
var/sanitizedcolour = replacetext(colour, " ", "")
coretype = text2path("/obj/item/slime_extract/[sanitizedcolour]")
diff --git a/code/modules/mob/living/simple_animal/slime/slime_powers.dm b/code/modules/mob/living/simple_animal/slime/slime_powers.dm
index f933d3388709..cb536acb6bba 100644
--- a/code/modules/mob/living/simple_animal/slime/slime_powers.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime_powers.dm
@@ -118,7 +118,7 @@
visible_message("[src] has let go of [buckled]!", \
"I stopped feeding.")
layer = initial(layer)
- buckled.unbuckle_mob(src,force=TRUE)
+ unbuckle(force=TRUE)
/mob/living/simple_animal/slime/proc/Evolve()
if(stat)
@@ -132,7 +132,7 @@
for(var/datum/action/innate/slime/evolve/E in actions)
E.Remove(src)
regenerate_icons()
- update_name()
+ update_appearance(UPDATE_NAME)
else
to_chat(src, "I am not ready to evolve yet...")
else
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 0ce5b3273d59..5cd8ae5ed495 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -670,7 +670,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
G.affecting.ret_grab(L, 1)
if(!flag)
if(L.master == src)
- var/list/temp = list( )
+ var/list/temp = list()
temp += L.container
//L = null
qdel(L)
@@ -1360,6 +1360,10 @@ GLOBAL_LIST_INIT(holy_areas, typecacheof(list(
alpha = initial(alpha)
add_to_all_human_data_huds()
+/mob/living/carbon/human/reset_visibility()
+ ..()
+ alpha = get_alpha()
+
/mob/proc/make_invisible()
invisibility = INVISIBILITY_LEVEL_TWO
alpha = 128
diff --git a/code/modules/mob/mob_misc_procs.dm b/code/modules/mob/mob_misc_procs.dm
index 24f71570e459..6ce785a7c7ae 100644
--- a/code/modules/mob/mob_misc_procs.dm
+++ b/code/modules/mob/mob_misc_procs.dm
@@ -194,7 +194,8 @@
message_admins("No ghosts were willing to take control of [key_name_admin(M)])")
/proc/check_zone(zone)
- if(!zone) return "chest"
+ if(!zone)
+ return "chest"
switch(zone)
if("eyes")
zone = "head"
@@ -214,18 +215,28 @@
if(prob(probability))
return zone
- var/t = rand(1, 18) // randomly pick a different zone, or maybe the same one
- switch(t)
- if(1) return "head"
- if(2) return "chest"
- if(3 to 4) return "l_arm"
- if(5 to 6) return "l_hand"
- if(7 to 8) return "r_arm"
- if(9 to 10) return "r_hand"
- if(11 to 12) return "l_leg"
- if(13 to 14) return "l_foot"
- if(15 to 16) return "r_leg"
- if(17 to 18) return "r_foot"
+ var/random_zone = rand(1, 18) // randomly pick a different zone, or maybe the same one
+ switch(random_zone)
+ if(1)
+ return "head"
+ if(2)
+ return "chest"
+ if(3 to 4)
+ return "l_arm"
+ if(5 to 6)
+ return "l_hand"
+ if(7 to 8)
+ return "r_arm"
+ if(9 to 10)
+ return "r_hand"
+ if(11 to 12)
+ return "l_leg"
+ if(13 to 14)
+ return "l_foot"
+ if(15 to 16)
+ return "r_leg"
+ if(17 to 18)
+ return "r_foot"
return zone
@@ -265,24 +276,40 @@
phrase = html_decode(phrase)
var/leng = length_char(phrase)
var/counter = length_char(phrase)
- var/newphrase = ""
- var/newletter = ""
+ var/list/newphrase = list()
+ var/newletter
while(counter >= 1)
- newletter=copytext_char(phrase, (leng - counter) + 1, (leng - counter) + 2)
- if(rand(1,3)==3)
- if(lowertext(newletter)=="o") newletter="u"; if(lowertext(newletter)=="о") newletter="у"; if(lowertext(newletter)=="э") newletter="и"
- if(lowertext(newletter)=="s") newletter="ch"; if(lowertext(newletter)=="с") newletter="сш"; if(lowertext(newletter)=="г") newletter="х"
- if(lowertext(newletter)=="a") newletter="ah"; if(lowertext(newletter)=="а") newletter="ах"
- if(lowertext(newletter)=="c") newletter="k"; if(lowertext(newletter)=="ц") newletter="сц"
- switch(rand(1,15))
- if(1,3,5,8) newletter="[lowertext(newletter)]"
- if(2,4,6,15) newletter="[uppertext(newletter)]"
- if(7) newletter+=pick(slurletters)
+ newletter = copytext_char(phrase, (leng - counter) + 1, (leng - counter) + 2)
+ if(prob(33.33))
+ if(lowertext(newletter) == "o")
+ newletter = "u"
+ if(lowertext(newletter) == "о")
+ newletter = "у"
+ if(lowertext(newletter) == "э")
+ newletter = "и"
+ if(lowertext(newletter) == "s")
+ newletter = "ch"
+ if(lowertext(newletter) == "с")
+ newletter = "сш"
+ if(lowertext(newletter) == "a")
+ newletter = "ah"
+ if(lowertext(newletter) == "а")
+ newletter = "ах"
+ if(lowertext(newletter) == "c")
+ newletter = "k"
+ if(lowertext(newletter) == "ц")
+ newletter = "сц"
+ if(prob(60))
+ if(prob(11.11))
+ newletter += pick(slurletters)
else
- pass()
- newphrase+="[newletter]"
- counter-=1
- return newphrase
+ if(prob(50))
+ newletter = lowertext(newletter)
+ else
+ newletter = uppertext(newletter)
+ newphrase += newletter
+ counter -= 1
+ return newphrase.Join("")
/proc/stutter(phrase, stamina_loss = 0, robotic = FALSE)
phrase = html_decode(phrase)
@@ -676,49 +703,42 @@
rename_character(oldname, newname)
-/proc/cultslur(n) // Inflicted on victims of a stun talisman
- var/phrase = html_decode(n)
+/proc/cultslur(phrase)
+ phrase = html_decode(phrase)
var/leng = length_char(phrase)
var/counter = length_char(phrase)
- var/newphrase=""
- var/newletter=""
- while(counter>=1)
- newletter=copytext_char(phrase, (leng - counter) + 1, (leng - counter) + 2)
- if(rand(1,2)==2)
- if(lowertext(newletter)=="o")
- newletter="u"
- if(lowertext(newletter)=="t")
- newletter="ch"
- if(lowertext(newletter)=="a")
- newletter="ah"
- if(lowertext(newletter)=="u")
- newletter="oo"
- if(lowertext(newletter)=="c")
- newletter=" NAR "
- if(lowertext(newletter)=="s")
- newletter=" SIE "
- if(rand(1,4)==4)
- if(newletter==" ")
- newletter=" no hope... "
- if(newletter=="H")
- newletter=" IT COMES... "
-
- switch(rand(1,15))
- if(1)
- newletter="'"
- if(2)
- newletter+="agn"
- if(3)
- newletter="fth"
- if(4)
- newletter="nglu"
- if(5)
- newletter="glor"
+ var/list/newphrase = list()
+ var/newletter
+ while(counter >= 1)
+ newletter = copytext_char(phrase, (leng - counter) + 1, (leng - counter) + 2)
+ if(prob(50))
+ if(lowertext(newletter) == "o")
+ newletter = "u"
+ if(lowertext(newletter) == "t")
+ newletter = "ch"
+ if(lowertext(newletter) == "a")
+ newletter = "ah"
+ if(lowertext(newletter) == "u")
+ newletter = "oo"
+ if(lowertext(newletter) == "c")
+ newletter = " NAR "
+ if(lowertext(newletter) == "s")
+ newletter = " SIE "
+ if(prob(25))
+ if(newletter == " ")
+ newletter = " no hope... "
+ if(newletter == "H")
+ newletter = " IT COMES... "
+
+ if(prob(33.33))
+ if(prob(20))
+ newletter += "agn"
else
- pass()
+ newletter = pick("'", "fth", "nglu", "glor")
- newphrase+="[newletter]";counter-=1
- return newphrase
+ newphrase += newletter
+ counter -= 1
+ return newphrase.Join("")
// Why does this exist?
/mob/proc/get_preference(toggleflag)
diff --git a/code/modules/mob/mob_vars.dm b/code/modules/mob/mob_vars.dm
index 627a6bad0729..605a1043d4f4 100644
--- a/code/modules/mob/mob_vars.dm
+++ b/code/modules/mob/mob_vars.dm
@@ -35,7 +35,7 @@
var/computer_id = null
var/lastattacker = null // real name of the person doing the attacking
var/lastattackerckey = null // their ckey
- var/list/attack_log_old = list( )
+ var/list/attack_log_old = list()
var/list/debug_log = null
var/last_known_ckey = null // Used in logging
@@ -63,7 +63,6 @@
var/timeofdeath = 0 //Living
var/bodytemperature = 310.055 //98.7 F
- var/flying = FALSE
var/nutrition = NUTRITION_LEVEL_FED + 50 //Carbon
var/satiety = 0 //Carbon
var/hunger_drain = HUNGER_FACTOR // how quickly the mob gets hungry; largely utilized by species.
@@ -75,8 +74,6 @@
var/lastKnownIP = null
/// movable atoms buckled to this mob
var/atom/movable/buckled = null //Living
- /// movable atom we are buckled to
- var/atom/movable/buckling
var/obj/item/l_hand = null //Living
var/obj/item/r_hand = null //Living
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index f6fe9420aa0f..48f7e6cf8cb3 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -151,6 +151,10 @@
// SS220 ADDITION START - TTS220
if(!check_tts_seed_ready())
return FALSE
+
+ if(!can_use_species(src, client.prefs.active_character.species))
+ to_chat(src, alert("You are currently not whitelisted to play [client.prefs.active_character.species]."))
+ return FALSE
// SS220 ADDITION END
ready = !ready
diff --git a/code/modules/mob/new_player/new_player_login.dm b/code/modules/mob/new_player/new_player_login.dm
index 76a2dab353ee..ffd7902f7c00 100644
--- a/code/modules/mob/new_player/new_player_login.dm
+++ b/code/modules/mob/new_player/new_player_login.dm
@@ -1,7 +1,7 @@
/mob/new_player/Login()
update_Login_details() //handles setting lastKnownIP and computer_id for use by the ban systems as well as checking for multikeying
if(GLOB.join_motd)
- to_chat(src, "
[GLOB.join_motd]
")
+ to_chat(src, "
[GLOB.join_motd]
")
if(!mind)
mind = new /datum/mind(key)
diff --git a/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm
index 341453b7ca1e..77b6e6985f4c 100644
--- a/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm
@@ -373,6 +373,10 @@
name = "Corgi Shirt"
icon_state = "shirt_corgi"
+/datum/sprite_accessory/undershirt/shirt_en
+ name = "Borgi Shirt" // E-N!
+ icon_state = "shirt_borgi"
+
/datum/sprite_accessory/undershirt/shirt_clown
name = "Clown Shirt"
icon_state = "shirt_clown"
diff --git a/code/modules/mod/mod_actions.dm b/code/modules/mod/mod_actions.dm
index fc10b7448e00..9fbf636001c4 100644
--- a/code/modules/mod/mod_actions.dm
+++ b/code/modules/mod/mod_actions.dm
@@ -102,10 +102,12 @@
..()
module = linked_module
button_overlay_icon_state = module.icon_state
+ button_background_icon_state = ((module.module_type == MODULE_TOGGLE && module.active) ? "bg_mod_active" : "bg_mod")
if(linked_module.allow_flags & MODULE_ALLOW_INCAPACITATED)
// clears check hands
check_flags = AB_CHECK_CONSCIOUS
Grant(user)
+ RegisterSignals(module, list(COMSIG_MODULE_ACTIVATED, COMSIG_MODULE_DEACTIVATED), PROC_REF(linked_button_update))
/datum/action/item_action/mod/pinned_module/Destroy()
UnregisterSignal(module, list(COMSIG_MODULE_ACTIVATED, COMSIG_MODULE_DEACTIVATED, COMSIG_MODULE_USED))
@@ -127,3 +129,8 @@
if(!.)
return
module.on_select()
+
+/datum/action/item_action/mod/pinned_module/proc/linked_button_update()
+ if(module.module_type != MODULE_PASSIVE)
+ button_background_icon_state = (module.active ? "bg_mod_active" : "bg_mod")
+ UpdateButtons()
diff --git a/code/modules/mod/mod_activation.dm b/code/modules/mod/mod_activation.dm
index 93e7c2100f25..5dd2e207e106 100644
--- a/code/modules/mod/mod_activation.dm
+++ b/code/modules/mod/mod_activation.dm
@@ -223,7 +223,7 @@
module.on_suit_deactivation()
STOP_PROCESSING(SSobj, src)
update_speed()
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
wearer.regenerate_icons()
/// Quickly deploys all the suit parts and if successful, seals them and turns on the suit. Intended mostly for outfits.
diff --git a/code/modules/mod/mod_construction.dm b/code/modules/mod/mod_construction.dm
index 77fedf4c5292..d526ae37a71b 100644
--- a/code/modules/mod/mod_construction.dm
+++ b/code/modules/mod/mod_construction.dm
@@ -250,7 +250,7 @@
if(part.use_tool(src, user, 0, volume = 30))
to_chat(user, "Assembly unscrewed.")
construction_step = SCREWED_ASSEMBLY_STEP
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/mod/construction/shell/update_icon_state()
. = ..()
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index af4e47587a8d..4f5b79b684fd 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -127,14 +127,14 @@
if(length(req_access))
locked = TRUE
new_core?.install(src)
- helmet = new /obj/item/clothing/head/mod(src)
+ helmet = build_head() // SS220 EDIT - original: new /obj/item/clothing/head/mod(src)
mod_parts += helmet
- chestplate = new /obj/item/clothing/suit/mod(src)
+ chestplate = build_suit() // SS220 EDIT - original: new /obj/item/clothing/suit/mod(src)
chestplate.allowed += theme.allowed_suit_storage
mod_parts += chestplate
- gauntlets = new /obj/item/clothing/gloves/mod(src)
+ gauntlets = build_gloves() // SS220 EDIT - original: new /obj/item/clothing/gloves/mod(src)
mod_parts += gauntlets
- boots = new /obj/item/clothing/shoes/mod(src)
+ boots = build_shoes() // SS220 EDIT - original: new /obj/item/clothing/shoes/mod(src)
mod_parts += boots
var/list/all_parts = mod_parts + src
for(var/obj/item/part as anything in all_parts)
diff --git a/code/modules/mod/mod_core.dm b/code/modules/mod/mod_core.dm
index c2ce61cab7e7..40d9abe1a3a4 100644
--- a/code/modules/mod/mod_core.dm
+++ b/code/modules/mod/mod_core.dm
@@ -86,7 +86,7 @@
if(cell)
install_cell(cell)
RegisterSignal(mod, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
- RegisterSignal(mod, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand))
+ RegisterSignal(mod, COMSIG_CLICK_CTRL, PROC_REF(on_ctrl_click))
RegisterSignal(mod, COMSIG_MOD_WEARER_SET, PROC_REF(on_wearer_set))
if(mod.wearer)
on_wearer_set(mod, mod.wearer)
@@ -94,7 +94,7 @@
/obj/item/mod/core/standard/uninstall()
if(!QDELETED(cell))
cell.forceMove(drop_location())
- UnregisterSignal(mod, list(COMSIG_PARENT_EXAMINE, COMSIG_ATOM_ATTACK_HAND, COMSIG_MOD_WEARER_SET))
+ UnregisterSignal(mod, list(COMSIG_PARENT_EXAMINE, COMSIG_CLICK_CTRL, COMSIG_MOD_WEARER_SET))
if(mod.wearer)
on_wearer_unset(mod, mod.wearer)
return ..()
@@ -179,10 +179,10 @@
if(!mod.open)
return
- examine_text += cell ? "You could remove the cell with an empty hand." : "You could use a cell on it to install one."
+ examine_text += cell ? "You could remove the cell while in hand or being worn with Ctrl-Click." : "You could use a cell on it to install one."
-/obj/item/mod/core/standard/proc/on_attack_hand(datum/source, mob/living/user)
- SIGNAL_HANDLER
+/obj/item/mod/core/standard/proc/on_ctrl_click(datum/source, mob/living/user)
+ SIGNAL_HANDLER // COMSIG_CLICK_CTRL
if(mod.seconds_electrified && charge_amount() && mod.shock(user))
return COMPONENT_CANCEL_ATTACK_CHAIN
diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
index d841c96b886e..635b99e03d14 100644
--- a/code/modules/mod/mod_theme.dm
+++ b/code/modules/mod/mod_theme.dm
@@ -1113,13 +1113,14 @@
armor = list(MELEE = 20, BULLET = 5, LASER = 10, ENERGY = 10, BOMB = 50, RAD = 50, FIRE = 150, ACID = 150)
/datum/mod_theme/responsory
- name = "responsory"
- desc = "A high-speed rescue suit by Nanotrasen, intended for its' emergency response teams."
- extended_desc = "A streamlined suit of Nanotrasen design, these sleek black suits are only worn by \
- elite emergency response personnel to help save the day. While the slim and nimble design of the suit \
- cuts the ceramics and ablatives in it down, dropping the protection, \
- it keeps the wearer safe from the harsh void of space while sacrificing no speed whatsoever. \
- While wearing it you feel an extreme deference to darkness. "
+ name = "\improper 'Ward' responsory"
+ desc = "A high-tech combat modsuit designed and produced by Nanotrasen. Well armored, environmentally sealed, and outfitted with all manner of useful gadgetry. \
+ The pinnacle of corporate security hardware."
+ extended_desc = "A streamlined suit of powered armor produced entirely in-house by the Nanotrasen Corporation, the NA-22 'Ward' rapid response suit is one of the finest combat modsuits available on the market today. \
+ Equipped with a fire-resistant polybenzimidazole bodyglove and lightweight nano-polymer impact panels underneath a steel armored shell, the NA-22 offers reliable protection \
+ while retaining combat mobility. Internally, the NA-22 comes pre-loaded with NTOS-11 on a five-year subscription, which enables unparallelled customization options in conjunction \
+ with the Ward's unusually generous design specifications. Naturally, the NA-22 has a price tag to match its quality, and is thus only found within Nanotrasen's \
+ personal response units, as well as among the wealthiest of Sector PMCs and mercenary groups."
default_skin = "responsory"
armor_type_1 = /obj/item/mod/armor/mod_theme_responsory
diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm
index 770c256ff26d..051e5e8658e7 100644
--- a/code/modules/mod/mod_types.dm
+++ b/code/modules/mod/mod_types.dm
@@ -80,6 +80,7 @@
)
default_pins = list(
/obj/item/mod/module/magboot,
+ /obj/item/mod/module/firefighting_tank
)
@@ -97,6 +98,7 @@
default_pins = list(
/obj/item/mod/module/jetpack/advanced,
/obj/item/mod/module/magboot/advanced,
+ /obj/item/mod/module/firefighting_tank
)
/obj/item/mod/control/pre_equipped/loader
@@ -484,7 +486,8 @@
/obj/item/mod/control/pre_equipped/debug
theme = /datum/mod_theme/debug
applied_core = /obj/item/mod/core/infinite
- applied_modules = list( //one of every type of module, for testing if they all work correctly // boy this isn't even 25% the modules
+ /// One of every type of module, for testing if they all work correctly // boy this isn't even 25% the modules
+ applied_modules = list(
/obj/item/mod/module/storage/bluespace,
/obj/item/mod/module/welding,
/obj/item/mod/module/flashlight,
diff --git a/code/modules/mod/modules/_modules.dm b/code/modules/mod/modules/_modules.dm
index 35f6b60db828..6ba416447e6a 100644
--- a/code/modules/mod/modules/_modules.dm
+++ b/code/modules/mod/modules/_modules.dm
@@ -362,7 +362,7 @@
return
var/core_path = pick(accepted_anomalies)
core = new core_path(src)
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/mod/module/anomaly_locked/Destroy()
QDEL_NULL(core)
@@ -407,7 +407,7 @@
core = item
to_chat(user, "You install [item].")
playsound(src, 'sound/machines/click.ogg', 30, TRUE)
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
core.forceMove(src)
else
return ..()
@@ -424,7 +424,7 @@
if(Adjacent(user) && !issilicon(user))
user.put_in_hands(core)
core = null
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/mod/module/anomaly_locked/update_icon_state()
icon_state = initial(icon_state) + (core ? "-core" : "")
diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm
index 835de26f048a..909cb209e504 100644
--- a/code/modules/mod/modules/modules_antag.dm
+++ b/code/modules/mod/modules/modules_antag.dm
@@ -288,7 +288,8 @@
RegisterSignal(mod.wearer, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, PROC_REF(on_unarmed_attack))
RegisterSignal(mod.wearer, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act))
RegisterSignals(mod.wearer, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_HITBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW), PROC_REF(unstealth))
- animate(mod.wearer, alpha = stealth_alpha, time = 1.5 SECONDS)
+ mod.wearer.set_alpha_tracking(stealth_alpha, src, update_alpha = FALSE)
+ animate(mod.wearer, alpha = mod.wearer.get_alpha(), time = 1.5 SECONDS)
drain_power(use_power_cost)
/obj/item/mod/module/stealth/on_deactivation(display_message = TRUE, deleting = FALSE)
@@ -298,7 +299,8 @@
if(bumpoff)
UnregisterSignal(mod.wearer, COMSIG_LIVING_MOB_BUMP)
UnregisterSignal(mod.wearer, list(COMSIG_HUMAN_MELEE_UNARMED_ATTACK, COMSIG_MOB_ITEM_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_BULLET_ACT, COMSIG_ATOM_HITBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW))
- animate(mod.wearer, alpha = 255, time = 1.5 SECONDS)
+ mod.wearer.set_alpha_tracking(ALPHA_VISIBLE, src, update_alpha = FALSE)
+ animate(mod.wearer, alpha = mod.wearer.get_alpha(), time = 1.5 SECONDS)
/obj/item/mod/module/stealth/proc/unstealth(datum/source)
SIGNAL_HANDLER
@@ -504,7 +506,7 @@
/obj/item/mod/module/energy_shield/on_suit_deactivation(deleting = FALSE)
var/datum/component/shielded/shield = mod.GetComponent(/datum/component/shielded)
charges = shield.current_charges
- qdel(shield)
+ shield.RemoveComponent()
UnregisterSignal(mod.wearer, COMSIG_HUMAN_CHECK_SHIELDS)
/obj/item/mod/module/energy_shield/proc/shield_reaction(mob/living/carbon/human/owner,
@@ -579,7 +581,7 @@
return FALSE
var/datum/component/shielded/shield = mod.GetComponent(/datum/component/shielded)
charges = shield.current_charges
- qdel(shield)
+ shield.RemoveComponent()
UnregisterSignal(mod.wearer, COMSIG_HUMAN_CHECK_SHIELDS)
REMOVE_TRAIT(mod.wearer, TRAIT_SHOCKIMMUNE, UNIQUE_TRAIT_SOURCE(src))
diff --git a/code/modules/mod/modules/modules_service.dm b/code/modules/mod/modules/modules_service.dm
index 69720a0e3549..617ef90756cb 100644
--- a/code/modules/mod/modules/modules_service.dm
+++ b/code/modules/mod/modules/modules_service.dm
@@ -38,7 +38,8 @@
/obj/item/mod/module/waddle/on_suit_deactivation(deleting = FALSE)
if(!deleting)
- qdel(mod.boots.GetComponent(/datum/component/squeak))
+ mod.boots.DeleteComponent(/datum/component/squeak)
+
mod.wearer.RemoveElement(/datum/element/waddling)
//Boot heating - dries floors like galoshes/dry
diff --git a/code/modules/newscaster/obj/newscaster.dm b/code/modules/newscaster/obj/newscaster.dm
index f086ec662bb2..872bf29a8c1a 100644
--- a/code/modules/newscaster/obj/newscaster.dm
+++ b/code/modules/newscaster/obj/newscaster.dm
@@ -645,18 +645,9 @@ GLOBAL_LIST_EMPTY(allNewscasters)
/obj/machinery/newscaster/proc/get_scanned_user(mob/user)
. = list(name = "Unknown", security = user.can_admin_interact())
if(ishuman(user))
- var/mob/living/carbon/human/M = user
- // No ID, no luck
- if(!M.wear_id)
- return
- // Try to get the ID
- var/obj/item/card/id/ID
- if(istype(M.wear_id, /obj/item/pda))
- var/obj/item/pda/P = M.wear_id
- ID = P.id
- else if(istype(M.wear_id, /obj/item/card/id))
- ID = M.wear_id
- if(istype(ID))
+ var/mob/living/carbon/human/human_user = user
+ var/obj/item/card/id/ID = human_user.get_id_card()
+ if(ID)
return list(name = "[ID.registered_name] ([ID.assignment])", security = has_access(list(), list(ACCESS_SECURITY), ID.access))
else if(issilicon(user))
var/mob/living/silicon/ai_user = user
diff --git a/code/modules/ninja/suit/ninja_head.dm b/code/modules/ninja/suit/ninja_head.dm
index ace19a439234..fa095416b75b 100644
--- a/code/modules/ninja/suit/ninja_head.dm
+++ b/code/modules/ninja/suit/ninja_head.dm
@@ -5,5 +5,6 @@
name = "ninja hood"
icon_state = "s-ninja"
item_state = "s-ninja_hood"
+ flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
armor = list(MELEE = 75, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 15, FIRE = INFINITY, ACID = INFINITY)
blockTracking = 1
diff --git a/code/modules/ninja/suit/ninja_mask.dm b/code/modules/ninja/suit/ninja_mask.dm
index b61258440bd0..e024ea822a5b 100644
--- a/code/modules/ninja/suit/ninja_mask.dm
+++ b/code/modules/ninja/suit/ninja_mask.dm
@@ -10,7 +10,7 @@ Contents:
name = "ninja mask"
desc = "A close-fitting mask that acts both as an air filter and a post-modern fashion statement."
icon_state = "s-ninja(norm)"
- item_state = "s-ninja_mask"
+ item_state = "s-ninja(norm)"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
diff --git a/code/modules/ninja/suit/ninja_suit.dm b/code/modules/ninja/suit/ninja_suit.dm
index 47d7fbe3c904..b5ee1aedda7b 100644
--- a/code/modules/ninja/suit/ninja_suit.dm
+++ b/code/modules/ninja/suit/ninja_suit.dm
@@ -14,6 +14,7 @@ Contents:
item_state = "s-ninja_suit"
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/melee/baton, /obj/item/tank/internals, /obj/item/stock_parts/cell)
slowdown = 0
+ flags_inv = HIDEJUMPSUIT|HIDETAIL
armor = list(MELEE = 75, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 15, FIRE = INFINITY, ACID = INFINITY)
dyeable = FALSE
diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm
index c8a08ca60696..24ef741d3547 100644
--- a/code/modules/paperwork/fax.dm
+++ b/code/modules/paperwork/fax.dm
@@ -18,7 +18,7 @@ GLOBAL_LIST_EMPTY(adminfaxes)
var/list/reply_to = null
/datum/fax/admin/New()
- GLOB.adminfaxes += src
+ return
// Fax panel - lets admins check all faxes sent during the round
/client/proc/fax_panel()
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index d653f5917750..0188fcbb5b60 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -299,22 +299,22 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
var/success = 0
for(var/obj/machinery/photocopier/faxmachine/F in GLOB.allfaxes)
if(F.department == destination)
- success = F.receivefax(copyitem)
+ var/datum/fax/A = new /datum/fax()
+ A.name = copyitem.name
+ A.from_department = department
+ A.to_department = destination
+ A.origin = src
+ A.message = copyitem
+ A.sent_by = sender
+ A.sent_at = world.time
+
+ success = F.receivefax(A)
if(success)
- var/datum/fax/F = new /datum/fax()
- F.name = copyitem.name
- F.from_department = department
- F.to_department = destination
- F.origin = src
- F.message = copyitem
- F.sent_by = sender
- F.sent_at = world.time
-
visible_message("[src] beeps, \"Message transmitted successfully.\"")
else
visible_message("[src] beeps, \"Error transmitting message.\"")
-/obj/machinery/photocopier/faxmachine/proc/receivefax(obj/item/incoming)
+/obj/machinery/photocopier/faxmachine/proc/receivefax(datum/fax/incoming)
if(stat & (BROKEN|NOPOWER))
return FALSE
@@ -327,16 +327,31 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
addtimer(CALLBACK(src, PROC_REF(print_fax), incoming), 2 SECONDS)
return TRUE
-/obj/machinery/photocopier/faxmachine/proc/print_fax(obj/item/incoming)
- if(istype(incoming, /obj/item/paper))
- papercopy(incoming)
- else if(istype(incoming, /obj/item/photo))
- photocopy(incoming)
- else if(istype(incoming, /obj/item/paper_bundle))
- bundlecopy(incoming)
+/obj/machinery/photocopier/faxmachine/proc/print_fax(datum/fax/incoming)
+ var/obj/item/new_copy = null
+ if(istype(incoming.message, /obj/item/paper))
+ new_copy = papercopy(incoming.message)
+ else if(istype(incoming.message, /obj/item/photo))
+ new_copy = photocopy(incoming.message)
+ else if(istype(incoming.message, /obj/item/paper_bundle))
+ new_copy = bundlecopy(incoming.message)
else
return
+ // Store the fax that was received in the admin room in adminfaxes
+ // Fixes issue where deleting the original would make it unreadable in the admin panel
+ if(istype(incoming, /datum/fax/admin))
+ var/datum/fax/admin/A = new /datum/fax/admin()
+ A.name = new_copy.name
+ A.from_department = incoming.from_department
+ A.to_department = incoming.to_department
+ A.origin = incoming.origin
+ A.message = new_copy
+ A.sent_by = incoming.sent_by
+ A.sent_at = incoming.sent_at
+
+ GLOB.adminfaxes += A
+
use_power(active_power_consumption)
/obj/machinery/photocopier/faxmachine/proc/log_fax(mob/sender, destination)
@@ -387,7 +402,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
message_admins(sender, "SYNDICATE FAX", destination, copyitem, "#DC143C")
for(var/obj/machinery/photocopier/faxmachine/F in GLOB.allfaxes)
if(F.department == destination)
- F.receivefax(copyitem)
+ F.receivefax(A)
visible_message("[src] beeps, \"Message transmitted successfully.\"")
log_fax(sender, destination)
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 5ea585121ca9..03009f4c219e 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -319,7 +319,7 @@
add_hiddenprint(usr) // No more forging nasty documents as someone else, you jerks
if(!is_pen(item_write) && !istype(item_write, /obj/item/toy/crayon))
return
- if(loc != usr && !Adjacent(usr) && !((istype(loc, /obj/item/clipboard) || istype(loc, /obj/item/folder)) && (usr in get_turf(src) || loc.Adjacent(usr))))
+ if(loc != usr && !Adjacent(usr) && !((istype(loc, /obj/item/clipboard) || istype(loc, /obj/item/folder)) && ((usr in get_turf(src)) || loc.Adjacent(usr))))
return // If paper is not in usr, then it must be near them, or in a clipboard or folder, which must be in or near usr
input_element = parsepencode(input_element, item_write, usr) // Encode everything from pencode to html
if(id != "end")
@@ -651,11 +651,11 @@
name = "Teleporter Instructions"
info = "
Teleporter Instruction
Install circuit board, glass and wiring to complete Teleporter Control Console
Use a screwdriver, wirecutter and screwdriver again on the Teleporter Station to connect it
Set destination with Teleporter Control Computer
Activate Teleporter Hub with Teleporter Station
"
-/obj/item/paper/russiantraitorobj
+/obj/item/paper/soviettraitorobj
name = "paper- 'Mission Objectives'"
info = "The Syndicate have cunningly disguised a Syndicate Uplink as your PDA. Simply enter the code \"678 Bravo\" into the ringtone select to unlock its hidden features.
Objective #1. Kill the God damn AI in a fire blast that it rocks the station. Success! Objective #2. Escape alive. Failed."
-/obj/item/paper/russiannuclearoperativeobj
+/obj/item/paper/sovietnuclearoperativeobj
name = "paper- 'Objectives of a Nuclear Operative'"
info = "Objective #1: Destroy the station with a nuclear device."
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index 3b866e1b186a..4bd0eef2f6a2 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -72,7 +72,7 @@
else
if(is_pen(W) || istype(W, /obj/item/toy/crayon))
usr << browse("", "window=PaperBundle[UID()]") //Closes the dialog
- P = src[page]
+ P = get_page()
P.attackby(W, user, params)
update_icon()
@@ -106,7 +106,7 @@
/obj/item/paper_bundle/proc/show_content(mob/user as mob)
var/dat = {""}
- var/obj/item/W = src[page]
+ var/obj/item/W = get_page()
switch(screen)
if(0)
dat+= ""
@@ -120,11 +120,11 @@
dat+= "
"
dat+= ""
- if(istype(src[page], /obj/item/paper))
+ if(istype(W, /obj/item/paper))
var/obj/item/paper/P = W
dat += P.show_content(usr, view = 0)
usr << browse(dat, "window=PaperBundle[UID()]")
- else if(istype(src[page], /obj/item/photo))
+ else if(istype(W, /obj/item/photo))
var/obj/item/photo/P = W
usr << browse_rsc(P.img, "tmp_photo.png")
usr << browse(dat + "[P.name]" \
@@ -162,11 +162,11 @@
playsound(loc, "pageturn", 50, 1)
if(href_list["remove"])
- var/obj/item/W = src[page]
+ var/obj/item/W = get_page()
usr.put_in_hands(W)
to_chat(usr, "You remove [W] from the bundle.")
if(amount == 1)
- var/obj/item/paper/P = src[1]
+ var/obj/item/paper/P = get_page(1)
usr.unEquip(src)
usr.put_in_hands(P)
usr.unset_machine() // Ensure the bundle GCs
@@ -234,6 +234,7 @@
desc = "A single sheet of paper."
if(photos)
desc += "\nThere [photos == 1 ? "is a photo" : "are [photos] photos"] attached to it."
+
/obj/item/paper_bundle/update_icon_state()
if(length(contents))
var/obj/item/paper/P = contents[1]
@@ -267,4 +268,9 @@
. += sheet
. += "clip"
- update_desc()
+ update_appearance(UPDATE_DESC)
+
+/obj/item/paper_bundle/proc/get_page(page_override)
+ if(page_override)
+ return contents[page_override]
+ return contents[page]
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index ebe264a44717..a1395f0f19a3 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -179,19 +179,25 @@
name = "fancy pen"
desc = "A fancy metal pen. An inscription on one side reads, \"L.L. - L.R.\""
icon_state = "fancypen"
- container_type = DRAINABLE //cannot be refilled, love can be extracted for use in other items with syringe
+ container_type = (DRAINABLE | TRANSPARENT) //cannot be refilled, but pax can be extracted for use in other items with syringe
origin_tech = "engineering=4;syndicate=2"
transfer_amount = 25 // 4 Dosages instead of 2
-/obj/item/pen/sleepy/love/attack(mob/living/M, mob/user)
- var/can_transfer = reagents.total_volume && M.reagents
+/obj/item/pen/sleepy/love/Initialize(mapload)
. = ..()
- if(can_transfer && .)
- M.apply_status_effect(STATUS_EFFECT_PACIFIED) //pacifies for 40 seconds
- return TRUE
+ START_PROCESSING(SSobj, src)
+
+/obj/item/pen/sleepy/love/Destroy()
+ STOP_PROCESSING(SSobj, src)
+ return ..()
/obj/item/pen/sleepy/love/fill_pen()
- reagents.add_reagent("love", 100)
+ reagents.add_reagent("pax", 100) // strong and unique reagent, making you a pacifist for a long time.
+
+/obj/item/pen/sleepy/love/process()
+ if(reagents.total_volume < 100)
+ reagents.add_reagent("pax", 0.5) // slow refill over time. In average 1 dose every 100 seconds.
+
/obj/item/pen/sleepy/undisguised
name = "sleepy pen"
diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm
index 8bfc36d51321..b5155a3acb32 100644
--- a/code/modules/pda/PDA.dm
+++ b/code/modules/pda/PDA.dm
@@ -160,8 +160,12 @@ GLOBAL_LIST_EMPTY(PDAs)
. = ..()
if(id)
. += image('icons/goonstation/objects/pda_overlay.dmi', id.icon_state)
+
if(length(notifying_programs))
- . += image('icons/obj/pda.dmi', "pda-r")
+ if(icon_state == "pda-library")
+ . += image('icons/obj/pda.dmi', "pda-r-library")
+ else
+ . += image('icons/obj/pda.dmi', "pda-r")
/obj/item/pda/proc/close(mob/user)
SStgui.close_uis(src)
diff --git a/code/modules/pda/pdas.dm b/code/modules/pda/pdas.dm
index 3b848311b7ed..4191bd58f10e 100644
--- a/code/modules/pda/pdas.dm
+++ b/code/modules/pda/pdas.dm
@@ -16,7 +16,7 @@
/obj/item/pda/detective
default_cartridge = /obj/item/cartridge/detective
- icon_state = "pda-security"
+ icon_state = "pda-detective"
default_pen = /obj/item/pen/multi
/obj/item/pda/warden
@@ -79,6 +79,11 @@
icon_state = "pda-rd"
default_pen = /obj/item/pen/rd
+/obj/item/pda/heads/qm
+ default_cartridge = /obj/item/cartridge/qm
+ icon_state = "pda-qm"
+ default_pen = /obj/item/pen/qm
+
/obj/item/pda/captain
default_cartridge = /obj/item/cartridge/captain
icon_state = "pda-captain"
@@ -88,12 +93,12 @@
/obj/item/pda/heads/ntrep
default_cartridge = /obj/item/cartridge/supervisor
- icon_state = "pda-h"
+ icon_state = "pda-ntr"
default_pen = /obj/item/pen/multi/fountain
/obj/item/pda/heads/magistrate
default_cartridge = /obj/item/cartridge/supervisor
- icon_state = "pda-h"
+ icon_state = "pda-magistrate"
default_pen = /obj/item/pen/multi/gold
/obj/item/pda/heads/blueshield
@@ -125,11 +130,6 @@
default_cartridge = /obj/item/cartridge/cargo
icon_state = "pda-cargo"
-/obj/item/pda/quartermaster
- default_cartridge = /obj/item/cartridge/qm
- icon_state = "pda-qm"
- default_pen = /obj/item/pen/qm
-
/obj/item/pda/shaftminer
icon_state = "pda-miner"
@@ -174,7 +174,7 @@
default_pen = /obj/item/pen/multi
/obj/item/pda/clear
- icon_state = "pda-transp"
+ icon_state = "pda-clear"
desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a special edition with a transparent case."
model_name = "Thinktronic 5230 Personal Data Assistant Deluxe Special Max Turbo Limited Edition"
diff --git a/code/modules/power/apc/apc.dm b/code/modules/power/apc/apc.dm
index e1f99ebb895a..f818ad845c98 100644
--- a/code/modules/power/apc/apc.dm
+++ b/code/modules/power/apc/apc.dm
@@ -131,7 +131,6 @@
armor = list(MELEE = 20, BULLET = 20, LASER = 10, ENERGY = 100, BOMB = 30, RAD = 100, FIRE = 90, ACID = 50)
..()
GLOB.apcs += src
- GLOB.apcs = sortAtom(GLOB.apcs)
wires = new(src)
@@ -179,6 +178,7 @@
A.powernet.powernet_apc = src
if(!mapload)
+ GLOB.apcs = sortAtom(GLOB.apcs)
return
electronics_state = APC_ELECTRONICS_SECURED
diff --git a/code/modules/power/engines/singularity/singularity.dm b/code/modules/power/engines/singularity/singularity.dm
index 43d6337f619f..a043f9999fb6 100644
--- a/code/modules/power/engines/singularity/singularity.dm
+++ b/code/modules/power/engines/singularity/singularity.dm
@@ -336,7 +336,7 @@
var/movement_dir = pick(GLOB.alldirs - last_failed_movement)
- if(get_turf(src) == target || !target)
+ if(!target || get_dist(src, target) <= 2)
assign_target()
if(force_move)
movement_dir = force_move
diff --git a/code/modules/power/engines/supermatter/supermatter.dm b/code/modules/power/engines/supermatter/supermatter.dm
index f52cc040ba5c..0e3773f6b43b 100644
--- a/code/modules/power/engines/supermatter/supermatter.dm
+++ b/code/modules/power/engines/supermatter/supermatter.dm
@@ -559,6 +559,8 @@
var/mole_crunch_bonus = 0
if(combined_gas > MOLE_CRUNCH_THRESHOLD)
mole_crunch_bonus = 7000 //This adds 7000 EER worth of power to the SM. This should make mole crunch potentially worthy as a SM setup, if not risky. More stable than the anomalies, but very easy to push over the edge. Don't forget, a high EER setup can harvest power through zaps
+ if(!has_been_powered) // Nice try, no free no risk power
+ enable_for_the_first_time()
radiation_pulse(src, power * max(0, (1 + (power_transmission_bonus / 10))) + mole_crunch_bonus)
//Power * 0.55 * a value between 1 and 0.8
@@ -602,7 +604,7 @@
//After this point power is lowered
//This wraps around to the begining of the function
//Handle high power zaps/anomaly generation
- if(power > POWER_PENALTY_THRESHOLD || damage > damage_penalty_point) //If the power is above 5000 or if the damage is above 550
+ if(power > POWER_PENALTY_THRESHOLD || damage > damage_penalty_point || combined_gas > MOLE_CRUNCH_THRESHOLD) //If the power is above 5000, if the damage is above 550, or mole crushing
var/range = 4
zap_cutoff = 1500
if(removed && removed.return_pressure() > 0 && removed.temperature() > 0)
@@ -641,9 +643,9 @@
if(prob(5))
supermatter_anomaly_gen(src, FLUX_ANOMALY, rand(5, 10))
- if(power > SEVERE_POWER_PENALTY_THRESHOLD && prob(5) || prob(1))
+ if(power > SEVERE_POWER_PENALTY_THRESHOLD && prob(5) || prob(1) || combined_gas > MOLE_CRUNCH_THRESHOLD && prob(5))
supermatter_anomaly_gen(src, GRAVITATIONAL_ANOMALY, rand(5, 10))
- if((power > SEVERE_POWER_PENALTY_THRESHOLD && prob(2)) || (prob(0.3) && power > POWER_PENALTY_THRESHOLD))
+ if((power > SEVERE_POWER_PENALTY_THRESHOLD && prob(2)) || (prob(0.3) && power > POWER_PENALTY_THRESHOLD) || combined_gas > MOLE_CRUNCH_THRESHOLD && prob(2))
supermatter_anomaly_gen(src, BLUESPACE_ANOMALY, rand(5, 10))
if(prob(15))
@@ -1062,7 +1064,7 @@
step_towards(P,center)
/obj/machinery/atmospherics/supermatter_crystal/proc/supermatter_anomaly_gen(turf/anomalycenter, type = FLUX_ANOMALY, anomalyrange = 5)
- var/turf/L = pick(orange(anomalyrange, anomalycenter))
+ var/turf/L = pick(RANGE_TURFS(anomalyrange, anomalycenter))
if(L)
switch(type)
if(FLUX_ANOMALY)
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 4e7c27fb5e55..b56a3151cdca 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -58,11 +58,16 @@ GLOBAL_LIST_EMPTY(gravity_generators)
/obj/machinery/gravity_generator/main/station/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/multitile, 1, list(
+ AddComponent(/datum/component/multitile, list(
list(1, 1, 1),
list(1, MACH_CENTER, 1),
- list(0, 0, 0),
))
+
+ var/area/machine_area = get_area(src)
+ parent_area_type = machine_area.get_top_parent_type()
+ if(parent_area_type)
+ areas = typesof(parent_area_type)
+
update_gen_list()
set_power()
@@ -87,6 +92,8 @@ GLOBAL_LIST_EMPTY(gravity_generators)
var/current_overlay = null
var/construction_state = GRAV_NEEDS_WELDING
var/overlay_state = "activated"
+ var/parent_area_type
+ var/areas = list()
/obj/machinery/gravity_generator/main/examine(mob/user)
. = ..()
@@ -268,24 +275,21 @@ GLOBAL_LIST_EMPTY(gravity_generators)
change_power_mode(on ? ACTIVE_POWER_USE : IDLE_POWER_USE)
if(gravity) // If we turned on
- if(generators_in_level() == 0) // And there's no other gravity generators on this z level
+ if(generators_in_area() == 0) // And there's no other gravity generators on this z level
alert = TRUE
investigate_log("was brought online and is now producing gravity for this level.", "gravity")
message_admins("The gravity generator was brought online. ([src_area.name])")
for(var/area/A in world)
- if(!is_station_level(A.z))
- continue
- A.gravitychange(TRUE, A)
+ if((A.type in areas) && A.z == z)
+ A.gravitychange(TRUE, A)
- else if(generators_in_level() == 1) // Turned off, and there is only one gravity generator on the Z level
+ else if(generators_in_area() == 1) // Turned off, and there is only one gravity generator on the Z level
alert = TRUE
investigate_log("was brought offline and there is now no gravity for this level.", "gravity")
message_admins("The gravity generator was brought offline with no backup generator. ([src_area.name])")
for(var/area/A in world)
- if(!is_station_level(A.z))
- continue
- A.gravitychange(FALSE, A)
-
+ if((A.type in areas) && A.z == z)
+ A.gravitychange(FALSE, A)
update_icon()
update_gen_list()
if(alert)
@@ -340,7 +344,7 @@ GLOBAL_LIST_EMPTY(gravity_generators)
radiation_pulse(get_turf(L), 600, 2)
/**
- * Shake everyone on the z level and play an alarm to let them know that gravity was enagaged/disenagaged.
+ * Shake everyone on the area list and play an alarm to let them know that gravity was enagaged/disenagaged.
*/
/obj/machinery/gravity_generator/main/proc/shake_everyone()
var/turf/our_turf = get_turf(src)
@@ -349,30 +353,27 @@ GLOBAL_LIST_EMPTY(gravity_generators)
for(var/shaken in GLOB.mob_list)
var/mob/M = shaken
var/turf/their_turf = get_turf(M)
- if(their_turf?.z == our_turf.z)
+ if(their_turf && ((get_area(their_turf)).type in typesof(parent_area_type)) && (M.z == z))
M.update_gravity(M.mob_has_gravity())
if(M.client)
shake_camera(M, 15, 1)
M.playsound_local(our_turf, null, 100, TRUE, 0.5, S = alert_sound)
-// TODO: Make the gravity generator cooperate with the space manager
-/obj/machinery/gravity_generator/main/proc/generators_in_level()
- var/turf/T = get_turf(src)
- if(!T)
- return FALSE
- if(GLOB.gravity_generators["[T.z]"])
- return length(GLOB.gravity_generators["[T.z]"])
- return FALSE
-
/obj/machinery/gravity_generator/main/proc/update_gen_list()
- var/turf/T = get_turf(src)
- if(T)
- if(!GLOB.gravity_generators["[T.z]"])
- GLOB.gravity_generators["[T.z]"] = list()
+ if(parent_area_type)
+ if(!GLOB.gravity_generators["[parent_area_type]"])
+ GLOB.gravity_generators["[parent_area_type]"] = list()
if(on)
- GLOB.gravity_generators["[T.z]"] |= src
+ GLOB.gravity_generators["[parent_area_type]"] |= src
else
- GLOB.gravity_generators["[T.z]"] -= src
+ GLOB.gravity_generators["[parent_area_type]"] -= src
+
+/obj/machinery/gravity_generator/main/proc/generators_in_area()
+ if(!parent_area_type)
+ return FALSE
+ if(GLOB.gravity_generators["[parent_area_type]"])
+ return length(GLOB.gravity_generators["[parent_area_type]"])
+ return FALSE
// Misc
@@ -385,7 +386,6 @@ GLOBAL_LIST_EMPTY(gravity_generators)
animate(src, transform = M * 40, time = 0.8 SECONDS, alpha = 128)
QDEL_IN(src, 0.8 SECONDS)
-
/obj/item/paper/gravity_gen
name = "paper - 'Generate your own gravity!'"
info = {"
Generating Gravity For Dummies
diff --git a/code/modules/power/lights.dm b/code/modules/power/lights.dm
index 04de3076a22a..74780dc48b75 100644
--- a/code/modules/power/lights.dm
+++ b/code/modules/power/lights.dm
@@ -2,18 +2,16 @@
//
// Consists of light fixtures (/obj/machinery/light) and light tube/bulb items (/obj/item/light)
-// status values shared between lighting fixtures and items
-#define LIGHT_OK 0
-#define LIGHT_EMPTY 1
-#define LIGHT_BROKEN 2
-#define LIGHT_BURNED 3
-
#define LIGHT_ON_DELAY_LOWER 1 SECONDS
#define LIGHT_ON_DELAY_UPPER 3 SECONDS
#define MAXIMUM_SAFE_BACKUP_CHARGE 600
#define EMERGENCY_LIGHT_POWER_USE 0.5
+#define LIGHT_CONSTRUCT_EMPTY_FRAME 1
+#define LIGHT_CONSTRUCT_WIRED 2
+#define LIGHT_CONSTRUCT_COMPLETED 3
+
/**
* # Light fixture frame
*
@@ -27,84 +25,73 @@
icon = 'icons/obj/lighting.dmi'
icon_state = "tube-construct-stage1"
anchored = TRUE
- layer = 5
+ layer = FLY_LAYER
max_integrity = 200
armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 80, ACID = 50)
- /// Construction stage (1 = Empty frame | 2 = Wired frame | 3 = Completed frame)
- var/stage = 1
+ /// Construction stage
+ var/stage = LIGHT_CONSTRUCT_EMPTY_FRAME
/// Light bulb type
var/fixture_type = "tube"
/// How many metal sheets get given after deconstruction
var/sheets_refunded = 2
/// Holder for the completed fixture
- var/obj/machinery/light/newlight = null
+ var/obj/machinery/light/construct_type = /obj/machinery/light/built
/obj/machinery/light_construct/Initialize(mapload, ndir, building)
. = ..()
- if(fixture_type == "bulb")
- icon_state = "bulb-construct-stage1"
+ update_icon(UPDATE_ICON_STATE)
/obj/machinery/light_construct/examine(mob/user)
. = ..()
if(get_dist(user, src) <= 2)
switch(stage)
- if(1)
+ if(LIGHT_CONSTRUCT_EMPTY_FRAME)
. += "It's an empty frame bolted to the wall. It needs to be wired."
- if(2)
+ if(LIGHT_CONSTRUCT_WIRED)
. += "The frame is wired, but the casing's cover is unscrewed."
- if(3)
+ if(LIGHT_CONSTRUCT_COMPLETED)
. += "The casing is screwed shut."
/obj/machinery/light_construct/wrench_act(mob/living/user, obj/item/I)
. = TRUE
switch(stage)
- if(1)
+ if(LIGHT_CONSTRUCT_EMPTY_FRAME)
to_chat(user, "You begin to dismantle [src].")
if(!I.use_tool(src, user, 30, volume = I.tool_volume))
return
new /obj/item/stack/sheet/metal(get_turf(loc), sheets_refunded)
TOOL_DISMANTLE_SUCCESS_MESSAGE
qdel(src)
- if(2)
+ if(LIGHT_CONSTRUCT_WIRED)
to_chat(user, "You have to remove the wires first.")
- if(3)
+ if(LIGHT_CONSTRUCT_COMPLETED)
to_chat(user, "You have to unscrew the case first.")
/obj/machinery/light_construct/wirecutter_act(mob/living/user, obj/item/I)
- if(stage != 2)
+ if(stage != LIGHT_CONSTRUCT_WIRED)
return
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
. = TRUE
- stage = 1
- switch(fixture_type)
- if("tube")
- icon_state = "tube-construct-stage1"
- if("bulb")
- icon_state = "bulb-construct-stage1"
+
+ stage = LIGHT_CONSTRUCT_EMPTY_FRAME
+ update_icon(UPDATE_ICON_STATE)
new /obj/item/stack/cable_coil(get_turf(loc), 1, paramcolor = COLOR_RED)
WIRECUTTER_SNIP_MESSAGE
/obj/machinery/light_construct/screwdriver_act(mob/living/user, obj/item/I)
- if(stage != 2)
+ if(stage != LIGHT_CONSTRUCT_WIRED)
return
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
- switch(fixture_type)
- if("tube")
- icon_state = "tube-empty"
- if("bulb")
- icon_state = "bulb-empty"
- stage = 3
+
+ stage = LIGHT_CONSTRUCT_COMPLETED
+ update_icon(UPDATE_ICON_STATE)
user.visible_message("[user] closes [src]'s casing.", \
"You close [src]'s casing.", "You hear a screwdriver.")
- switch(fixture_type)
- if("tube")
- newlight = new /obj/machinery/light/built(loc)
- if("bulb")
- newlight = new /obj/machinery/light/small/built(loc)
+ var/obj/machinery/light/newlight = new construct_type(loc)
newlight.setDir(dir)
transfer_fingerprints_to(newlight)
qdel(src)
@@ -112,16 +99,12 @@
/obj/machinery/light_construct/attackby(obj/item/W, mob/living/user, params)
add_fingerprint(user)
if(istype(W, /obj/item/stack/cable_coil))
- if(stage != 1)
+ if(stage != LIGHT_CONSTRUCT_EMPTY_FRAME)
return
var/obj/item/stack/cable_coil/coil = W
coil.use(1)
- switch(fixture_type)
- if("tube")
- icon_state = "tube-construct-stage2"
- if("bulb")
- icon_state = "bulb-construct-stage2"
- stage = 2
+ stage = LIGHT_CONSTRUCT_WIRED
+ update_icon(UPDATE_ICON_STATE)
playsound(loc, coil.usesound, 50, 1)
user.visible_message("[user.name] adds wires to [src].", \
"You add wires to [src].", "You hear a noise.")
@@ -138,6 +121,13 @@
new /obj/item/stack/sheet/metal(loc, sheets_refunded)
qdel(src)
+/obj/machinery/light_construct/update_icon_state()
+ . = ..()
+ if(stage == LIGHT_CONSTRUCT_COMPLETED)
+ icon_state = "[fixture_type]-empty"
+ return
+ icon_state = "[fixture_type]-construct-stage[stage]"
+
/**
* # Small light fixture frame
*
@@ -148,13 +138,28 @@
/obj/machinery/light_construct/small
name = "small light fixture frame"
desc = "A small light fixture under construction."
- icon = 'icons/obj/lighting.dmi'
icon_state = "bulb-construct-stage1"
anchored = TRUE
- layer = 5
- stage = 1
+ layer = FLY_LAYER
fixture_type = "bulb"
sheets_refunded = 1
+ construct_type = /obj/machinery/light/small/built
+
+/obj/machinery/light_construct/floor
+ name = "floor light fixture frame"
+ desc = "A floor light fixture under construction."
+ icon_state = "floor-construct-stage1"
+ anchored = TRUE
+ layer = ABOVE_OPEN_TURF_LAYER
+ plane = FLOOR_PLANE
+ fixture_type = "floor"
+ sheets_refunded = 3
+ construct_type = /obj/machinery/light/floor/built
+
+
+#undef LIGHT_CONSTRUCT_EMPTY_FRAME
+#undef LIGHT_CONSTRUCT_WIRED
+#undef LIGHT_CONSTRUCT_COMPLETED
/**
@@ -170,7 +175,7 @@
glow_icon_state = "tube"
exposure_icon_state = "cone"
anchored = TRUE
- layer = 5
+ layer = FLY_LAYER
max_integrity = 100
power_state = ACTIVE_POWER_USE
idle_power_consumption = 2 //when in low power mode
@@ -198,6 +203,8 @@
var/light_type = /obj/item/light/tube
/// Type of light bulb that goes into the fixture
var/fitting = "tube"
+ /// What light construct type to turn into when we are deconstructed
+ var/obj/machinery/light_construct/deconstruct_type = /obj/machinery/light_construct
/// How many times has the light been switched on/off? (This is used to calc the probability the light burns out)
var/switchcount = 0
/// Is the light rigged to explode?
@@ -238,6 +245,7 @@
brightness_color = "#a0a080"
nightshift_light_range = 4
light_type = /obj/item/light/bulb
+ deconstruct_type = /obj/machinery/light_construct/small
/obj/machinery/light/spot
name = "spotlight"
@@ -245,13 +253,30 @@
brightness_range = 12
brightness_power = 4
-/obj/machinery/light/built/Initialize(mapload)
+/obj/machinery/light/floor
+ name = "floor light"
+ desc = "A lightbulb you can walk on without breaking it, amazing."
+ icon_state = "floor1"
+ glow_icon_state = "floor"
+ exposure_icon_state = "floor_circle"
+ base_state = "floor"
+ fitting = "bulb"
+ light_type = /obj/item/light/bulb
+ deconstruct_type = /obj/machinery/light_construct/floor
+ brightness_range = 6
+ nightshift_light_range = 6
+ layer = ABOVE_OPEN_TURF_LAYER
+ plane = FLOOR_PLANE
+
+/obj/machinery/light/built
status = LIGHT_EMPTY
- return ..()
-/obj/machinery/light/small/built/Initialize(mapload)
+/obj/machinery/light/small/built
+ status = LIGHT_EMPTY
+
+/obj/machinery/light/floor/built
status = LIGHT_EMPTY
- return ..()
+
// create a new lighting fixture
/obj/machinery/light/Initialize(mapload)
@@ -265,7 +290,7 @@
if(A && !A.requires_power)
on = TRUE
- switch(fitting)
+ switch(base_state)
if("tube")
brightness_range = 8
if(prob(2))
@@ -275,6 +300,11 @@
brightness_color = "#a0a080"
if(prob(5))
break_light_tube(TRUE)
+ if("floor")
+ brightness_range = 6
+ brightness_color = "#a0a080"
+ if(prob(3))
+ break_light_tube(TRUE)
update(FALSE, TRUE, FALSE)
/obj/machinery/light/proc/on_security_level_change_planned(datum/source, previous_level_number, new_level_number)
@@ -340,6 +370,17 @@
else
underlays += emissive_appearance(icon, "[base_state]_lightmask")
+/obj/machinery/light/fix(mob/user, obj/used_tool, emagged = FALSE)
+ if(status != LIGHT_OK)
+ to_chat(user, "You replace the [fitting] with [used_tool].")
+ status = LIGHT_OK
+ switchcount = 0
+ rigged = emagged
+ on = has_power()
+ update(TRUE, TRUE, FALSE)
+ else
+ to_chat(user, "There is a working [fitting] already inserted!")
+ return
/**
* Updates the light's 'on' state and power consumption based on [/obj/machinery/light/var/on].
*
@@ -557,18 +598,10 @@
/obj/machinery/light/deconstruct(disassembled = TRUE)
if(!(flags & NODECONSTRUCT))
- var/obj/machinery/light_construct/newlight = null
var/cur_stage = 2
if(!disassembled)
cur_stage = 1
- switch(fitting)
- if("tube")
- newlight = new /obj/machinery/light_construct(loc)
- newlight.icon_state = "tube-construct-stage2"
-
- if("bulb")
- newlight = new /obj/machinery/light_construct/small(loc)
- newlight.icon_state = "bulb-construct-stage2"
+ var/obj/machinery/light_construct/newlight = new deconstruct_type(loc)
newlight.setDir(dir)
newlight.stage = cur_stage
if(!disassembled)
@@ -578,6 +611,7 @@
if(status != LIGHT_EMPTY)
drop_light_tube()
new /obj/item/stack/cable_coil(loc, 1, "red")
+ newlight.update_icon(UPDATE_ICON_STATE)
transfer_fingerprints_to(newlight)
qdel(src)
@@ -822,6 +856,22 @@
explosion(T, 0, 0, 2, 2)
qdel(src)
+/obj/machinery/light/extinguish_light(force = FALSE)
+ on = FALSE
+ extinguished = TRUE
+ emergency_mode = FALSE
+ no_emergency = TRUE
+ addtimer(CALLBACK(src, PROC_REF(enable_emergency_lighting)), 5 MINUTES, TIMER_UNIQUE|TIMER_OVERRIDE)
+ visible_message("[src] flickers and falls dark.")
+ update(FALSE)
+
+/obj/machinery/light/proc/enable_emergency_lighting()
+ visible_message("[src]'s emergency lighting flickers back to life.")
+ extinguished = FALSE
+ no_emergency = FALSE
+ update(FALSE)
+
+
/**
* MARK: Light item
*
@@ -857,7 +907,7 @@
/obj/item/light/Crossed(mob/living/L)
if(istype(L) && has_gravity(loc))
- if(L.incorporeal_move || L.flying || L.floating)
+ if(L.incorporeal_move || HAS_TRAIT(L, TRAIT_FLYING) || L.floating)
return
playsound(loc, 'sound/effects/glass_step.ogg', 50, TRUE)
if(status == LIGHT_BURNED || status == LIGHT_OK)
@@ -908,14 +958,6 @@
..()
shatter()
-/obj/item/light/bulb/fire
- name = "fire bulb"
- desc = "A replacement fire bulb."
- icon_state = "fbulb"
- base_state = "fbulb"
- item_state = "egg4"
- brightness_range = 5
-
// update the icon state and description of the light
/obj/item/light/proc/update()
@@ -933,11 +975,6 @@
/obj/item/light/New()
..()
- switch(name)
- if("light tube")
- brightness_range = rand(6,9)
- if("light bulb")
- brightness_range = rand(4,6)
update()
@@ -990,26 +1027,7 @@
limb.droplimb(0, DROPLIMB_BURN)
return FIRELOSS
-/obj/machinery/light/extinguish_light(force = FALSE)
- on = FALSE
- extinguished = TRUE
- emergency_mode = FALSE
- no_emergency = TRUE
- addtimer(CALLBACK(src, PROC_REF(enable_emergency_lighting)), 5 MINUTES, TIMER_UNIQUE|TIMER_OVERRIDE)
- visible_message("[src] flickers and falls dark.")
- update(FALSE)
-
-/obj/machinery/light/proc/enable_emergency_lighting()
- visible_message("[src]'s emergency lighting flickers back to life.")
- extinguished = FALSE
- no_emergency = FALSE
- update(FALSE)
-
#undef MAXIMUM_SAFE_BACKUP_CHARGE
#undef EMERGENCY_LIGHT_POWER_USE
-#undef LIGHT_OK
-#undef LIGHT_EMPTY
-#undef LIGHT_BROKEN
-#undef LIGHT_BURNED
#undef LIGHT_ON_DELAY_LOWER
#undef LIGHT_ON_DELAY_UPPER
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 68134c24008c..decfac1f1a0d 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -189,6 +189,7 @@
make_terminal(user, temporary_direction, temporary_location)
terminal.connect_to_network()
+ stat &= ~BROKEN
return
// Disassembling the terminal
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index ff397b39e9cb..5a0fbf434ff6 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -128,7 +128,7 @@
var/list/stored_ammo = list()
var/ammo_type = /obj/item/ammo_casing
var/max_ammo = 7
- var/multi_sprite_step = AMMO_BOX_MULTI_SPRITE_STEP_NONE // see update_icon_state() for details
+ var/multi_sprite_step = AMMO_BOX_MULTI_SPRITE_STEP_NONE // see update_icon_state for details
var/caliber
var/multiload = 1
var/slow_loading = FALSE
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index 1e9c05ef2257..889d8d5c6e46 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -604,6 +604,11 @@
materials = list(MAT_METAL = 20000)
var/charge = 1000
+// Overwrite description so shells aren't displayed
+/obj/item/ammo_box/magazine/detective/speedcharger/update_desc()
+ . = ..()
+ desc = "[initial(desc)]"
+
/obj/item/ammo_box/magazine/detective/speedcharger/update_icon_state()
return
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 36984e63b5ef..aa6c863cd63d 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -352,6 +352,7 @@
if(!user.unEquip(I))
return
to_chat(user, "You click [S] into place on [src].")
+ playsound(src, 'sound/machines/click.ogg', 50, TRUE)
if(S.on)
set_light(0)
gun_light = S
@@ -375,6 +376,7 @@
return
K.forceMove(src)
to_chat(user, "You attach [K] to [src]'s bayonet lug.")
+ playsound(src, 'sound/machines/click.ogg', 50, TRUE)
bayonet = K
var/state = "bayonet" //Generic state.
if(bayonet.icon_state in icon_states('icons/obj/guns/bayonets.dmi')) //Snowflake state?
@@ -389,21 +391,23 @@
/obj/item/gun/screwdriver_act(mob/user, obj/item/I)
. = TRUE
- if(!I.use_tool(src, user, 0, volume = I.tool_volume))
- return
- if(gun_light && can_flashlight)
- for(var/obj/item/flashlight/seclite/S in src)
- to_chat(user, "You unscrew the seclite from [src].")
- gun_light = null
- S.loc = get_turf(user)
- update_gun_light(user)
- S.update_brightness(user)
- update_icon()
- for(var/datum/action/item_action/toggle_gunlight/TGL in actions)
- qdel(TGL)
- else if(bayonet && can_bayonet) //if it has a bayonet, and the bayonet can be removed
- bayonet.forceMove(get_turf(user))
- clear_bayonet()
+ if(gun_light || bayonet)
+ if(!I.use_tool(src, user, 0, volume = I.tool_volume))
+ return
+ if(gun_light && can_flashlight)
+ for(var/obj/item/flashlight/seclite/S in src)
+ to_chat(user, "You unscrew the seclite from [src].")
+ gun_light = null
+ S.loc = get_turf(user)
+ update_gun_light(user)
+ S.update_brightness(user)
+ update_icon()
+ for(var/datum/action/item_action/toggle_gunlight/TGL in actions)
+ qdel(TGL)
+ else if(bayonet && can_bayonet) // if it has a bayonet, and the bayonet can be removed
+ bayonet.forceMove(get_turf(user))
+ to_chat(user, "You remove [bayonet] from [src].")
+ clear_bayonet()
/obj/item/gun/proc/toggle_gunlight()
if(!gun_light)
diff --git a/code/modules/projectiles/gun_attachments.dm b/code/modules/projectiles/gun_attachments.dm
index 9a5156b45469..a24355285f46 100644
--- a/code/modules/projectiles/gun_attachments.dm
+++ b/code/modules/projectiles/gun_attachments.dm
@@ -2,7 +2,7 @@
/obj/item/suppressor
- name = "suppressor"
+ name = "universal suppressor"
desc = "A universal syndicate small-arms suppressor for maximum espionage."
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "suppressor"
diff --git a/code/modules/projectiles/guns/chaos_bolt.dm b/code/modules/projectiles/guns/chaos_bolt.dm
index 3466cc29581e..fab8d9955f4a 100644
--- a/code/modules/projectiles/guns/chaos_bolt.dm
+++ b/code/modules/projectiles/guns/chaos_bolt.dm
@@ -247,6 +247,7 @@
H.electrocute_act(CHAOS_STAFF_DAMAGE, src)
/datum/status_effect/teleport_roulette
+ id = "teleport_roulette"
duration = 16 SECONDS
status_type = STATUS_EFFECT_REPLACE
tick_interval = 2 SECONDS
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 70869766e3b8..ad85a7e67f75 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -291,6 +291,7 @@
require_module = TRUE
module_type = /obj/item/robot_module/miner
usesound = 'sound/items/screwdriver.ogg'
+ allow_duplicate = TRUE
var/denied_type = null
var/maximum_of_type = 1
var/cost = 30
@@ -313,12 +314,12 @@
else
return ..()
-/obj/item/borg/upgrade/modkit/action(mob/living/silicon/robot/R)
+/obj/item/borg/upgrade/modkit/action(mob/user, mob/living/silicon/robot/R)
if(!..())
return
for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/H in R.module.modules)
- return install(H, usr)
+ return install(H, user)
/obj/item/borg/upgrade/modkit/proc/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user)
. = TRUE
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 30714c54095c..ca49135be11d 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -97,7 +97,7 @@
//APS Pistol//
/obj/item/gun/projectile/automatic/pistol/APS
name = "stechkin APS pistol"
- desc = "The original russian version of a widely used Syndicate sidearm. Uses 10mm ammo."
+ desc = "A deadly automatic pistol produced by the USSP's State Armory. Uses 10mm ammo."
icon_state = "aps"
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=3;materials=2;syndicate=3"
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index c5f35cffa977..38b5c4a3aa52 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -168,7 +168,7 @@
/obj/item/gun/projectile/revolver/mateba
name = "\improper Unica 6 auto-revolver"
- desc = "A retro high-powered autorevolver typically used by officers of the New Russia military. Uses .357 ammo." //>10mm hole >.357
+ desc = "A retro high-powered autorevolver typically used by officers of several unrelated militaries. Uses .357 ammo." //>10mm hole >.357
icon_state = "mateba"
/obj/item/gun/projectile/revolver/golden
diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm
index dcf3c6261a77..27d195f82d9e 100644
--- a/code/modules/projectiles/guns/projectile/toy.dm
+++ b/code/modules/projectiles/guns/projectile/toy.dm
@@ -99,6 +99,7 @@
suppressed_sound = 'sound/weapons/gunshots/gunshot_smg.ogg'
needs_permit = FALSE
mag_type = /obj/item/ammo_box/magazine/toy/smgm45
+ origin_tech = "combat=3;materials=2;syndicate=2"
/obj/item/gun/projectile/automatic/c20r/toy/riot
mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot
@@ -133,6 +134,7 @@
inhand_y_dimension = 32
mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/tommygun
w_class = WEIGHT_CLASS_SMALL
+ origin_tech = "combat=3;materials=2;syndicate=2"
/obj/item/gun/projectile/automatic/sniper_rifle/toy
name = "donksoft sniper rifle"
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 85376f0d8e2e..45eae9706d47 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -76,7 +76,8 @@
/obj/item/food/grown/pumpkin = list("pumpkinjuice" = 0),
/obj/item/food/grown/apple = list("applejuice" = 0),
/obj/item/food/grown/grapes = list("grapejuice" = 0),
- /obj/item/food/grown/pineapple = list("pineapplejuice" = 0)
+ /obj/item/food/grown/pineapple = list("pineapplejuice" = 0),
+ /obj/item/food/grown/bungofruit = list("bungojuice" = 0)
)
var/list/dried_items = list(
diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm
index af10f6ee3f92..d661a9fad43f 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol.dm
@@ -1504,14 +1504,11 @@
/datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(!M.nutrition)
- switch(rand(1, 3))
- if(1)
- to_chat(M, "You feel hungry...")
- if(2)
- update_flags |= M.adjustToxLoss(1, FALSE)
- to_chat(M, "Your stomach grumbles painfully!")
- else
- pass()
+ if(prob(66.66))
+ to_chat(M, "You feel hungry...")
+ else if(prob(50))
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ to_chat(M, "Your stomach grumbles painfully!")
else
if(prob(60))
M.adjust_nutrition(-remove_nutrition)
diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
index c1561de6b6ed..1371a3bf5224 100644
--- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
@@ -140,6 +140,15 @@
drink_desc = "Apple juice. Maybe it would have been better in a pie..."
taste_description = "apple juice"
+/datum/reagent/consumable/bungojuice
+ name = "Bungo Juice"
+ id = "bungojuice"
+ description = "Exotic! You feel like you are on vacation already."
+ color = "#F9E43D"
+ drink_name = "Bungo Juice"
+ drink_desc = "Exotic! You feel like you are on vacation already."
+ taste_description = "succulent bungo with an acidic poisonous tang"
+
/datum/reagent/consumable/drink/watermelonjuice
name = "Watermelon Juice"
id = "watermelonjuice"
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index a983c66b1a00..ead46024498a 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -679,6 +679,22 @@
if(volume >= 5 && !isspaceturf(T))
new /obj/item/food/weirdcheesewedge(T)
+/datum/reagent/consumable/cheese_curds
+ name = "Cheese Curds"
+ id = "cheese_curds"
+ description = "Some mushed up cheese curds. You're not quite sure why you did this."
+ reagent_state = SOLID
+ color = "#FFFF00"
+ taste_description = "salty cheese"
+
+/datum/reagent/consumable/yogurt
+ name = "yogurt"
+ id = "yogurt"
+ description = "Some yogurt, produced by bacterial fermentation of milk. Yum."
+ reagent_state = LIQUID
+ color = "#FFFFFF"
+ taste_description = "yogurt"
+
/datum/reagent/consumable/beans
name = "Refried beans"
id = "beans"
diff --git a/code/modules/reagents/chemistry/reagents/misc_reagents.dm b/code/modules/reagents/chemistry/reagents/misc_reagents.dm
index becb5f5bb504..3c64adf2b7e5 100644
--- a/code/modules/reagents/chemistry/reagents/misc_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/misc_reagents.dm
@@ -453,6 +453,7 @@
id = "jestosterone"
description = "Jestosterone is an odd chemical compound that induces a variety of annoying side-effects in the average person. It also causes mild intoxication, and is toxic to mimes."
color = "#ff00ff" //Fuchsia, pity we can't do rainbow here
+ process_flags = ORGANIC | SYNTHETIC
taste_description = "a funny flavour"
/datum/reagent/jestosterone/on_new()
@@ -475,14 +476,14 @@
C.AddElement(/datum/element/waddling)
C.AddComponent(/datum/component/squeak, null, null, null, null, null, TRUE, falloff_exponent = 20)
-/datum/reagent/jestosterone/on_mob_life(mob/living/carbon/M)
+/datum/reagent/jestosterone/on_mob_life(mob/living/carbon/human/M)
var/update_flags = STATUS_UPDATE_NONE
if(prob(10))
M.emote("giggle")
if(!M.mind)
return ..() | update_flags
if(M.mind.assigned_role == "Clown")
- update_flags |= M.adjustBruteLoss(-1.5 * REAGENTS_EFFECT_MULTIPLIER) //Screw those pesky clown beatings!
+ update_flags |= M.adjustBruteLoss(-1.5 * REAGENTS_EFFECT_MULTIPLIER, robotic = TRUE) //Screw those pesky clown beatings!
else
M.AdjustDizzy(20 SECONDS, 0, 100 SECONDS)
M.Druggy(30 SECONDS)
@@ -502,7 +503,10 @@
"You feel like telling a pun.")
to_chat(M, "[pick(clown_message)]")
if(M.mind.assigned_role == "Mime")
- update_flags |= M.adjustToxLoss(1.5 * REAGENTS_EFFECT_MULTIPLIER)
+ if(M.dna.species.tox_mod <= 0) // If they can't take tox damage, make them take burn damage
+ update_flags |= M.adjustFireLoss(1.5 * REAGENTS_EFFECT_MULTIPLIER, robotic = TRUE)
+ else
+ update_flags |= M.adjustToxLoss(1.5 * REAGENTS_EFFECT_MULTIPLIER)
return ..() | update_flags
/datum/reagent/jestosterone/on_mob_delete(mob/living/M)
@@ -510,8 +514,8 @@
if(M.mind?.assigned_role != "Clown")
REMOVE_TRAIT(M, TRAIT_COMIC_SANS, id)
M.RemoveElement(/datum/element/waddling)
- qdel(M.GetComponent(/datum/component/squeak))
+ M.DeleteComponent(/datum/component/squeak)
/datum/reagent/royal_bee_jelly
name = "Royal bee jelly"
@@ -727,3 +731,56 @@
if(H.dna.species.bodyflags & HAS_SKIN_COLOR) //take current alien color and darken it slightly
H.change_skin_color("#9B7653")
+
+/datum/reagent/admin_cleaner
+ name = "WD-2381"
+ color = "#da9eda"
+ description = "Extra-bubbly cleaner designed to clear all objects. Or, well. Anything that isn't bolted down. Or is, for that matter. In other words: if you're seeing this, how'd you get your hands on it?"
+
+/datum/reagent/admin_cleaner/organic
+ name = "WD-2381-MOB"
+ id = "admincleaner_mob"
+ description = "A bottle of strange nanites that instantly devour bodies, both living and dead, as well as organs."
+
+/datum/reagent/admin_cleaner/organic/reaction_mob(mob/living/M, method, volume, show_message)
+ . = ..()
+ if(method == REAGENT_TOUCH)
+ M.dust()
+
+/datum/reagent/admin_cleaner/organic/reaction_obj(obj/O, volume)
+ if(is_organ(O))
+ qdel(O)
+ if(istype(O, /obj/effect/decal/cleanable/blood) || istype(O, /obj/effect/decal/cleanable/vomit))
+ qdel(O)
+ if(istype(O, /obj/item/mmi))
+ qdel(O)
+
+/datum/reagent/admin_cleaner/item
+ name = "WD-2381-ITM"
+ id = "admincleaner_item"
+ description = "A bottle of strange nanites that instantly devour items, while curiously leaving everything else untouched."
+
+/datum/reagent/admin_cleaner/item/reaction_obj(obj/O, volume)
+ if(isitem(O) && !istype(O, /obj/item/grenade/clusterbuster/segment))
+ qdel(O)
+
+/datum/reagent/admin_cleaner/all
+ name = "WD-2381-ALL"
+ id = "admincleaner_all"
+ description = "An incredibly dangerous set of nanites engineered by Syndicate Janitors which devour everything they touch."
+
+/datum/reagent/admin_cleaner/all/reaction_obj(obj/O, volume)
+ if(istype(O, /obj/item/grenade/clusterbuster/segment))
+ // don't clear clusterbang segments
+ // I'm allowed to make this hack because this is admin only anyway
+ return
+ if(!iseffect(O))
+ qdel(O)
+
+/datum/reagent/admin_cleaner/all/reaction_mob(mob/living/M, method, volume, show_message)
+ . = ..()
+ if(method == REAGENT_TOUCH)
+ M.dust()
+
+
+
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index 4ea9e6c141e6..7dd272207e8b 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -924,14 +924,11 @@
/datum/reagent/lipolicide/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(!M.nutrition)
- switch(rand(1,3))
- if(1)
- to_chat(M, "You feel hungry...")
- if(2)
- update_flags |= M.adjustToxLoss(1, FALSE)
- to_chat(M, "Your stomach grumbles painfully!")
- else
- pass()
+ if(prob(66.66))
+ to_chat(M, "You feel hungry...")
+ else if(prob(50))
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ to_chat(M, "Your stomach grumbles painfully!")
else
if(prob(60))
var/fat_to_burn = max(round(M.nutrition / 100, 1), 5)
diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index 9c5388ac9299..83956eb56c9d 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -61,9 +61,7 @@
if(iseffect(O))
var/obj/effect/E = O
if(E.is_cleanable())
- var/obj/effect/decal/cleanable/blood/B = E
- if(!(istype(B) && B.off_floor))
- qdel(E)
+ qdel(E)
else
if(O.simulated)
O.color = initial(O.color)
diff --git a/code/modules/reagents/chemistry/recipes/food_reactions.dm b/code/modules/reagents/chemistry/recipes/food_reactions.dm
index 4a0ab9df0074..583f354d3338 100644
--- a/code/modules/reagents/chemistry/recipes/food_reactions.dm
+++ b/code/modules/reagents/chemistry/recipes/food_reactions.dm
@@ -77,6 +77,26 @@
for(var/i = 1, i <= created_volume, i++)
new /obj/item/food/sliceable/cheesewheel(location)
+/datum/chemical_reaction/cheese_curds
+ name = "Cheese Curds"
+ id = "cheese_curds"
+ result = null
+ required_reagents = list("milk" = 15, "vinegar" = 5, "cream" = 5)
+ result_amount = 1
+ min_temp = T0C + 80
+
+/datum/chemical_reaction/cheese_curds/on_reaction(datum/reagents/holder, created_volume)
+ var/location = get_turf(holder.my_atom)
+ for(var/i = 1, i <= created_volume, i++)
+ new /obj/item/food/cheese_curds(location)
+
+/datum/chemical_reaction/yogurt
+ name = "Yogurt"
+ id = "yogurt"
+ result = "yogurt"
+ required_reagents = list("milk" = 10, "virusfood" = 2)
+ result_amount = 10
+
/datum/chemical_reaction/syntiflesh
name = "Syntiflesh"
id = "syntiflesh"
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 5e1c90749583..ad7350420cda 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -463,7 +463,7 @@
if(slime.docile) //Undoes docility, but doesn't make rabid.
slime.visible_message("[slime] forgets its training, becoming wild once again!")
slime.docile = FALSE
- slime.update_name()
+ slime.update_appearance(UPDATE_NAME)
continue
slime.rabid = TRUE
slime.visible_message("[slime] is driven into a frenzy!")
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index ff2a5af0b700..73b400127950 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -185,7 +185,7 @@
if(!istype(H) || !H.reagents || HAS_TRAIT(H, TRAIT_PIERCEIMMUNE) || ismachineperson(H))
return
- if(H.floating || H.flying || H.buckled)
+ if(H.floating || HAS_TRAIT(H, TRAIT_FLYING) || H.buckled)
return
if(!IS_HORIZONTAL(H) && (H.shoes || (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET))))
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 1448089796be..52ec63933a7c 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -1611,7 +1611,7 @@
/obj/effect/decal/cleanable/blood/gibs/pipe_eject(direction)
var/list/dirs
if(direction)
- dirs = list( direction, turn(direction, -45), turn(direction, 45))
+ dirs = list(direction, turn(direction, -45), turn(direction, 45))
else
dirs = GLOB.alldirs.Copy()
@@ -1620,7 +1620,7 @@
/obj/effect/decal/cleanable/blood/gibs/robot/gib/pipe_eject(direction)
var/list/dirs
if(direction)
- dirs = list( direction, turn(direction, -45), turn(direction, 45))
+ dirs = list(direction, turn(direction, -45), turn(direction, 45))
else
dirs = GLOB.alldirs.Copy()
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 9351978962e9..c7a23b33c67e 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -450,7 +450,7 @@
to_chat(user, "You seal [src], preparing it for delivery.")
icon_state = "shippack_sealed"
sealed = 1
- update_desc()
+ update_appearance(UPDATE_DESC)
else
if(tgui_alert(user, "Do you want to tear up the package?", "Shipping", list("Yes", "No")) == "Yes")
to_chat(user, "You shred [src].")
diff --git a/code/modules/research/designs/mecha_designs.dm b/code/modules/research/designs/mecha_designs.dm
index 837f80365c04..3a5f5c10390b 100644
--- a/code/modules/research/designs/mecha_designs.dm
+++ b/code/modules/research/designs/mecha_designs.dm
@@ -27,7 +27,7 @@
name = "Exosuit Board (\"Odysseus\" Central Control module)"
desc = "Allows for the construction of a \"Odysseus\" Central Control module."
id = "odysseus_main"
- req_tech = list("programming" = 3,"biotech" = 3, "engineering" = 3)
+ req_tech = list("programming" = 3, "biotech" = 3, "engineering" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/mecha/odysseus/main
@@ -37,12 +37,33 @@
name = "Exosuit Board (\"Odysseus\" Peripherals Control module)"
desc = "Allows for the construction of a \"Odysseus\" Peripheral Control module."
id = "odysseus_peri"
- req_tech = list("programming" = 3,"biotech" = 3, "engineering" = 3)
+ req_tech = list("programming" = 3, "biotech" = 3, "engineering" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/mecha/odysseus/peripherals
category = list("Exosuit Modules")
+// Nkarrdem
+/datum/design/nkarrdem_main
+ name = "Exosuit Board (\"Nkarrdem\" Central Control module)"
+ desc = "Allows for the construction of a \"Nkarrdem\" Central Control module."
+ id = "nkarrdem_main"
+ req_tech = list("programming" = 3, "biotech" = 3, "engineering" = 3)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000)
+ build_path = /obj/item/circuitboard/mecha/nkarrdem/main
+ category = list("Exosuit Modules")
+
+/datum/design/nkarrdem_peri
+ name = "Exosuit Board (\"Nkarrdem\" Peripherals Control module)"
+ desc = "Allows for the construction of a \"Nkarrdem\" Peripheral Control module."
+ id = "nkarrdem_peri"
+ req_tech = list("programming" = 3, "biotech" = 3, "engineering" = 3)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000)
+ build_path = /obj/item/circuitboard/mecha/nkarrdem/peripherals
+ category = list("Exosuit Modules")
+
// Gygax
/datum/design/gygax_main
name = "Exosuit Board (\"Gygax\" Central Control module)"
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 92b1f19de11c..39448394c68f 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -249,6 +249,70 @@
construction_time = 13 SECONDS
category = list("Odysseus")
+//Nkarrdem
+/datum/design/nkarrdem_chassis
+ name = "Exosuit Chassis (\"Nkarrdem\")"
+ id = "nkarrdem_chassis"
+ build_type = MECHFAB
+ build_path = /obj/item/mecha_parts/chassis/nkarrdem
+ materials = list(MAT_METAL=20000)
+ construction_time = 10 SECONDS
+ category = list("Nkarrdem")
+
+/datum/design/nkarrdem_torso
+ name = "Exosuit Torso (\"Nkarrdem\")"
+ id = "nkarrdem_torso"
+ build_type = MECHFAB
+ build_path = /obj/item/mecha_parts/part/nkarrdem_torso
+ materials = list(MAT_METAL=12000)
+ construction_time = 18 SECONDS
+ category = list("Nkarrdem")
+
+/datum/design/nkarrdem_head
+ name = "Exosuit Head (\"Nkarrdem\")"
+ id = "nkarrdem_head"
+ build_type = MECHFAB
+ build_path = /obj/item/mecha_parts/part/nkarrdem_head
+ materials = list(MAT_METAL=6000,MAT_GLASS=10000)
+ construction_time = 10 SECONDS
+ category = list("Nkarrdem")
+
+/datum/design/nkarrdem_left_arm
+ name = "Exosuit Left Arm (\"Nkarrdem\")"
+ id = "nkarrdem_left_arm"
+ build_type = MECHFAB
+ build_path = /obj/item/mecha_parts/part/nkarrdem_left_arm
+ materials = list(MAT_METAL=6000)
+ construction_time = 12 SECONDS
+ category = list("Nkarrdem")
+
+/datum/design/nkarrdem_right_arm
+ name = "Exosuit Right Arm (\"Nkarrdem\")"
+ id = "nkarrdem_right_arm"
+ build_type = MECHFAB
+ build_path = /obj/item/mecha_parts/part/nkarrdem_right_arm
+ materials = list(MAT_METAL=6000)
+ construction_time = 12 SECONDS
+ category = list("Nkarrdem")
+
+/datum/design/nkarrdem_left_leg
+ name = "Exosuit Left Leg (\"Nkarrdem\")"
+ id = "nkarrdem_left_leg"
+ build_type = MECHFAB
+ build_path = /obj/item/mecha_parts/part/nkarrdem_left_leg
+ materials = list(MAT_METAL=12000)
+ construction_time = 13 SECONDS
+ category = list("Nkarrdem")
+
+/datum/design/nkarrdem_right_leg
+ name = "Exosuit Right Leg (\"Nkarrdem\")"
+ id = "nkarrdem_right_leg"
+ build_type = MECHFAB
+ build_path = /obj/item/mecha_parts/part/nkarrdem_right_leg
+ materials = list(MAT_METAL=12000)
+ construction_time = 13 SECONDS
+ category = list("Nkarrdem")
+
//Gygax
/datum/design/gygax_chassis
name = "Exosuit Chassis (\"Gygax\")"
@@ -672,6 +736,56 @@
construction_time = 20 SECONDS
category = list("Exosuit Equipment")
+/datum/design/mech_mop
+ name = "Exosuit Janitorial Equipment (Mega Mop)"
+ id = "mech_mop"
+ build_type = MECHFAB
+ req_tech = list("materials" = 4, "engineering" = 3)
+ build_path = /obj/item/mecha_parts/mecha_equipment/janitor/mega_mop
+ materials = list(MAT_METAL=5000,MAT_GLASS=3000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Equipment")
+
+/datum/design/mech_garbage_bag
+ name = "Exosuit Janitorial Equipment (Garbage Magnet)"
+ id = "mech_garbage_bag"
+ build_type = MECHFAB
+ req_tech = list("materials" = 5, "bluespace" = 4, "engineering" = 4, "plasmatech" = 3)
+ build_path = /obj/item/mecha_parts/mecha_equipment/janitor/garbage_magnet
+ materials = list(MAT_METAL=1500,MAT_GOLD=1500,MAT_URANIUM=700,MAT_PLASMA=2000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Equipment")
+
+/datum/design/mech_mega_spray
+ name = "Exosuit Janitorial Equipment (Mega Spray)"
+ id = "mech_mega_spray"
+ build_type = MECHFAB
+ req_tech = list("biotech" = 5, "engineering" = 6, "plasmatech" = 6)
+ build_path = /obj/item/mecha_parts/mecha_equipment/janitor/mega_spray
+ materials = list(MAT_METAL=1000,MAT_GLASS=4000,MAT_GOLD=1000,MAT_PLASMA=3000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Equipment")
+
+/datum/design/mech_light_replacer
+ name = "Exosuit Janitorial Equipment (Light Replacer)"
+ id = "mech_light_replacer"
+ build_type = MECHFAB
+ req_tech = list("bluespace" = 7, "materials" = 5, "engineering" = 6, "plasmatech" = 6)
+ build_path = /obj/item/mecha_parts/mecha_equipment/janitor/light_replacer
+ materials = list(MAT_METAL=1500,MAT_SILVER=150,MAT_GLASS=6000,MAT_BLUESPACE=300)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Equipment")
+
+/datum/design/mech_cleaning_grenade_launcher
+ name = "Exosuit Janitorial Equipment (Cleaning Grenade Launcher)"
+ id = "mech_cleaning_grenade_launcher"
+ build_type = MECHFAB
+ req_tech = list("toxins" = 7, "engineering" = 7, "plasmatech" = 6, "combat" = 6)
+ build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/cleaner
+ materials = list(MAT_METAL=5000,MAT_GLASS=3000,MAT_SILVER=4000,MAT_GOLD=6000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Equipment")
+
/datum/design/mech_generator
name = "Exosuit Equipment (Plasma Generator)"
id = "mech_generator"
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 8f9247bd5d54..da2d8dd774d9 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -350,10 +350,11 @@
desc = "An implant that enhances your muscles to punch harder and throw people back."
id = "muscle_implant"
req_tech = list("combat" = 7, "syndicate" = 4, "biotech" = 7)
- build_type = PROTOLATHE
+ build_type = PROTOLATHE | MECHFAB
materials = list(MAT_GOLD = 5000, MAT_METAL = 10000, MAT_TITANIUM = 3000, MAT_BLUESPACE = 2000)
+ construction_time = 200
build_path = /obj/item/organ/internal/cyberimp/arm/muscle
- category = list("Weapons")
+ category = list("Medical", "Weapons")
/datum/design/upgraded_chemical_flamethrower
name = "Extended Capacity Chemical Flamethrower Parts"
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 2a0827d75a1f..3ed8d1d32dc7 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -482,12 +482,12 @@
if(globalMalf > 16 && globalMalf < 35)
visible_message("[src] melts [exp_on], ian-izing the air around it!")
throwSmoke(loc)
- var/mob/tracked_ian = locate(/mob/living/simple_animal/pet/dog/corgi/Ian) in GLOB.mob_living_list
+ var/mob/living/tracked_ian = locate(/mob/living/simple_animal/pet/dog/corgi/Ian) in GLOB.mob_living_list
if(tracked_ian)
throwSmoke(tracked_ian.loc)
tracked_ian.loc = loc
if(tracked_ian.buckled)
- tracked_ian.buckled.unbuckle_mob(tracked_ian, TRUE)
+ tracked_ian.unbuckle(force = TRUE)
investigate_log("Experimentor has stolen Ian!", "experimentor") //...if anyone ever fixes it...
else
new /mob/living/simple_animal/pet/dog/corgi(loc)
@@ -496,12 +496,12 @@
if(globalMalf > 36 && globalMalf < 59)
visible_message("[src] encounters a run-time error!")
throwSmoke(loc)
- var/mob/tracked_runtime = locate(/mob/living/simple_animal/pet/cat/Runtime) in GLOB.mob_living_list
+ var/mob/living/tracked_runtime = locate(/mob/living/simple_animal/pet/cat/Runtime) in GLOB.mob_living_list
if(tracked_runtime)
throwSmoke(tracked_runtime.loc)
tracked_runtime.loc = loc
if(tracked_runtime.buckled)
- tracked_runtime.buckled.unbuckle_mob(tracked_runtime, TRUE)
+ tracked_runtime.unbuckle(force = TRUE)
investigate_log("Experimentor has stolen Runtime!", "experimentor")
else
new /mob/living/simple_animal/pet/cat(loc)
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 216f680e8556..28b410b9d373 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -419,7 +419,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole/proc/finish_machine(key, amount, enough_materials, obj/machinery/r_n_d/machine, datum/design/being_built, list/efficient_mats)
if(machine)
if(enough_materials && being_built)
- SSblackbox.record_feedback("nested tally", "RND Production List", amount, list("[being_built.category]", "[being_built.name]"))
+ if(is_station_level(z))
+ SSblackbox.record_feedback("tally", "station_protolathe_production", amount, "[being_built.type]")
for(var/i in 1 to amount)
var/obj/item/new_item = new being_built.build_path(src)
if(istype(new_item)) // Only want a random pixel offset if it IS actually an item, and not a structure like a bluespace closet
diff --git a/code/modules/ruins/lavalandruin_code/hermit.dm b/code/modules/ruins/lavalandruin_code/hermit.dm
index 855a545b3fcc..021fb4290ea7 100644
--- a/code/modules/ruins/lavalandruin_code/hermit.dm
+++ b/code/modules/ruins/lavalandruin_code/hermit.dm
@@ -19,35 +19,32 @@
/obj/effect/mob_spawn/human/alive/hermit/Initialize(mapload)
. = ..()
var/arrpee = rand(1,4)
+ outfit.suit = /obj/item/clothing/suit/space/syndicate/orange
+ outfit.head = /obj/item/clothing/head/helmet/space/syndicate/orange
+ outfit.shoes = /obj/item/clothing/shoes/black
+ outfit.back = /obj/item/storage/backpack
switch(arrpee)
if(1)
flavour_text += "you were a [pick("arms dealer", "shipwright", "docking manager")]'s assistant on a small trading station several sectors from here. Raiders attacked, and there was \
only one pod left when you got to the escape bay. You took it and launched it alone, and the crowd of terrified faces crowding at the airlock door as your pod's engines burst to \
life and sent you to this hell are forever branded into your memory."
outfit.uniform = /obj/item/clothing/under/misc/assistantformal
- outfit.shoes = /obj/item/clothing/shoes/black
- outfit.back = /obj/item/storage/backpack
if(2)
flavour_text += "you're an exile from the Tiger Cooperative. Their technological fanaticism drove you to question the power and beliefs of the Exolitics, and they saw you as a \
heretic and subjected you to hours of horrible torture. You were hours away from execution when a high-ranking friend of yours in the Cooperative managed to secure you a pod, \
scrambled its destination's coordinates, and launched it. You awoke from stasis when you landed and have been surviving - barely - ever since."
outfit.uniform = /obj/item/clothing/under/color/orange
outfit.shoes = /obj/item/clothing/shoes/orange
- outfit.back = /obj/item/storage/backpack
if(3)
flavour_text += "you were a doctor on one of Nanotrasen's space stations, but you left behind that damn corporation's tyranny and everything it stood for. From a metaphorical hell \
to a literal one, you find yourself nonetheless missing the recycled air and warm floors of what you left behind... but you'd still rather be here than there."
outfit.uniform = /obj/item/clothing/under/rank/medical/doctor
- outfit.suit = /obj/item/clothing/suit/storage/labcoat
outfit.back = /obj/item/storage/backpack/medic
- outfit.shoes = /obj/item/clothing/shoes/black
if(4)
flavour_text += "you were always joked about by your friends for \"not playing with a full deck\", as they so kindly put it. It seems that they were right when you, on a tour \
at one of Nanotrasen's state-of-the-art research facilities, were in one of the escape pods alone and saw the red button. It was big and shiny, and it caught your eye. You pressed \
it, and after a terrifying and fast ride for days, you landed here. You've had time to wisen up since then, and you think that your old friends wouldn't be laughing now."
outfit.uniform = /obj/item/clothing/under/color/grey/glorf
- outfit.shoes = /obj/item/clothing/shoes/black
- outfit.back = /obj/item/storage/backpack
/obj/effect/mob_spawn/human/alive/hermit/Destroy()
new/obj/structure/fluff/empty_cryostasis_sleeper(get_turf(src))
diff --git a/code/modules/ruins/lavalandruin_code/seed_vault.dm b/code/modules/ruins/lavalandruin_code/seed_vault.dm
index 261c22ef4882..bbedf9201628 100644
--- a/code/modules/ruins/lavalandruin_code/seed_vault.dm
+++ b/code/modules/ruins/lavalandruin_code/seed_vault.dm
@@ -22,7 +22,7 @@
flavour_text = "You are a sentient ecosystem, an example of the mastery over life that your creators possessed. Your masters, benevolent as they were, created uncounted \
seed vaults and spread them across the universe to every planet they could chart. You are in one such seed vault. Your goal is to cultivate and spread life wherever it will go while waiting \
for contact from your creators. Estimated time of last contact: Deployment, 5x10^3 millennia ago."
- assignedrole = "Lifebringer"
+ assignedrole = "Seed Vault Diona"
/obj/effect/mob_spawn/human/alive/seed_vault/special(mob/living/new_spawn)
var/plant_name = pick("Tomato", "Potato", "Broccoli", "Carrot", "Ambrosia", "Pumpkin", "Ivy", "Kudzu", "Banana", "Moss", "Flower", "Bloom", "Root", "Bark", "Glowshroom", "Petal", "Leaf", \
diff --git a/code/modules/ruins/ruin_areas.dm b/code/modules/ruins/ruin_areas.dm
index 02cc3722e893..d1cc859aaa21 100644
--- a/code/modules/ruins/ruin_areas.dm
+++ b/code/modules/ruins/ruin_areas.dm
@@ -1,3 +1,11 @@
+GLOBAL_LIST_INIT(ruin_prototypes, list(/area/ruin,
+ /area/ruin/unpowered,
+ /area/ruin/powered,
+ /area/ruin/space,
+ /area/ruin/space/powered,
+ /area/ruin/space/unpowered,
+ /area/ruin/space/unpowered/no_grav))
+
//Parent types
/area/ruin
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 970372602636..b816473851f7 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -516,17 +516,6 @@
mode = SHUTTLE_ENDGAME
timer = 0
- open_dock()
-
-/obj/docking_port/mobile/emergency/proc/open_dock()
- pass()
-/*
- for(var/obj/machinery/door/poddoor/shuttledock/D in airlocks)
- var/turf/T = get_step(D, D.checkdir)
- if(!istype(T,/turf/space))
- spawn(0)
- D.open()
-*/ //Leaving this here incase someone decides to port -tg-'s escape shuttle stuff:
/obj/docking_port/mobile/emergency/proc/random_docking_go()
var/cycles = 1000
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index a18849260505..35ae17be544a 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -645,20 +645,18 @@
var/obj/mecha/mech = AM
if(mech.occupant)
INVOKE_ASYNC(mech, TYPE_PROC_REF(/obj/mecha, get_out_and_die))
- if(ismob(AM))
- var/mob/M = AM
- if(M.buckled)
- M.buckled.unbuckle_mob(M, force = TRUE)
- if(isliving(AM))
- var/mob/living/L = AM
- if(L.incorporeal_move || L.status_flags & GODMODE)
- continue
- L.stop_pulling()
- L.visible_message("[L] is hit by \
- a hyperspace ripple!",
- "You feel an immense \
- crushing pressure as the space around you ripples.")
- L.gib()
+ if(isliving(AM))
+ var/mob/living/L = AM
+ if(L.buckled)
+ L.unbuckle(force = TRUE)
+ if(L.incorporeal_move || L.status_flags & GODMODE)
+ continue
+ L.stop_pulling()
+ L.visible_message("[L] is hit by \
+ a hyperspace ripple!",
+ "You feel an immense \
+ crushing pressure as the space around you ripples.")
+ L.gib()
else if(lance_docking) //corrupt the child, destroy them all
if(!AM.simulated)
continue
diff --git a/code/modules/station_goals/bluespace_tap.dm b/code/modules/station_goals/bluespace_tap.dm
index d4c3a9509013..60a37770ef55 100644
--- a/code/modules/station_goals/bluespace_tap.dm
+++ b/code/modules/station_goals/bluespace_tap.dm
@@ -174,7 +174,9 @@
/obj/item/food/sliceable/xenomeatbread //maybe add some dangerous/special food here, ie robobuger?
)
-#define BASE_ENERGY_CONVERSION 4e-6
+/// Points generated per cycle for each Watt of power consumption
+#define POINTS_PER_W 4e-6
+/// Amount of points generated per cycle per 50KW for the first 500KW
#define BASE_POINTS 2
/**
@@ -199,13 +201,6 @@
interact_offline = TRUE
luminosity = 1
- /// Correspond to power required for a mining level, first entry for level 1, etc.
- var/list/power_needs = list(1 KW, 2 KW, 5 KW, 10 KW, 15 KW,
- 25 KW, 50 KW, 100 KW, 250 KW, 500 KW,
- 1 MW, 2 MW, 5 MW, 10 MW, 15 MW,
- 20 MW, 25 MW, 30 MW, 40 MW, 50 MW,
- 60 MW, 70 MW, 80 MW, 90 MW, 100 MW)
-
/// list of possible products
var/static/product_list = list(
new /datum/data/bluespace_tap_product("Unknown Exotic Hat", /obj/effect/spawner/lootdrop/bluespace_tap/hat, 5000),
@@ -214,37 +209,31 @@
new /datum/data/bluespace_tap_product("Unknown Biological Artifact", /obj/effect/spawner/lootdrop/bluespace_tap/organic, 20000)
)
- /// The level the machine is currently mining at. 0 means off
- var/input_level = 0
- /// The machine you WANT the machine to mine at. It will try to match this.
- var/desired_level = 0
+ /// The amount of power being used for mining at the moment (Watts)
+ var/mining_power = 0
+ /// The power you WANT the machine to use for mining. It will try to match this. (Watts)
+ var/desired_mining_power = 0
+ /// Points mined this cycle
+ var/mined_points = 0
/// Available mining points
var/points = 0
/// The total points earned by this machine so far, for tracking station goal and highscore
var/total_points = 0
- /// How much power the machine needs per processing tick at the current level.
- var/actual_power_usage = 0
// Tweak these and active_power_consumption to balance power generation
- /// Max power input level, I don't expect this to be ever reached. It has been reached.
- var/max_level = 25
- /// amount of points generated per level for the first 10 levels
- var/base_points = BASE_POINTS
- /// amount of points generated per process cycle per unit of energy consumed
- var/conversion_ratio = BASE_ENERGY_CONVERSION
- /// How high the machine can be run before it starts having a chance for dimension breaches.
- var/safe_levels = 15
/// Whether or not auto shutdown will engage when portals open
var/auto_shutdown = TRUE
/// Whether or not stabilizers will engage to prevent or reduce the chance of portals opening
var/stabilizers = TRUE
- /// Amount of power the stabilizers consume
+ /// Amount of power the stabilizers consume (Watts)
var/stabilizer_power = 0
- /// Amount of overhead in levels. Each level of overhead allows stabilizing 15+overhead.
- var/overhead = 0
+ /// Whether or not mining power will be prevented from exceedingn stabilizer power
+ var/stabilizer_priority = TRUE
/// When event triggers this will hold references to all portals so we can fix the sprite after they're broken
var/list/active_nether_portals = list()
+ /// The amount of portals waiting to be spawned. Used mostly for UI and icon stuff.
+ var/spawning = 0
/obj/machinery/power/bluespace_tap/Initialize(mapload)
. = ..()
@@ -256,7 +245,7 @@
if(!powernet)
connect_to_network()
- AddComponent(/datum/component/multitile, 1, list(
+ AddComponent(/datum/component/multitile, list(
list(1, 1, 1),
list(1, MACH_CENTER, 1),
list(1, 0, 1),
@@ -280,7 +269,7 @@
underlays.Cut()
- if(length(active_nether_portals))
+ if(length(active_nether_portals) || spawning)
. += "cascade"
set_light(15, 5, "#ff0000")
return
@@ -296,19 +285,19 @@
underlays += emissive_appearance(icon, "light_mask")
/obj/machinery/power/bluespace_tap/proc/get_icon_state_number()
- switch(input_level)
- if(0)
- return 0
- if(1 to 3)
+ switch(mining_power)
+ if(50 KW to 3 MW)
return 1
- if(4 to 8)
+ if(3 MW to 8 MW)
return 2
- if(9 to 11)
+ if(8 MW to 11 MW)
return 3
- if(12 to 15)
+ if(11 MW to 15 MW)
return 4
- if(16 to INFINITY)
+ if(15 MW to INFINITY)
return 5
+ else
+ return 0
/obj/machinery/power/bluespace_tap/power_change()
. = ..()
@@ -331,99 +320,96 @@
update_icon()
/**
- * Increases the desired mining level
- *
- * Increases the desired mining level, that
- * the machine tries to reach if there
- * is enough power for it. Note that it does
- * NOT increase the actual mining level directly.
- */
-/obj/machinery/power/bluespace_tap/proc/increase_level()
- if(desired_level < max_level)
- desired_level++
-/**
- * Decreases the desired mining level
- *
- * Decreases the desired mining level, that
- * the machine tries to reach if there
- * is enough power for it. Note that it does
- * NOT decrease the actual mining level directly.
- */
-/obj/machinery/power/bluespace_tap/proc/decrease_level()
- if(desired_level > 0)
- desired_level--
-
-/**
- * Sets the desired mining level
+ * Sets the desired mining power (Watts)
*
- * Sets the desired mining level, that
+ * Sets the desired mining power, that
* the machine tries to reach if there
* is enough power for it. Note that it does
- * NOT change the actual mining level directly.
+ * NOT change the actual mining power directly.
* Arguments:
- * * t_level - The level we try to set it at, between 0 and max_level
+ * * t_power - The power we try to set it at, between 0 and max_level
*/
-/obj/machinery/power/bluespace_tap/proc/set_level(t_level)
- if(t_level < 0)
- return
- if(t_level > max_level)
- return
- desired_level = t_level
-/**
- * Gets the amount of power at a set input level
- *
- * Gets the amount of power (in W) a set input level needs.
- * Note that this is not necessarily the current power use.
- * * i_level - The hypothetical input level for which we want to know the power use.
- */
-/obj/machinery/power/bluespace_tap/proc/get_power_use(i_level)
- if(!i_level)
- return 0
- return power_needs[i_level]
+/obj/machinery/power/bluespace_tap/proc/set_power(t_power)
+ desired_mining_power = max(t_power, 0)
+ // Round down to nearest MW if above 1 MW
+ if(desired_mining_power > 1 MW)
+ desired_mining_power = desired_mining_power - (desired_mining_power % (1 MW))
/obj/machinery/power/bluespace_tap/process()
- actual_power_usage = get_power_use(input_level)
- if(get_surplus() < actual_power_usage) //not enough power, so turn down a level
- input_level--
- update_icon()
- return // and no mining gets done
- if(actual_power_usage)
- consume_direct_power(actual_power_usage)
- //2 points per level up to level 10 and 4 points per MW (or 5 when emmaged).
- var/points_to_add = min(base_points * 10, base_points * input_level) + actual_power_usage * (conversion_ratio + emagged * 1e-6)
- points += points_to_add // point generation, emagging gets you 'free' points at the cost of higher anomaly chance
- total_points += points_to_add
- // Between levels 15 and 18 get one level of overhead per 5MW of surplus power. Above level 18 get 1 level per 10MW of surplus power.
- overhead = input_level >= 18 ? get_surplus() * 1e-7 : get_surplus() * 2e-7
- stabilizer_power = stabilizers && input_level > 15 ? input_level >= 18 ? min(get_surplus() , (input_level - 15) * 1e7) : min(get_surplus() , (input_level - 15) * 0.5e7) : 0
- consume_direct_power(stabilizer_power)
- // actual input level changes slowly
- // holy shit every proccess this
- if(input_level < desired_level && (get_surplus() + get_power_use(input_level) + stabilizer_power >= get_power_use(input_level + 1)))
- input_level++
- update_icon()
- else if(input_level > desired_level)
- input_level--
- update_icon()
- // Stabilizers reduce the chance of portals. prob with values less than 0 treat it as 0.
- if(prob(input_level - (safe_levels + stabilizers * overhead) + (emagged * 5)))
+ // Power we could mine with (Watts)
+ mining_power = get_surplus()
+
+ // Round down to the nearest MW if above a MW
+ if(mining_power > 1 MW)
+ mining_power = mining_power - mining_power % (1 MW)
+
+ // Always try to use all available power for mining if emagged
+ if(emagged)
+ desired_mining_power = mining_power
+
+ /*
+ * Stabilizers activate above 15MW of mining power
+ * Stabilizers consume up to 1MW for each 1MW of mining power, consuming less between 15 and 30MW of mining power
+ * If stabilizers have priority they will always consume enough power to stabilize the BSH, limiting mining
+ * Emagging disables stabilizers
+ */
+ if(stabilizer_priority)
+ // stabilizer power is what we need to stabilize the current mining level, but no more than half the available power.
+ stabilizer_power = \
+ clamp(\
+ desired_mining_power - clamp(30 MW - desired_mining_power, 0, 15 MW), \
+ 0, \
+ mining_power / 2) \
+ * (stabilizers && !emagged)
+ else
+ // stabilizer power is however much power we have left, but no more than we need to stabilize our desired mining power.
+ stabilizer_power = \
+ clamp(mining_power - desired_mining_power, \
+ 0, \
+ desired_mining_power - clamp(30 MW - desired_mining_power, 0, 15 MW)) \
+ * (stabilizers && !emagged)
+
+ // Actual mining power is what the desired mining power we set, unless we don't have enough power to satisfty that.
+ mining_power = min(desired_mining_power, mining_power - stabilizer_power)
+
+ consume_direct_power(mining_power + stabilizer_power)
+
+ // 2 points per 50 KW up to 20 and 4 points per MW (or 5 when emmaged).
+ mined_points = min(BASE_POINTS * (mining_power / (50 KW)) , 20) + mining_power * (POINTS_PER_W + emagged / (1 MW))
+ points += mined_points
+ total_points += mined_points
+ update_icon()
+ /*
+ * Portal chance is 0.1% per cycle per difference of 1MW between the stabilizer and mining power
+ * This should translate to portals spawning every 33:20 minutes for 1 difference of 1MW
+ * And about every 3:20 minutes for a 10MW difference
+ * Emagging guarantees a chance of at least 5%
+ * Prob treats values less than 0 as 0.
+ * Emagging garuantees a chance of at least 5%.
+ * Prob treats values less than 0 as 0.
+ */
+
+ if(prob((mining_power - clamp(30 MW - mining_power, 0, 15 MW) - stabilizer_power) / (10 MW)) + (emagged * 5))
var/area/our_area = get_area(src)
- if(!length(active_nether_portals))
+ if((!spawning || !length(active_nether_portals)))
GLOB.major_announcement.Announce("Unexpected power spike during Bluespace Harvester Operation. Extra-dimensional intruder alert. Expected location: [our_area.name]. [emagged ? "DANGER: Emergency shutdown failed! Please proceed with manual shutdown." : auto_shutdown ? "Emergency shutdown initiated." : "Automatic shutdown disabled."]", "Bluespace Harvester Malfunction", 'sound/AI/harvester.ogg')
if(!emagged && auto_shutdown)
- input_level = 0 //emergency shutdown unless it is disabled
- desired_level = 0
- start_nether_portaling(rand(1 , 3) + max((level - 15 - overhead) / 3 , 0))
+ desired_mining_power = 0 //emergency shutdown unless it is disabled
+ // An extra portal for each 30MW above 15
+ start_nether_portaling(rand(1 , 3) + round(max((mining_power - 15 MW) / (30 MW) , 0)), TRUE)
-/obj/machinery/power/bluespace_tap/proc/start_nether_portaling(amount)
+/obj/machinery/power/bluespace_tap/proc/start_nether_portaling(amount, new_incursion = FALSE)
+ if(new_incursion)
+ spawning += amount
var/turf/location = locate(x + rand(-5, 5), y + rand(-5, 5), z)
var/obj/structure/spawner/nether/bluespace_tap/P = new /obj/structure/spawner/nether/bluespace_tap(location)
amount--
+ spawning--
active_nether_portals += P
P.linked_source_object = src
- // 1 Extra mob for each 2 levels above 15.
- P.max_mobs = 5 + max((input_level - 15) / 2, 0)
+ // 1 Extra mob for each 20 MW of mining power above 15MW.
+ P.max_mobs = 5 + max((mining_power - 15 MW) / (20 MW), 0)
update_icon()
if(amount)
addtimer(CALLBACK(src, PROC_REF(start_nether_portaling), amount), rand(3, 5) SECONDS)
@@ -431,20 +417,18 @@
/obj/machinery/power/bluespace_tap/ui_data(mob/user)
var/list/data = list()
- data["desiredLevel"] = desired_level
- data["inputLevel"] = input_level
+ data["desiredMiningPower"] = desired_mining_power
+ data["miningPower"] = mining_power
data["points"] = points
data["totalPoints"] = total_points
- data["powerUse"] = actual_power_usage + stabilizer_power
+ data["powerUse"] = mining_power + stabilizer_power
data["availablePower"] = get_surplus()
- data["maxLevel"] = max_level
data["emagged"] = emagged
- data["safeLevels"] = safe_levels
- data["nextLevelPower"] = get_power_use(input_level + 1)
data["autoShutown"] = auto_shutdown
- data["overhead"] = overhead
data["stabilizers"] = stabilizers
data["stabilizerPower"] = stabilizer_power
+ data["stabilizerPriority"] = stabilizer_priority
+ data["portaling"] = (length(active_nether_portals) || spawning)
/// A list of lists, each inner list equals a datum
var/list/listed_items = list()
@@ -460,18 +444,12 @@
/obj/machinery/power/bluespace_tap/attack_hand(mob/user)
add_fingerprint(user)
- if(length(active_nether_portals)) //this would be cool if we made unique TGUI for this
- to_chat(user, "UNKNOWN INTERFERENCE ... UNRESPONSIVE")
- return
ui_interact(user)
/obj/machinery/power/bluespace_tap/attack_ghost(mob/user)
ui_interact(user)
-/obj/machinery/power/bluespace_tap/attack_ai(mob/user)
- if(length(active_nether_portals)) //this would be cool if we made unique TGUI for this
- to_chat(user, "UNKNOWN INTERFERENCE ... UNRESPONSIVE")
- return
+/obj/machinery/power/bluespace_tap/attack_ai(mob/user) //this would be cool if we made unique TGUI for this
ui_interact(user)
/**
@@ -499,12 +477,8 @@
return
. = TRUE // we want to refresh in all the cases below
switch(action)
- if("decrease")
- decrease_level()
- if("increase")
- increase_level()
if("set")
- set_level(text2num(params["set_level"]))
+ set_power(text2num(params["set_power"]))
if("vend")//it's not really vending as producing, but eh
var/key = text2num(params["target"])
produce(key)
@@ -512,6 +486,8 @@
auto_shutdown = !auto_shutdown
if("stabilizers")
stabilizers = !stabilizers
+ if("stabilizer_priority")
+ stabilizer_priority = !stabilizer_priority
/obj/machinery/power/bluespace_tap/ui_state(mob/user)
return GLOB.default_state
@@ -527,7 +503,6 @@
if(emagged)
return
emagged = TRUE
- desired_level = max_level
do_sparks(5, FALSE, src)
if(user)
user.visible_message("[user] disables the [src]'s safeties'.", "You disable the [src]'s safeties'.")
@@ -568,5 +543,6 @@
Device highly experimental. Not for sale. Do not operate near small children or vital NT assets. Do not tamper with machine. In case of existential dread, stop machine immediately. \
Please document any and all extradimensional incursions. In case of imminent death, please leave said documentation in plain sight for clean-up teams to recover.
"
-#undef BASE_ENERGY_CONVERSION
+#undef POINTS_PER_W
#undef BASE_POINTS
+ER_W
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index b1ad0956c0b1..d6b2b7f576cd 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -116,8 +116,9 @@
var/static/image/top_layer = null
var/ex_power = 3
var/power_used_per_shot = 2000000 //enough to kil standard apc - todo : make this use wires instead and scale explosion power with it
- var/last_fire_time = 0 // The time at which the gun was last fired
- var/reload_cooldown = 600 // The gun's cooldown
+ /// The gun's cooldown
+ var/reload_cooldown_time = 10 MINUTES
+ COOLDOWN_DECLARE(firing_cooldown)
pixel_y = -32
pixel_x = -192
@@ -136,7 +137,7 @@
/obj/machinery/bsa/full/admin
power_used_per_shot = 0
- reload_cooldown = 100
+ reload_cooldown_time = 100 SECONDS
/obj/machinery/bsa/full/admin/east
icon_state = "cannon_east"
@@ -145,9 +146,9 @@
/obj/machinery/bsa/full/proc/get_front_turf()
switch(dir)
if(WEST)
- return locate(x - 6,y,z)
+ return locate(x - 7,y,z)
if(EAST)
- return locate(x + 4,y,z)
+ return locate(x + 5,y,z)
return get_turf(src)
/obj/machinery/bsa/full/proc/get_back_turf()
@@ -196,6 +197,8 @@
/obj/machinery/bsa/full/proc/fire(mob/user, turf/bullseye, target)
+ if(!COOLDOWN_FINISHED(src, firing_cooldown))
+ return
var/turf/point = get_front_turf()
for(var/turf/T in get_line(get_step(point,dir),get_target_turf()))
T.ex_act(EXPLODE_DEVASTATE)
@@ -203,6 +206,7 @@
A.ex_act(EXPLODE_DEVASTATE)
point.Beam(get_target_turf(), icon_state = "bsa_beam", time = 50, maxdistance = world.maxx, beam_type = /obj/effect/ebeam/deadly) //ZZZAP
+ new /obj/effect/temp_visual/bsa_splash(point, dir)
playsound(src, 'sound/machines/bsa_fire.ogg', 100, 1)
if(istype(target, /obj/item/gps))
var/obj/item/gps/G = target
@@ -218,7 +222,7 @@
/obj/machinery/bsa/full/proc/reload()
use_power(power_used_per_shot)
- last_fire_time = world.time / 10
+ COOLDOWN_START(src, firing_cooldown, reload_cooldown_time)
/obj/item/circuitboard/machine/bsa/back
board_name = "Bluespace Artillery Generator"
@@ -295,7 +299,7 @@
icon_state = icon_state_broken
else if(stat & NOPOWER)
icon_state = icon_state_nopower
- else if(cannon && (cannon.last_fire_time + cannon.reload_cooldown) > (world.time / 10))
+ else if(cannon && (!COOLDOWN_FINISHED(cannon, firing_cooldown)))
icon_state = icon_state_reloading
else if(cannon)
icon_state = icon_state_active
@@ -326,14 +330,8 @@
if(target)
data["target"] = get_target_name()
if(cannon)
- var/reload_cooldown = cannon.reload_cooldown
- var/last_fire_time = cannon.last_fire_time
- var/time_to_wait = max(0, round(reload_cooldown - ((world.time / 10) - last_fire_time)))
- var/minutes = max(0, round(time_to_wait / 60))
- var/seconds = max(0, time_to_wait - (60 * minutes))
- var/seconds2 = (seconds < 10) ? "0[seconds]" : seconds
- data["reloadtime_text"] = "[minutes]:[seconds2]"
- data["ready"] = minutes == 0 && seconds == 0
+ data["reloadtime_text"] = seconds_to_clock(round(COOLDOWN_TIMELEFT(cannon, firing_cooldown) / 10))
+ data["ready"] = COOLDOWN_FINISHED(cannon, firing_cooldown)
else
data["ready"] = FALSE
return data
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index 6eca59c5e29b..04d85784bd03 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -170,9 +170,7 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/m
dna_max = G.human_count
break
- AddComponent(/datum/component/multitile, 2, list(
- list(0, 0, 0, 0, 0),
- list(0, 0, 0, 0, 0),
+ AddComponent(/datum/component/multitile, list(
list(0, 1, MACH_CENTER, 1, 0),
list(0, 1, 0, 1, 0),
list(0, 1, 0, 1, 0)
diff --git a/code/modules/supply/supply_packs/pack_security.dm b/code/modules/supply/supply_packs/pack_security.dm
index f95c3cbc5756..1adad3d58c9e 100644
--- a/code/modules/supply/supply_packs/pack_security.dm
+++ b/code/modules/supply/supply_packs/pack_security.dm
@@ -278,15 +278,15 @@
/datum/supply_packs/security/armory/tranqammo
name = "Tranquilizer Shell Crate"
- contains = list(/obj/item/storage/box/tranquilizer,
- /obj/item/storage/box/tranquilizer)
+ contains = list(/obj/item/storage/fancy/shell/tranquilizer,
+ /obj/item/storage/fancy/shell/tranquilizer)
cost = 400
containername = "tranquilizer shell crate"
/datum/supply_packs/security/armory/holyammo
name = "Holy Water Shell Crate"
- contains = list(/obj/item/storage/box/holy,
- /obj/item/storage/box/holy)
+ contains = list(/obj/item/storage/fancy/shell/holy,
+ /obj/item/storage/fancy/shell/holy)
cost = 400
containername = "holy water shell crate"
diff --git a/code/modules/surgery/abstract_steps.dm b/code/modules/surgery/abstract_steps.dm
index 2632347347c0..144f55e39092 100644
--- a/code/modules/surgery/abstract_steps.dm
+++ b/code/modules/surgery/abstract_steps.dm
@@ -113,7 +113,7 @@
for(var/allowed in first_step.allowed_tools)
if(ispath(allowed) && istype(tool, allowed) || (tool && istype(tool) && tool.tool_behaviour == allowed))
next_surgery = S
- if(allowed in starting_tools && !(allowed in overriding_tools))
+ if((allowed in starting_tools) && !(allowed in overriding_tools))
CRASH("[src] was provided with multiple branches that start with tool [allowed].")
else
starting_tools.Add(allowed)
diff --git a/code/modules/surgery/bio_chip_removal.dm b/code/modules/surgery/bio_chip_removal.dm
index f7c8d88b18bf..5b324bbb714a 100644
--- a/code/modules/surgery/bio_chip_removal.dm
+++ b/code/modules/surgery/bio_chip_removal.dm
@@ -29,6 +29,7 @@
/datum/surgery_step/extract_bio_chip
name = "extract bio-chip"
allowed_tools = list(TOOL_HEMOSTAT = 100, TOOL_CROWBAR = 65)
+ preop_sound = 'sound/surgery/hemostat1.ogg'
time = 6.4 SECONDS
repeatable = TRUE
var/obj/item/bio_chip/I = null
diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm
index acfcbfcdedd4..d14ddd44c339 100644
--- a/code/modules/surgery/bones.dm
+++ b/code/modules/surgery/bones.dm
@@ -51,6 +51,13 @@
TOOL_BONEGEL = 100,
TOOL_SCREWDRIVER = 90
)
+
+ preop_sound = list(
+ TOOL_BONEGEL = 'sound/surgery/organ1.ogg',
+ /obj/item/screwdriver/power = 'sound/items/drill_hit.ogg',
+ /obj/item/screwdriver = 'sound/items/screwdriver.ogg'
+ )
+
can_infect = TRUE
blood_level = SURGERY_BLOODSPREAD_HANDS
@@ -93,6 +100,7 @@
TOOL_WRENCH = 90
)
+ preop_sound = 'sound/surgery/hemostat1.ogg'
time = 3.2 SECONDS
/datum/surgery_step/set_bone/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -164,6 +172,13 @@
TOOL_BONEGEL = 100,
TOOL_SCREWDRIVER = 90
)
+
+ preop_sound = list(
+ TOOL_BONEGEL = 'sound/surgery/organ1.ogg',
+ /obj/item/screwdriver/power = 'sound/items/drill_hit.ogg',
+ /obj/item/screwdriver = 'sound/items/screwdriver.ogg'
+ )
+
can_infect = TRUE
blood_level = SURGERY_BLOODSPREAD_HANDS
diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm
index 8baebebdff15..37a0ee5b56f5 100644
--- a/code/modules/surgery/cavity_implant.dm
+++ b/code/modules/surgery/cavity_implant.dm
@@ -151,6 +151,12 @@
/obj/item/stack/rods = 60
)
+ preop_sound = list(
+ TOOL_DRILL = 'sound/items/drill_hit.ogg',
+ /obj/item/screwdriver/power = 'sound/items/drill_hit.ogg',
+ /obj/item/pen = 'sound/surgery/organ2.ogg',
+ /obj/item/stack/rods = 'sound/surgery/organ2.ogg'
+ )
time = 5.4 SECONDS
/datum/surgery_step/cavity/make_space/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -183,6 +189,9 @@
TOOL_WELDER = 30
)
+ preop_sound = 'sound/surgery/cautery1.ogg'
+ success_sound = 'sound/surgery/cautery2.ogg'
+ failure_sound = 'sound/items/welder.ogg'
time = 2.4 SECONDS
/datum/surgery_step/cavity/close_space/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
diff --git a/code/modules/surgery/core_removal.dm b/code/modules/surgery/core_removal.dm
index 65a0ca70a6f5..a57178f97349 100644
--- a/code/modules/surgery/core_removal.dm
+++ b/code/modules/surgery/core_removal.dm
@@ -19,6 +19,10 @@
/obj/item/kitchen/knife = 65,
/obj/item/shard = 45
)
+
+ preop_sound = 'sound/surgery/scalpel1.ogg'
+ success_sound = 'sound/surgery/scalpel2.ogg'
+ failure_sound = 'sound/surgery/organ2.ogg'
time = 1.6 SECONDS
/datum/surgery_step/slime/cut_flesh/begin_step(mob/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool)
@@ -38,6 +42,8 @@
/datum/surgery_step/slime/extract_core
name = "extract core"
allowed_tools = list(TOOL_HEMOSTAT = 100, TOOL_CROWBAR = 100)
+ preop_sound = 'sound/surgery/organ1.ogg'
+ success_sound = 'sound/surgery/organ2.ogg'
time = 1.6 SECONDS
/datum/surgery_step/slime/extract_core/begin_step(mob/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool)
diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm
index 13bed7936b04..871f91d8038a 100644
--- a/code/modules/surgery/encased.dm
+++ b/code/modules/surgery/encased.dm
@@ -16,6 +16,15 @@
TOOL_WIRECUTTER = 35 // Silly goose!
)
+ preop_sound = list(
+ TOOL_SAW = 'sound/surgery/saw.ogg',
+ /obj/item/hatchet = 'sound/surgery/scalpel1.ogg',
+ /obj/item/chainsaw = 'sound/weapons/chainsaw.ogg',
+ /obj/item/butcher_chainsaw = 'sound/weapons/chainsaw.ogg',
+ TOOL_WIRECUTTER = 'sound/surgery/scalpel1.ogg'
+ )
+
+ success_sound = 'sound/surgery/organ2.ogg'
time = 5.4 SECONDS
/datum/surgery_step/open_encased/saw/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -64,6 +73,8 @@
TOOL_CROWBAR = 90
)
+ preop_sound = 'sound/surgery/retractor1.ogg'
+ success_sound = 'sound/surgery/retractor2.ogg'
time = 2.4 SECONDS
/datum/surgery_step/open_encased/retract/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -113,6 +124,8 @@
TOOL_CROWBAR = 90
)
+ preop_sound = 'sound/surgery/retractor1.ogg'
+ success_sound = 'sound/surgery/retractor2.ogg'
time = 2.4 SECONDS
/datum/surgery_step/open_encased/close/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -158,6 +171,12 @@
TOOL_SCREWDRIVER = 90
)
+ preop_sound = list(
+ TOOL_BONEGEL = 'sound/surgery/organ1.ogg',
+ /obj/item/screwdriver/power = 'sound/items/drill_hit.ogg',
+ /obj/item/screwdriver = 'sound/items/screwdriver.ogg'
+ )
+
time = 2.4 SECONDS
/datum/surgery_step/open_encased/mend/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm
index dc6c98957377..b0fa71e9de33 100644
--- a/code/modules/surgery/generic.dm
+++ b/code/modules/surgery/generic.dm
@@ -23,6 +23,9 @@
/obj/item/butcher_chainsaw = 1
)
+ preop_sound = 'sound/surgery/scalpel1.ogg'
+ success_sound = 'sound/surgery/scalpel2.ogg'
+ failure_sound = 'sound/surgery/organ2.ogg'
time = 1.6 SECONDS
/datum/surgery_step/generic/cut_open/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -67,6 +70,7 @@
/obj/item/assembly/mousetrap = 25
)
+ preop_sound = 'sound/surgery/hemostat1.ogg'
time = 2.4 SECONDS
@@ -111,6 +115,9 @@
/obj/item/kitchen/utensil/fork = 60
)
+ preop_sound = 'sound/surgery/retractor1.ogg'
+ success_sound = 'sound/surgery/retractor2.ogg'
+ failure_sound = 'sound/surgery/organ2.ogg'
time = 2.4 SECONDS
/datum/surgery_step/generic/retract_skin/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -168,6 +175,9 @@
/obj/item/flamethrower = 1 // You make do with what ya got...
)
+ preop_sound = 'sound/surgery/cautery1.ogg'
+ success_sound = 'sound/surgery/cautery2.ogg'
+ failure_sound = 'sound/items/welder.ogg'
time = 2.4 SECONDS
/datum/surgery_step/generic/cauterize/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -226,6 +236,15 @@
/obj/item/mecha_parts/mecha_equipment/drill = 60,
/obj/item/screwdriver = 20
)
+
+ preop_sound = list(
+ TOOL_DRILL = 'sound/items/drill_hit.ogg',
+ /obj/item/screwdriver/power = 'sound/items/drill_hit.ogg',
+ /obj/item/pickaxe/drill = 'sound/weapons/drill.ogg',
+ /obj/item/mecha_parts/mecha_equipment/drill = 'sound/weapons/drill.ogg',
+ /obj/item/screwdriver = 'sound/items/screwdriver.ogg'
+ )
+
time = 3 SECONDS
/datum/surgery_step/generic/drill/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -264,6 +283,13 @@
/obj/item/melee/energy = 75
)
+ preop_sound = list(
+ TOOL_SAW = 'sound/surgery/saw.ogg',
+ /obj/item/hatchet = 'sound/surgery/scalpel1.ogg',
+ /obj/item/melee/arm_blade = 'sound/surgery/scalpel1.ogg'
+ )
+
+ success_sound = 'sound/surgery/organ2.ogg'
time = 10 SECONDS
/datum/surgery_step/generic/amputate/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 1edd427daad6..b08a0021cd06 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -3,7 +3,7 @@
desc = "You shouldn't see this! Adminhelp and report this as an issue on github!"
parent_organ = "r_arm"
slot = "r_arm_device"
- icon_state = "implant-toolkit"
+ icon_state = "toolkit_generic"
w_class = WEIGHT_CLASS_NORMAL
actions_types = list(/datum/action/item_action/organ_action/toggle)
@@ -223,6 +223,7 @@
/obj/item/organ/internal/cyberimp/arm/toolset
name = "integrated toolset implant"
desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm. Contains all neccessary tools."
+ icon_state = "toolkit_engineering"
origin_tech = "materials=3;engineering=4;biotech=3;powerstorage=4"
contents = newlist(/obj/item/screwdriver/cyborg, /obj/item/wrench/cyborg, /obj/item/weldingtool/largetank/cyborg,
/obj/item/crowbar/cyborg, /obj/item/wirecutters/cyborg, /obj/item/multitool/cyborg)
@@ -242,6 +243,7 @@
/obj/item/organ/internal/cyberimp/arm/toolset_abductor
name = "alien toolset implant"
desc = "An alien toolset, designed to be installed on subject's arm."
+ icon_state = "toolkit_engineering"
origin_tech = "materials=5;engineering=5;plasmatech=5;powerstorage=4;abductor=3"
contents = newlist(/obj/item/screwdriver/abductor, /obj/item/wirecutters/abductor, /obj/item/crowbar/abductor, /obj/item/wrench/abductor, /obj/item/weldingtool/abductor, /obj/item/multitool/abductor)
action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/abductor.dmi')
@@ -253,6 +255,7 @@
/obj/item/organ/internal/cyberimp/arm/janitorial_abductor
name = "alien janitorial toolset implant"
desc = "A set of alien janitorial tools, designed to be installed on subject's arm."
+ icon_state = "toolkit_janitor"
origin_tech = "materials=5;engineering=5;biotech=5;powerstorage=4;abductor=2"
contents = newlist(/obj/item/mop/advanced/abductor, /obj/item/soap/syndie/abductor, /obj/item/lightreplacer/bluespace/abductor, /obj/item/holosign_creator/janitor, /obj/item/melee/flyswatter/abductor, /obj/item/reagent_containers/spray/cleaner/safety/abductor)
action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/abductor.dmi')
@@ -264,6 +267,7 @@
/obj/item/organ/internal/cyberimp/arm/surgical_abductor
name = "alien surgical toolset implant"
desc = "An alien surgical toolset, designed to be installed on the subject's arm."
+ icon_state = "toolkit_surgical"
origin_tech = "materials=5;engineering=5;plasmatech=5;powerstorage=4;abductor=2"
contents = newlist(/obj/item/retractor/alien, /obj/item/hemostat/alien, /obj/item/cautery/alien, /obj/item/bonesetter/alien, /obj/item/scalpel/alien, /obj/item/circular_saw/alien, /obj/item/bonegel/alien, /obj/item/FixOVein/alien, /obj/item/surgicaldrill/alien)
action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/abductor.dmi')
@@ -330,6 +334,7 @@
/obj/item/organ/internal/cyberimp/arm/surgery
name = "surgical toolset implant"
desc = "A set of surgical tools hidden behind a concealed panel on the user's arm"
+ icon_state = "toolkit_surgical"
contents = newlist(/obj/item/retractor/augment, /obj/item/hemostat/augment, /obj/item/cautery/augment, /obj/item/bonesetter/augment, /obj/item/scalpel/augment, /obj/item/circular_saw/augment, /obj/item/bonegel/augment, /obj/item/FixOVein/augment, /obj/item/surgicaldrill/augment)
origin_tech = "materials=3;engineering=3;biotech=3;programming=2;magnets=3"
action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/storage.dmi')
@@ -342,6 +347,7 @@
/obj/item/organ/internal/cyberimp/arm/janitorial
name = "janitorial toolset implant"
desc = "A set of janitorial tools hidden behind a concealed panel on the user's arm"
+ icon_state = "toolkit_janitor"
contents = newlist(/obj/item/mop/advanced, /obj/item/soap, /obj/item/lightreplacer, /obj/item/holosign_creator/janitor, /obj/item/melee/flyswatter, /obj/item/reagent_containers/spray/cleaner/safety)
origin_tech = "materials=3;engineering=4;biotech=3"
action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/clothing/belts.dmi')
@@ -369,6 +375,7 @@
/obj/item/organ/internal/cyberimp/arm/botanical
name = "botanical toolset implant"
desc = "A set of botanical tools hidden behind a concealed panel on the user's arm"
+ icon_state = "toolkit_hydro"
contents = newlist(/obj/item/plant_analyzer, /obj/item/cultivator, /obj/item/hatchet, /obj/item/shovel/spade, /obj/item/reagent_containers/spray/weedspray, /obj/item/reagent_containers/spray/pestspray)
origin_tech = "materials=3;engineering=4;biotech=3"
action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/clothing/belts.dmi')
@@ -382,6 +389,7 @@
/obj/item/organ/internal/cyberimp/arm/power_cord
name = "APC-compatible power adapter implant"
desc = "An implant commonly installed inside IPCs in order to allow them to easily collect energy from their environment"
+ icon_state = "toolkit_ipc"
origin_tech = "materials=3;biotech=2;powerstorage=3"
contents = newlist(/obj/item/apc_powercord)
requires_robotic_bodypart = TRUE
@@ -417,12 +425,8 @@
user.changeNext_move(CLICK_CD_MELEE)
var/obj/machinery/power/apc/A = target
var/mob/living/carbon/human/H = user
- if(H.get_int_organ(/obj/item/organ/internal/cell) || H.get_int_organ(/obj/item/organ/internal/heart))
- var/obj/item/organ/internal/heart/robotic = H.get_int_organ(/obj/item/organ/internal/heart)
- if(robotic)
- if(!(robotic.status & ORGAN_ROBOT) && !H.get_int_organ(/obj/item/organ/internal/heart/demon/pulse))
- to_chat(user, "You lack a cell in which to store charge!")
- return
+ var/datum/organ/battery/power_source = H.get_int_organ_datum(ORGAN_DATUM_BATTERY)
+ if(istype(power_source))
if(A.emagged || A.stat & BROKEN)
do_sparks(3, 1, A)
to_chat(H, "The APC power currents surge erratically, damaging your chassis!")
@@ -435,7 +439,7 @@
else
to_chat(user, "There is no charge to draw from that APC.")
else
- to_chat(user, "You lack a cell in which to store charge!")
+ to_chat(user, "You lack a power source in which to store charge!")
/obj/item/apc_powercord/proc/powerdraw_loop(obj/machinery/power/apc/A, mob/living/carbon/human/H)
H.visible_message("[H] inserts a power connector into \the [A].", "You begin to draw power from \the [A].")
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index cfadb5fef4de..a26301260540 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -2,7 +2,6 @@
name = "cybernetic eyes"
desc = "artificial photoreceptors with specialized functionality."
icon_state = "eye_implant"
- implant_overlay = "eye_implant_overlay"
slot = "eye_sight"
parent_organ = "eyes"
w_class = WEIGHT_CLASS_TINY
@@ -39,7 +38,7 @@
/obj/item/organ/internal/cyberimp/eyes/hud/medical
name = "Medical HUD implant"
desc = "These cybernetic eye implants will display a medical HUD over everything you see."
- implant_color = "#00FFFF"
+ icon_state = "eye_implant_medical"
origin_tech = "materials=4;programming=4;biotech=4"
aug_message = "You suddenly see health bars floating above people's heads..."
HUD_type = DATA_HUD_MEDICAL_ADVANCED
@@ -48,7 +47,7 @@
/obj/item/organ/internal/cyberimp/eyes/hud/diagnostic
name = "Diagnostic HUD implant"
desc = "These cybernetic eye implants will display a diagnostic HUD over everything you see."
- implant_color = "#ff9000"
+ icon_state = "eye_implant_diagnostic"
origin_tech = "materials=4;engineering=4;biotech=4"
aug_message = "You see the diagnostic information of the synthetics around you..."
HUD_type = DATA_HUD_DIAGNOSTIC_ADVANCED
@@ -56,7 +55,7 @@
/obj/item/organ/internal/cyberimp/eyes/hud/security
name = "Security HUD implant"
desc = "These cybernetic eye implants will display a security HUD over everything you see."
- implant_color = "#CC0000"
+ icon_state = "eye_implant_security"
origin_tech = "materials=4;programming=4;biotech=3;combat=3"
aug_message = "Job indicator icons pop up in your vision. That is not a certified surgeon..."
HUD_type = DATA_HUD_SECURITY_ADVANCED
@@ -65,7 +64,7 @@
/obj/item/organ/internal/cyberimp/eyes/hud/jani
name = "Janitor HUD implant"
desc = "These cybernetic eye implants will display a filth HUD over everything you see."
- implant_color = "#DFBE00"
+ icon_state = "eye_implant_janitor"
origin_tech = "materials=4;engineering=4;biotech=4"
aug_message = "You scan for filth spots around you..."
HUD_type = DATA_HUD_JANITOR
@@ -73,7 +72,7 @@
/obj/item/organ/internal/cyberimp/eyes/hud/hydroponic
name = "Hydroponic HUD implant"
desc = "These cybernetic eye implants will display a botanical HUD over everything you see."
- implant_color = "#4850D5"
+ icon_state = "eye_implant_hydro"
origin_tech = "materials=4;magnets=4;biotech=4"
aug_message = "You scan for non-plastic plants around you..."
HUD_type = DATA_HUD_HYDROPONIC
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index 895419b3f67b..a1807372bcfe 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -42,12 +42,13 @@
/obj/item/organ/internal/cyberimp/brain/anti_drop
name = "Anti-drop implant"
desc = "This cybernetic brain implant will allow you to force your hand muscles to contract, preventing item dropping. Twitch ear to toggle."
+ icon_state = "brain_implant_antidrop"
var/active = FALSE
var/l_hand_ignore = FALSE
var/r_hand_ignore = FALSE
var/obj/item/l_hand_obj = null
var/obj/item/r_hand_obj = null
- implant_color = "#DE7E00"
+ implant_overlay = null
slot = "brain_antidrop"
origin_tech = "materials=4;programming=5;biotech=4"
actions_types = list(/datum/action/item_action/organ_action/toggle)
@@ -133,7 +134,7 @@
/obj/item/organ/internal/cyberimp/brain/anti_stam
name = "CNS Rebooter implant"
desc = "This implant will automatically give you back control over your central nervous system, reducing downtime when fatigued. Incompatible with the Neural Jumpstarter."
- implant_color = "#FFFF00"
+ icon_state = "brain_implant_rebooter"
slot = "brain_antistun"
origin_tech = "materials=5;programming=4;biotech=5"
/// How much we multiply the owners stamina regen block modifier by.
@@ -594,7 +595,8 @@
/obj/item/organ/internal/cyberimp/chest/nutriment
name = "Nutriment pump implant"
desc = "This implant will synthesize a small amount of nutriment and pumps it directly into your bloodstream when you are starving."
- implant_color = "#00AA00"
+ icon_state = "nutriment_implant"
+ implant_overlay = null
var/hunger_threshold = NUTRITION_LEVEL_STARVING
var/synthesizing = 0
var/poison_amount = 5
@@ -643,7 +645,7 @@
/obj/item/organ/internal/cyberimp/chest/nutriment/plus
name = "Nutriment pump implant PLUS"
desc = "This implant will synthesize a small amount of nutriment and pumps it directly into your bloodstream when you are hungry."
- implant_color = "#006607"
+ icon_state = "adv_nutriment_implant"
hunger_threshold = NUTRITION_LEVEL_HUNGRY
poison_amount = 10
origin_tech = "materials=4;powerstorage=3;biotech=3"
@@ -659,7 +661,8 @@
/obj/item/organ/internal/cyberimp/chest/reviver
name = "Reviver implant"
desc = "This implant will attempt to heal you out of critical condition. For the faint of heart!"
- implant_color = "#AD0000"
+ icon_state = "reviver_implant"
+ implant_overlay = null
origin_tech = "materials=5;programming=4;biotech=4"
slot = "heartdrive"
var/revive_cost = 0
diff --git a/code/modules/surgery/organs/brain.dm b/code/modules/surgery/organs/brain.dm
index cd29e5c36ae6..4da4a401d6ed 100644
--- a/code/modules/surgery/organs/brain.dm
+++ b/code/modules/surgery/organs/brain.dm
@@ -141,7 +141,7 @@
to_chat(owner, "Your head feels foggy.")
else if(prob(4))
owner.vomit()
- to_chat(owner, "'You feel nauseous.")
+ to_chat(owner, "You feel nauseous.")
/obj/item/organ/internal/brain/proc/handle_moderate_brain_damage()
if(prob(4))
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index 3d85aa0d47aa..805a75efaadb 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -126,6 +126,7 @@
/obj/item/organ/internal/eyes/cybernetic/meson
name = "meson eyes"
desc = "These cybernetic eyes will allow you to see the structural layout of the station, and, well, everything else."
+ icon_state = "eyes-c-meson"
eye_color = "#199900"
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
origin_tech = "materials=4;engineering=4;biotech=4;magnets=4"
@@ -141,6 +142,7 @@
/obj/item/organ/internal/eyes/cybernetic/xray
name = "\improper X-ray eyes"
desc = "These cybernetic eyes will give you X-ray vision. Blinking is futile."
+ icon_state = "eyes-c-xray"
see_in_dark = 8
vision_flags = SEE_MOBS | SEE_OBJS | SEE_TURFS
origin_tech = "materials=4;programming=4;biotech=7;magnets=4"
@@ -148,13 +150,15 @@
/obj/item/organ/internal/eyes/cybernetic/xray/hardened
name = "hardened X-ray eyes"
desc = "These cybernetic eyes will give you X-ray vision. Blinking is futile. This pair has been hardened for special operations personnel."
+ eye_color = "#FFCC00"
emp_proof = TRUE
origin_tech = "materials=6;programming=5;biotech=7;magnets=6;syndicate=3"
/obj/item/organ/internal/eyes/cybernetic/thermals
name = "thermal eyes"
desc = "These cybernetic eye implants will give you thermal vision. Vertical slit pupil included."
- eye_color = "#FFCC00"
+ icon_state = "eyes-c-thermal"
+ eye_color = "#E12224"
vision_flags = SEE_MOBS
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
flash_protect = FLASH_PROTECTION_SENSITIVE
@@ -170,6 +174,7 @@
/obj/item/organ/internal/eyes/cybernetic/scope
name = "\improper Kaleido Optics eyes"
desc = "These cybernetic eye implants will let you zoom in on far away objects. Many users find it disorienting, and find it hard to interact with things near them when active."
+ icon_state = "eyes-c-kaleido"
eye_color = "#6f00ff"
flash_protect = FLASH_PROTECTION_EXTRA_SENSITIVE
origin_tech = "materials=5;programming=4;biotech=4;magnets=4"
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index 9dac53823a47..0b3e52c5578b 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -36,6 +36,7 @@
base_icon_state = "cursedheart"
origin_tech = "biotech=6"
actions_types = list(/datum/action/item_action/organ_action/cursed_heart)
+ organ_datums = list(/datum/organ/heart, /datum/organ/battery) // This doesn't actually work for IPCs but it also doesn't kill you, and it's funny
var/last_pump = 0
var/pump_delay = 30 //you can pump 1 second early, for lag, but no more (otherwise you could spam heal)
var/blood_loss = 100 //600 blood is human default, so 5 failures (below 122 blood is where humans die because reasons?)
@@ -191,6 +192,7 @@
base_icon_state = "heart-c"
dead_icon = "heart-c-off"
status = ORGAN_ROBOT
+ organ_datums = list(/datum/organ/heart, /datum/organ/battery)
/obj/item/organ/internal/heart/cybernetic/upgraded
name = "upgraded cybernetic heart"
diff --git a/code/modules/surgery/organs/organ_datums/battery_datum.dm b/code/modules/surgery/organs/organ_datums/battery_datum.dm
new file mode 100644
index 000000000000..28b3b35d4aca
--- /dev/null
+++ b/code/modules/surgery/organs/organ_datums/battery_datum.dm
@@ -0,0 +1,5 @@
+/*
+ For any species that doesn't have a heart datum but does have heart-like organs, so just IPCs right now. Microbatteries currently have no behavior.
+*/
+/datum/organ/battery
+ organ_tag = ORGAN_DATUM_BATTERY
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 506747dde5c9..c01ab721347b 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -927,7 +927,7 @@ Note that amputating the affected organ does in fact remove the infection from t
"\The [victim]'s [name] explodes violently!",\
"Your [name] explodes!",\
"You hear an explosion!")
- explosion(get_turf(owner),-1,-1,2,3)
+ explosion(get_turf(victim), -1, -1, 2, 3)
do_sparks(5, 0, victim)
qdel(src)
diff --git a/code/modules/surgery/organs/organ_extractor.dm b/code/modules/surgery/organs/organ_extractor.dm
index efa581b8bc3e..16ee7fe6f11b 100644
--- a/code/modules/surgery/organs/organ_extractor.dm
+++ b/code/modules/surgery/organs/organ_extractor.dm
@@ -129,7 +129,7 @@
C.apply_damage(5, BRUTE, drilled_organ)
playsound(get_turf(C), 'sound/weapons/circsawhit.ogg', 50, TRUE)
- if(!do_after_once(C, (user_is_target ? self_insert_time : insert_time), target = C))
+ if(!do_after_once(user, (user_is_target ? self_insert_time : insert_time), target = C))
to_chat(user, "ERROR: Process interrupted!")
in_use = FALSE
return
diff --git a/code/modules/surgery/organs/organ_helpers.dm b/code/modules/surgery/organs/organ_helpers.dm
index 6ec762dee736..e27293dedc4f 100644
--- a/code/modules/surgery/organs/organ_helpers.dm
+++ b/code/modules/surgery/organs/organ_helpers.dm
@@ -85,8 +85,13 @@
.++
if(affecting.body_part == LEG_LEFT)
.++
-///Returns true if all the mob's vital organs are functional, otherwise returns false
-/mob/living/carbon/human/proc/check_vital_organs()
+/* Returns true if all the mob's vital organs are functional, otherwise returns false.
+* This proc is only used for checking if IPCs can revive from death, so calling it on a non IPC will always return false (right now)
+*/
+/mob/living/carbon/human/proc/ipc_vital_organ_check()
+ var/has_battery = get_int_organ_datum(ORGAN_DATUM_BATTERY)
+ if(!has_battery)
+ return FALSE
for(var/obj/item/organ/internal/organ in internal_organs)
if(organ.vital && (organ.damage >= organ.max_damage))
return FALSE
diff --git a/code/modules/surgery/organs/subtypes/machine_organs.dm b/code/modules/surgery/organs/subtypes/machine_organs.dm
index 7acdb7a461ca..c5b60e33263b 100644
--- a/code/modules/surgery/organs/subtypes/machine_organs.dm
+++ b/code/modules/surgery/organs/subtypes/machine_organs.dm
@@ -104,21 +104,21 @@
/obj/item/organ/internal/cell
name = "microbattery"
desc = "A small, powerful cell for use in fully prosthetic bodies."
- icon = 'icons/obj/power.dmi'
- icon_state = "scell"
+ icon_state = "cell"
organ_tag = "heart"
parent_organ = "chest"
+ dead_icon = "cell_bork"
slot = "heart"
vital = TRUE
status = ORGAN_ROBOT
requires_robotic_bodypart = TRUE
+ organ_datums = list(/datum/organ/battery)
/obj/item/organ/internal/eyes/optical_sensor
name = "optical sensor"
icon = 'icons/obj/robot_component.dmi'
icon_state = "camera"
status = ORGAN_ROBOT
-// dead_icon = "camera_broken"
weld_proof = TRUE
requires_robotic_bodypart = TRUE
@@ -150,8 +150,7 @@
/obj/item/organ/internal/ears/microphone
name = "microphone"
- icon = 'icons/obj/device.dmi'
- icon_state = "taperecorder_idle"
+ icon_state = "voicebox"
status = ORGAN_ROBOT
dead_icon = "taperecorder_empty"
requires_robotic_bodypart = TRUE
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 1f2a0d1603c7..3febb3448849 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -433,7 +433,7 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby"))
for(var/V in listeners)
var/mob/living/L = V
if(L.buckled && istype(L.buckled, /obj/structure/chair))
- L.buckled.unbuckle_mob(L)
+ L.unbuckle()
next_command = world.time + cooldown_meme
//DANCE
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index b850e789f921..80fcef082bb8 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -182,6 +182,8 @@
/obj/item/stack/nanopaste = 100
)
+ preop_sound = 'sound/surgery/organ1.ogg'
+
/datum/surgery_step/internal/manipulate_organs/mend/proc/get_tool_name(obj/item/tool)
var/tool_name = "[tool]"
if(istype(tool, /obj/item/stack/medical/bruise_pack))
@@ -292,11 +294,12 @@
name = "extract organ"
allowed_tools = list(
TOOL_HEMOSTAT = 100,
- /obj/item/stack/sheet/sinew = 70,
- /obj/item/stack/cable_coil = 70,
+ /obj/item/wirecutters = 70,
/obj/item/kitchen/utensil/fork = 70
)
+ preop_sound = 'sound/surgery/organ1.ogg'
+ success_sound = 'sound/surgery/organ2.ogg'
var/obj/item/organ/internal/extracting = null
/datum/surgery_step/internal/manipulate_organs/extract/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -391,6 +394,9 @@
/obj/item/food/organ = 0 // there for the flavor text
)
+ preop_sound = 'sound/surgery/organ2.ogg'
+ success_sound = 'sound/surgery/organ1.ogg'
+
/datum/surgery_step/internal/manipulate_organs/implant/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(istype(tool, /obj/item/food/organ))
to_chat(user, "[tool] was bitten by someone! It's too damaged to use!")
@@ -644,6 +650,9 @@
TOOL_CROWBAR = 90
)
+ preop_sound = 'sound/surgery/retractor1.ogg'
+ success_sound = 'sound/surgery/retractor2.ogg'
+
/datum/surgery_step/internal/manipulate_organs/finish/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/mob/living/carbon/human/H = target
var/obj/item/organ/external/affected = target.get_organ(target_zone)
@@ -708,6 +717,15 @@
TOOL_WIRECUTTER = 35
)
+ preop_sound = list(
+ TOOL_SAW = 'sound/surgery/saw.ogg',
+ /obj/item/hatchet = 'sound/surgery/scalpel1.ogg',
+ /obj/item/chainsaw = 'sound/weapons/chainsaw.ogg',
+ /obj/item/butcher_chainsaw = 'sound/weapons/chainsaw.ogg',
+ TOOL_WIRECUTTER = 'sound/surgery/scalpel1.ogg'
+ )
+
+ success_sound = 'sound/surgery/organ2.ogg'
time = 5.4 SECONDS
@@ -751,6 +769,9 @@
/obj/item/butcher_chainsaw = 1
)
+ preop_sound = 'sound/surgery/scalpel1.ogg'
+ success_sound = 'sound/surgery/scalpel2.ogg'
+ failure_sound = 'sound/surgery/organ2.ogg'
time = 1.6 SECONDS
/datum/surgery_step/cut_carapace/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -788,6 +809,8 @@
/obj/item/kitchen/utensil/fork = 60
)
+ preop_sound = 'sound/surgery/retractor1.ogg'
+ success_sound = 'sound/surgery/retractor2.ogg'
time = 2.4 SECONDS
/datum/surgery_step/retract_carapace/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -839,6 +862,9 @@
/obj/item/flamethrower = 1
)
+ preop_sound = 'sound/surgery/cautery1.ogg'
+ success_sound = 'sound/surgery/cautery2.ogg'
+ failure_sound = 'sound/items/welder.ogg'
time = 2.4 SECONDS
/datum/surgery_step/generic/seal_carapace/proc/zone_name(target_zone)
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index 26a174caa348..09ba772bae4c 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -81,6 +81,7 @@
can_infect = TRUE
blood_level = SURGERY_BLOODSPREAD_HANDS
+ preop_sound = 'sound/surgery/organ1.ogg'
time = 3.2 SECONDS
/datum/surgery_step/fix_vein/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -133,6 +134,7 @@
can_infect = TRUE
blood_level = SURGERY_BLOODSPREAD_HANDS
+ preop_sound = 'sound/surgery/organ1.ogg'
time = 3.2 SECONDS
/datum/surgery_step/treat_burns/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -190,6 +192,9 @@
/obj/item/shard = 60
)
+ preop_sound = 'sound/surgery/scalpel1.ogg'
+ success_sound = 'sound/surgery/retractor2.ogg'
+ failure_sound = 'sound/surgery/organ1.ogg'
can_infect = TRUE
blood_level = SURGERY_BLOODSPREAD_HANDS
diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm
index 3a2050d8664e..a4941cb7bdaf 100644
--- a/code/modules/surgery/plastic_surgery.dm
+++ b/code/modules/surgery/plastic_surgery.dm
@@ -15,6 +15,10 @@
allowed_tools = list(TOOL_SCALPEL = 100, /obj/item/kitchen/knife = 50, /obj/item/wirecutters = 35)
time = 6.4 SECONDS
+ preop_sound = 'sound/surgery/scalpel1.ogg'
+ success_sound = 'sound/surgery/scalpel2.ogg'
+ failure_sound = 'sound/surgery/organ2.ogg'
+
/datum/surgery_step/reshape_face/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message(
"[user] begins to alter [target]'s appearance.",
diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm
index 5c7f42e33cd0..cd4a2d383d77 100644
--- a/code/modules/surgery/robotics.dm
+++ b/code/modules/surgery/robotics.dm
@@ -399,6 +399,7 @@
)
I.damage = 0
I.surgeryize()
+ target.update_stat("internal organs repaired")
return ..()
/datum/surgery_step/robotics/manipulate_robotic_organs/mend/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 3e5bfdf98eac..4ea5674385da 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -197,6 +197,12 @@
var/silicons_ignore_prob = FALSE
/// How many times this step has been automatically repeated.
var/times_repeated = 0
+ /// Sound played when the step is started. Lists or single value can be used for this var as well as tool defines
+ var/preop_sound
+ /// Sound played if the step succeeded. Single value only
+ var/success_sound
+ /// Sound played if the step fails. Single value only
+ var/failure_sound
// evil infection stuff that will make everyone hate me
@@ -331,6 +337,8 @@
surgery.step_in_progress = FALSE
return SURGERY_INITIATE_SUCCESS
+ play_preop_sound(user, target, target_zone, tool, surgery)
+
if(tool)
speed_mod = tool.toolspeed
@@ -386,8 +394,10 @@
surgery.step_in_progress = FALSE
if(advance)
+ play_success_sound(user, target, target_zone, tool, surgery)
return SURGERY_INITIATE_SUCCESS
else
+ play_failure_sound(user, target, target_zone, tool, surgery)
return SURGERY_INITIATE_FAILURE
/**
@@ -553,3 +563,26 @@
for(var/reagent in chems_needed)
if(target.reagents.has_reagent(reagent))
return TRUE
+
+/datum/surgery_step/proc/play_preop_sound(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ if(!preop_sound || (islist(preop_sound) && !length(preop_sound)) || ismachineperson(target))
+ return
+ var/sound_file_use
+ if(islist(preop_sound))
+ for(var/typepath in preop_sound)
+ if((ispath(typepath) && istype(tool, typepath)) || ((typepath in GLOB.surgery_tool_behaviors) && istype(tool) && tool.tool_behaviour == typepath))
+ sound_file_use = preop_sound[typepath]
+ break
+ else
+ sound_file_use = preop_sound
+ playsound(get_turf(target), sound_file_use, 75, TRUE, falloff_exponent = 12, falloff_distance = 1, channel = CHANNEL_SURGERY_SOUNDS)
+
+/datum/surgery_step/proc/play_success_sound(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ if(!success_sound || ismachineperson(target))
+ return
+ playsound(get_turf(target), success_sound, 75, TRUE, falloff_exponent = 12, falloff_distance = 1, channel = CHANNEL_SURGERY_SOUNDS)
+
+/datum/surgery_step/proc/play_failure_sound(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ if(!failure_sound || ismachineperson(target))
+ return
+ playsound(get_turf(target), failure_sound, 75, TRUE, falloff_exponent = 12, falloff_distance = 1, channel = CHANNEL_SURGERY_SOUNDS)
diff --git a/code/modules/tgui/modules/atmos_control.dm b/code/modules/tgui/modules/atmos_control.dm
index 25fdb0e12bb5..e397eefc9626 100644
--- a/code/modules/tgui/modules/atmos_control.dm
+++ b/code/modules/tgui/modules/atmos_control.dm
@@ -1,5 +1,7 @@
/datum/ui_module/atmos_control
name = "Atmospherics Control"
+ var/parent_area_type
+ var/z_level
/datum/ui_module/atmos_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
@@ -28,7 +30,15 @@
)
/datum/ui_module/atmos_control/ui_data(mob/user)
+ var/list/alarms_on_net = GLOB.air_alarms
+ // default value means main station atmos control
+ if(parent_area_type)
+ alarms_on_net = list()
+ for(var/obj/machinery/alarm/air_alarm in GLOB.air_alarms)
+ if(air_alarm.alarm_area.type in typesof(parent_area_type))
+ alarms_on_net |= air_alarm
+
var/list/data = list()
- data["alarms"] = GLOB.air_alarm_repository.air_alarm_data(GLOB.air_alarms, target_z=level_name_to_num(MAIN_STATION))
+ data["alarms"] = GLOB.air_alarm_repository.air_alarm_data(alarms_on_net, target_z = z_level)
return data
diff --git a/code/modules/tgui/tgui_input/list_input.dm b/code/modules/tgui/tgui_input/list_input.dm
index f43ceffdaafa..e037b595fac6 100644
--- a/code/modules/tgui/tgui_input/list_input.dm
+++ b/code/modules/tgui/tgui_input/list_input.dm
@@ -73,6 +73,8 @@
var/datum/ui_state/state
/// Whether the tgui list input is invalid or not (i.e. due to all list entries being null)
var/invalid = FALSE
+ /// The TGUI modal to use for this popup
+ var/modal_type = "ListInputModal"
/datum/tgui_list_input/New(mob/user, message, title, list/items, default, timeout, ui_state)
src.title = title
@@ -122,7 +124,7 @@
/datum/tgui_list_input/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, "ListInputModal")
+ ui = new(user, src, modal_type)
ui.set_autoupdate(FALSE)
ui.open()
@@ -152,9 +154,8 @@
switch(action)
if("submit")
- if(!(params["entry"] in items))
+ if(!handle_submit_action(params))
return
- set_choice(items_map[params["entry"]])
closed = TRUE
SStgui.close_uis(src)
return TRUE
@@ -163,5 +164,12 @@
SStgui.close_uis(src)
return TRUE
+
+/datum/tgui_list_input/proc/handle_submit_action(params)
+ if(!(params["entry"] in items))
+ return FALSE
+ set_choice(items_map[params["entry"]])
+ return TRUE
+
/datum/tgui_list_input/proc/set_choice(choice)
src.choice = choice
diff --git a/code/modules/tgui/tgui_input/ranked_list_input.dm b/code/modules/tgui/tgui_input/ranked_list_input.dm
new file mode 100644
index 000000000000..80631d568236
--- /dev/null
+++ b/code/modules/tgui/tgui_input/ranked_list_input.dm
@@ -0,0 +1,56 @@
+/**
+ * Creates a TGUI input list window and returns the user's response.
+ *
+ * This proc should be used to create alerts that the caller will wait for a response from.
+ * Arguments:
+ * * user - The user to show the input box to.
+ * * message - The content of the input box, shown in the body of the TGUI window.
+ * * title - The title of the input box, shown on the top of the TGUI window.
+ * * items - The options that can be chosen by the user, each string is assigned a button on the UI.
+ * * default - If an option is already preselected on the UI. Current values, etc.
+ * * timeout - The timeout of the input box, after which the menu will close and qdel itself. Set to zero for no timeout.
+ */
+/proc/tgui_input_ranked_list(mob/user, message, title = "Select", list/items, default, timeout = 0, ui_state = GLOB.always_state)
+ if(!user)
+ user = usr
+
+ if(!length(items))
+ CRASH("[user] tried to open an empty TGUI Input List. Contents are: [items]")
+
+ if(!istype(user))
+ if(!isclient(user))
+ CRASH("We passed something that wasn't a user/client in a TGUI Input List! The passed user was [user]!")
+ var/client/client = user
+ user = client.mob
+
+ if(isnull(user.client))
+ return
+
+ // We don't support disabled TGUI input (PREFTOGGLE_2_DISABLE_TGUI_INPUT), get with the times old man
+
+ var/datum/tgui_list_input/ranked/input = new(user, message, title, items, default, timeout, ui_state)
+
+ if(input.invalid)
+ qdel(input)
+ return
+
+ input.ui_interact(user)
+ input.wait()
+ if(input)
+ . = input.choice
+ qdel(input)
+
+/**
+ * # tgui_list_input/ranked
+ *
+ * Datum used for allowing a user to sort a TGUI-controlled list input that prompts the user with
+ * a message and shows a list of rankable options
+ */
+/datum/tgui_list_input/ranked
+ modal_type = "RankedListInputModal"
+
+/datum/tgui_list_input/ranked/handle_submit_action(params)
+ if(!lists_equal_unordered(params["entry"], items))
+ return FALSE
+ set_choice(params["entry"])
+ return TRUE
diff --git a/code/modules/tgui/tgui_panel/tgui_panel.dm b/code/modules/tgui/tgui_panel/tgui_panel.dm
index 9229de1da493..8478c219c9cf 100644
--- a/code/modules/tgui/tgui_panel/tgui_panel.dm
+++ b/code/modules/tgui/tgui_panel/tgui_panel.dm
@@ -68,7 +68,7 @@
*/
/datum/tgui_panel/proc/on_initialize_timed_out()
// Currently does nothing but sending a message to old chat.
- SEND_TEXT(client, "Failed to load fancy chat, click HERE to attempt to reload it.")
+ SEND_TEXT(client, "Failed to load fancy chat, click HERE to attempt to reload it.")
/**
* private
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 400eae48171e..8f7f9c7d318d 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -24,6 +24,7 @@
#include "spawn_humans.dm"
#include "spell_targeting_test.dm"
#include "sql.dm"
+#include "status_effect_ids.dm"
#include "subsystem_init.dm"
#include "subsystem_metric_sanity.dm"
#include "test_runner.dm"
diff --git a/code/modules/unit_tests/status_effect_ids.dm b/code/modules/unit_tests/status_effect_ids.dm
new file mode 100644
index 000000000000..febe085e1c7b
--- /dev/null
+++ b/code/modules/unit_tests/status_effect_ids.dm
@@ -0,0 +1,8 @@
+/datum/unit_test/status_effect_ids/Run()
+ var/list/bad_statuses = list()
+ for(var/datum/status_effect/effect as anything in subtypesof(/datum/status_effect))
+ if(initial(effect.id) == null)
+ bad_statuses += effect
+
+ if(length(bad_statuses))
+ Fail("STatus effects found without an unique ID: [bad_statuses.Join(", ")]")
diff --git a/config/example/config.toml b/config/example/config.toml
index d3f666725390..47422b062196 100644
--- a/config/example/config.toml
+++ b/config/example/config.toml
@@ -185,7 +185,7 @@ ipc_screens = [
# Enable/disable the database on a whole
sql_enabled = false
# SQL version. If this is a mismatch, round start will be delayed
-sql_version = 592207
+sql_version = 602207
# SQL server address. Can be an IP or DNS name
sql_address = "127.0.0.1"
# SQL server port
diff --git a/docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md
index 4084cf286e70..af8bc67a6938 100644
--- a/docs/CODE_OF_CONDUCT.md
+++ b/docs/CODE_OF_CONDUCT.md
@@ -42,8 +42,7 @@ merged.
After a twenty four hour minimum waiting period, Pull Requests can be merged
once they receive approval from the relevant team. An exception is made for
-refactors and fixes, which may be merged by any member with commit access'
-discretion with no waiting period.
+refactors and fixes, which may be merged by any maintainer with no waiting period.
While normally provided, voting team members are not obligated to publicly state
their objections to a Pull Request. Attacking or berating a voting team member
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index b3b15a1ad335..db5fd2d0c0f5 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -123,8 +123,9 @@ Status of your pull request will be communicated via PR labels. This includes:
should never have this label
- `Status: Awaiting review` - This will be displayed when your PR has passed the
design vote and is now waiting for someone in the review team to approve it
-- `Status: Awaiting merge` - Your PR is done and is waiting for someone with
- commit access to merge it. **Note: Your PR may be delayed if it is pending
+- `Status: Awaiting merge` - Your PR is done and is waiting for a maintainer to merge it
+
+ **Note: Your PR may be delayed if it is pending
testmerge or in the mapping queue**
### Mapping Standards
@@ -132,26 +133,35 @@ Status of your pull request will be communicated via PR labels. This includes:
All PRs which modify maps are expected to follow all of our
[mapping requirements](./mapping/requirements.md).
-## Modifying MILLA
+## Modifying Rust Code
+
+Some parts of Paradise are written in [Rust][] for performance or reliability
+reasons:
-Our atmos engine, MILLA, is in the `milla/` directory. It's written in Rust for
-performance reasons, which means it's not compiled the same way as the rest of
-the code. If you're on Windows, you get a pre-built copy by default. If you're
-on Linux, you built one already to run the server.
+- Our atmos engine, MILLA, is in the `rust/src/milla/` directory.
+- The `mapmanip` library, an Aurora Station module used for automating DMM
+ modification, is in the `rust/src/mapmanip` library.
-If you make changes to MILLA, you'll want to rebuild. This will be very similar
-to RUSTG: https://github.com/ParadiseSS13/rust-g The only difference is that you
-run `cargo` from the `milla/` directory, and don't need to specify
-`--all-features` (though it doesn't hurt).
+The Rust parts of our codebase are compiled into a single library,
+separate from the rest of the code. If you're on Windows, you get a pre-built
+copy by default. If you're on Linux, you built one already to run the server.
+
+If you make changes to the Rust library, you'll want to rebuild. This will be
+very similar to [rust-g][]. The only difference is that you run `cargo` from the
+`rust/` directory, and don't need to specify `--all-features` (though it doesn't
+hurt).
The server will automatically detect that you have a local build, and use that
over the default Windows one.
-When you're ready to make a PR, please DO NOT modify `milla.dll` or
-`tools/ci/libmilla_ci.so`. Leave "Allow edits and access to secrets by
-maintainers" enabled, and post a comment on your PR saying `!build_milla`. A bot
+When you're ready to make a PR, please DO NOT modify `rustlibs.dll` or
+`tools/ci/librustlibs_ci.so`. Leave "Allow edits and access to secrets by
+maintainers" enabled, and post a comment on your PR saying `!build_rust`. A bot
will automatically build them for you and update your branch.
+[Rust]: https://www.rust-lang.org/
+[rust-g]: https://github.com/ParadiseSS13/rust-g
+
## Other Notes
- Bloated code may be necessary to add a certain feature, which means there has
@@ -180,11 +190,11 @@ will automatically build them for you and update your branch.
There are three roles on the GitHub:
- Headcoder
-- Commit Access
+- Maintainer
- Review Team
-Each role inherits the lower role's responsibilities (IE: Headcoders also have
-commit access, and members of commit access are also part of the review team)
+Each role inherits the lower role's responsibilities
+(IE: Headcoders are also maintainers, and maintainers are also part of the review team)
`Headcoders` are the overarching "administrators" of the repository. People
included in this role are:
@@ -195,7 +205,7 @@ included in this role are:
---
-`Commit Access` members have write access to the repository and can merge your
+`Maintainers` have write access to the repository and can merge your
PRs. People included in this role are:
- [AffectedArc07](https://github.com/AffectedArc07)
@@ -219,6 +229,7 @@ affect mergeability status. People included in this role are:
- [lewcc](https://github.com/lewcc)
- [Sirryan2002](https://github.com/Sirryan2002)
- [Warriorstar](https://github.com/warriorstar-orion)
+- [Wilkson](https://github.com/BiancaWilkson)
---
diff --git a/docs/contributing/reviewer.md b/docs/contributing/reviewer.md
index 96dede831cd0..c96d644de0a8 100644
--- a/docs/contributing/reviewer.md
+++ b/docs/contributing/reviewer.md
@@ -1,17 +1,17 @@
# Reviewer Crash Course
-by *Sirryan*
+by _Sirryan_
Hey everyone, I noticed some people were not sure how to approach reviewing PRs
so I figured I would write up a small guide on PR reviewing and how people like
-our Headcoders, commit access, Lewcc, S34N, and I all do our jobs. In addition
+our Headcoders, maintainers, Lewcc, S34N, and I all do our jobs. In addition
to some guidance and pointers on PR reviewing, I will also go over a few code
examples and point out code standard corrections and basic errors that
prospective reviewers can begin to start on.
## What is code review?
-> Code reviews act as quality assurance of the code base.... *and* can also act
+> Code reviews act as quality assurance of the code base.... _and_ can also act
> as a second step in identifying bugs, logic problems, or uncovered edge cases.
> [(source)](https://about.gitlab.com/topics/version-control/what-is-code-review/)
@@ -54,7 +54,7 @@ their own code and help you understand their intention and goals. Please note:
ITS IMPORTANT TO READ PR DESCRIPTIONS, you should not be reviewing a PR until
you know what it's actually attempting to do.
-**But Sirryan, that's not the *kind* of code review I'm interested in learning
+**But Sirryan, that's not the _kind_ of code review I'm interested in learning
about**. Yes, yes, I know, I'm getting there. While its important to understand
the conversation (and relationship-building) parts of code review, there's also
important technical parts to review that keep our codebase moving. Before
@@ -62,6 +62,7 @@ getting into HOW to code review, we will take a look at the two types of
technical code reviews.
## Comments
+
Basic comments are when a reviewer leaves a message, question, or directive for
the PR author at a certain code line or chunk. For example, SteelSlayer has left
a comment on Line 12 of `objective.dm` inquiring about a certain variable. The
@@ -73,6 +74,7 @@ issues to be addressed quickly and efficiently.
## Suggestions
+
Suggestions are when a reviewer suggests/requests a change to a certain line or
chunk of code. This leaves less agency for the PR author (especially when
suggested by a development team member or experienced reviewer) but allows for
@@ -85,6 +87,7 @@ most critical for enforcing code standards and making 1-5 line corrections.
## Leaving PR Reviews
+
The way you leave any form of comment or suggestion directly on a line or chunk
of code is under the "Files Changed" tab of the pull request. All you need to do
now is scroll down to a line of code that you want to comment on and hover over
@@ -111,6 +114,7 @@ reviews, you can submit them together in the top right of the files changes tab
once done.
## What can I start reviewing?
+
So you know what reviewing is, you know how to review, and you're ready to
review.... but what do you review? Knowledge of code and willingness to
understand our currently implemented systems is critically important to being
@@ -119,6 +123,7 @@ look out for on PR's to get familiarized with the code review process and get a
few reviews under your belt.
### Problematic Code Examples
+
Lets say a contributor has opened a pull request adding a brand-new item to the
game. This item has a few special functions and procs that you need to look
over. I will go through each part of this code that I would leave comments or
@@ -281,8 +286,8 @@ suggest to fix them as a PR reviewer.**
## The Art of Code
> ... I like it because I could make the computer do what I wanted and every
-> time I did that, I got this little thrill and this rush and throughout *my
-> entire career*. That thrill for me has never gone away [[The Art of Code - Dylan Beattie](https://www.youtube.com/watch?v=6avJHaC3C2U)]
+> time I did that, I got this little thrill and this rush and throughout _my
+> entire career_. That thrill for me has never gone away [[The Art of Code - Dylan Beattie](https://www.youtube.com/watch?v=6avJHaC3C2U)]
This segment might be a bit corny but I figured it would be important to include
because I felt like it was an important aspect of reviewing that I've always had
diff --git a/docs/mapping/images/mapmanip_contents.png b/docs/mapping/images/mapmanip_contents.png
new file mode 100644
index 000000000000..1db7e6b998a9
Binary files /dev/null and b/docs/mapping/images/mapmanip_contents.png differ
diff --git a/docs/mapping/images/mapmanip_error.png b/docs/mapping/images/mapmanip_error.png
new file mode 100644
index 000000000000..7b7a7608f4ca
Binary files /dev/null and b/docs/mapping/images/mapmanip_error.png differ
diff --git a/docs/mapping/images/mapmanip_inplace.png b/docs/mapping/images/mapmanip_inplace.png
new file mode 100644
index 000000000000..bdc7eb4d5e5c
Binary files /dev/null and b/docs/mapping/images/mapmanip_inplace.png differ
diff --git a/docs/mapping/images/mapmanip_markers.png b/docs/mapping/images/mapmanip_markers.png
new file mode 100644
index 000000000000..d1d732b219cc
Binary files /dev/null and b/docs/mapping/images/mapmanip_markers.png differ
diff --git a/docs/mapping/images/mapmanip_noops1.png b/docs/mapping/images/mapmanip_noops1.png
new file mode 100644
index 000000000000..229c744fed93
Binary files /dev/null and b/docs/mapping/images/mapmanip_noops1.png differ
diff --git a/docs/mapping/images/mapmanip_noops2.png b/docs/mapping/images/mapmanip_noops2.png
new file mode 100644
index 000000000000..73dfe22290fd
Binary files /dev/null and b/docs/mapping/images/mapmanip_noops2.png differ
diff --git a/docs/mapping/images/mapmanip_noops3.png b/docs/mapping/images/mapmanip_noops3.png
new file mode 100644
index 000000000000..f858899c8795
Binary files /dev/null and b/docs/mapping/images/mapmanip_noops3.png differ
diff --git a/docs/mapping/images/mapmanip_noops4.png b/docs/mapping/images/mapmanip_noops4.png
new file mode 100644
index 000000000000..7556a52eeb7a
Binary files /dev/null and b/docs/mapping/images/mapmanip_noops4.png differ
diff --git a/docs/mapping/images/mapmanip_results.png b/docs/mapping/images/mapmanip_results.png
new file mode 100644
index 000000000000..8279a034da6e
Binary files /dev/null and b/docs/mapping/images/mapmanip_results.png differ
diff --git a/docs/mapping/submaps.md b/docs/mapping/submaps.md
new file mode 100644
index 000000000000..97168a1b0d86
--- /dev/null
+++ b/docs/mapping/submaps.md
@@ -0,0 +1,181 @@
+# Guide to Submaps
+
+> [!NOTE]
+>
+> This guide was originally written by developer Dreamix for Aurora Station, the
+> original codebase the `mapmanip` library was written in. Despite the difference
+> in appearance of the screenshots, the guide is still applicable.
+
+Submaps are a mechanism to allow copy-pasting parts of maps (submaps) into other
+maps, implemented with the `mapmanip` library. `mapmanip` is a library for map
+manipulation, and happens before the map is actually loaded by the server. This
+is implemented using Rust, instead of DM code. Map manipulations are configured
+and defined by adding a `.jsonc` file corresponding to a `.dmm` map. Currently,
+the only available map manipulation is submap extraction/insertion.
+
+## But Why
+
+This allows for adding variations to maps, beyond just using `/obj/random/...`
+items. Variations of bigger parts of maps, like, for example, whole rooms. Or
+even whole layouts, making it so a map looks different every time it is visited.
+
+## How To Do It
+
+1. Firstly, define two markers for each submap. The types need to be unique, and
+ the types are used later to define where to extract the submap from, and where
+ to insert it. Here, we want to add some variation to the small warehouse storage
+ room.
+
+ ```dm
+ /obj/effect/map_effect/marker/mapmanip/submap/extract/station/boxstation/warehouse_small_storage
+ name = "Boxstation, Cargo Warehouse Small Storage"
+
+ /obj/effect/map_effect/marker/mapmanip/submap/insert/station/boxstation/warehouse_small_storage
+ name = "Boxstation, Cargo Warehouse Small Storage"
+ ```
+
+2. Figure out the area that the submap will be inserted into on the map, and add
+ the insert marker there. In this case the map is
+ `maps/stations/boxstation.dmm`, and the size of that area is 3x5
+ tiles, being the little side warehouse. Here, we want the submaps to only be the
+ "cargo" or "contents" of the warehouse. So this room is already fully
+ functional, with lights, cameras, pipes, etc. Do note that the "submap edge"
+ helper markers are just visual helpers, and they have no function.
+
+ 
+
+3. Create a new map file that will contain the submap variants to extract from.
+ In this case it is `maps/stations/submaps/warehouse_small_storage.dmm`.
+ Add all the possible variants here, each having the same extract marker. They
+ must all be the chosen size, in this case being 3x5 tiles. We want the submaps
+ to only contain "cargo" or "contents" of the warehouse, so both the turf and
+ area are set to "noop". How are "noop" areas and turfs handled, see the next
+ part of this guide.
+
+ 
+
+4. Create the mapmanip configuration file, that will actually define the map
+ manipulation, and make it happen. In this case it is
+ `maps/stations/boxstation.jsonc`. Do notice how the path and
+ name of this config file is exactly the same as of the map
+ `.../boxstation.dmm`, just with a different extension. Each
+ submap manipulation has these vars defined:
+
+ - `type` - Map manipulation type. For submap manipulations it is "SubmapExtractInsert".
+ - `submap_size_...` - Size of the submap, width and height.
+ - `submaps_dmm` - This is the relative path to the DMM file containing the
+ submaps. Relative, meaning to the `.dmm` that is being loaded. In this
+ case, it is put in a separate folder for better organization, but it could
+ be in the same folder as the `.dmm` file that is being manipulated.
+ - `marker_...` - Typepaths to the insert and extract markers, as defined in
+ the first step of this guide, and as added into the maps in step two and
+ three.
+ - `submaps_can_repeat` - Decides whether submaps can repeat when inserting
+ them into different places on the map. If there are more extract markers
+ than insert markers, it is safe to set it to `true`. Otherwise it should
+ be `false`, or else there may not be enough submaps to insert, and map
+ manipulation will fail.
+
+ ```json
+ [
+ {
+ // Boxstation warehouse, intended for randomized items
+ "type": "SubmapExtractInsert",
+ "submap_size_x": 3,
+ "submap_size_y": 5,
+ "submaps_dmm": "stations/submaps/warehouse_small_storage.dmm",
+ "marker_extract": "/obj/effect/map_effect/marker/mapmanip/submap/extract/station/boxstation/warehouse_small_storage",
+ "marker_insert": "/obj/effect/map_effect/marker/mapmanip/submap/insert/station/boxstation/warehouse_small_storage",
+ "submaps_can_repeat": true // doesn't matter, as there's only one insert marker
+ }
+ ]
+ ```
+
+5. Run the server locally and observe the results.
+
+ 
+
+## Areas and Turfs
+
+Areas and turfs, and specifically their "noop" types, have special meaning in
+submap manipulation. They determine whether the submap manipulation is more like
+"replacing" or "appending". The "noop" (short for "no-operation") types for
+turfs is `/turf/template_noop`, and for areas it is `/area/template_noop`.
+
+If neither area nor turf are noop: submap tile atoms replace map tile atoms
+entirely, including turf and area. This could be used for submaps that are fully
+functional rooms, like a medbay submap and a brig submap, with their own areas
+defined in their submaps.
+
+
+
+If both area and turf are noop: All atoms on a submap tile are inserted/appended
+into the map tile, with the exception for area and turf. This can be used for
+places like a warehouse, where only the actual cargo is in submaps, and on the
+map the warehouse is fully functional and implemented (just empty).
+
+
+
+If only turf is noop, while area is non-noop: All atoms are inserted/appended
+into the map tile, but the resulting area used is of the submap tile.
+Admittedly, I cannot think of a good use case for this specific feature, but I
+am including it here for completeness.
+
+
+
+If only area is noop, while turf is non-noop: Submap tile atoms replace map tile
+atoms entirely, with the exception of area - resulting area is of the map, not
+the submap. This could be used to have different warehouses that use the same
+submaps, in different parts of a station or outpost, and so using different
+areas.
+
+
+
+## Errors and Debugging
+
+If a map manipulation fails, it should do both these things:
+
+- Return `null`, and in that case the map is loaded without any map
+ manipulations, as a fallback.
+- Generate a stack trace, that can be caught. To do so, must run with debugging,
+ and have breakpoints on runtime errors. It should show a stack trace like
+ below, with information about what happened.
+
+ 
+
+## Other Notes
+
+- The `.jsonc` config file is using the JSONC format, which is a bit strict to
+ how it should look, and especially cares about commas. JSONC is "JSON with
+ comments". Exactly the same as JSON, with the only difference being that it
+ allows `// comments`.
+
+- There may be multiple different submap insert/extract manipulations defined
+ for one map. Every submap manipulation is going to require its own set of
+ markers. In that case the `.jsonc` would look roughly like this.
+
+ 
+
+- If a map has multiple submap operations defined, they can be all in the same
+ submap dmm file, or can be in different ones. They can also be in the same
+ folder as the main map, or in some subfolder. Use whatever is best for
+ organization.
+
+- Submaps can be "recursive", where a submap may contain a insert marker for
+ another submap. The contained submaps won't be automatically inserted,
+ however, and they still require their own manipulations in the config.
+
+## Possible Uses
+
+- Warehouse with different cargo every round. One round it could be empty,
+ another it could have a few crates with guns and armor, another time it could
+ be full of building materials.
+- Armory with a few different possible loadouts. One with lots of weak SMGs and
+ strong armor, another variant with just a few strong rifles and weak armor.
+- Big crew quarters with 20 rooms, but randomly filled with submaps with only 5 variants.
+- Hallway on a planetary outpost with one variant where it is fine and "normal",
+ and another variant where it is blocked by some rocks, forcing people to find
+ another way through.
+- Alternative possible layouts for the whole map, where rooms and departments
+ are in different places every round.
+- The sky is the limit, literally.
diff --git a/docs/references/feedback_data.md b/docs/references/feedback_data.md
index 4c94ce915371..c129a9397658 100644
--- a/docs/references/feedback_data.md
+++ b/docs/references/feedback_data.md
@@ -25,12 +25,12 @@ Examples of bad things to record:
base game design around"
Also note that feedback data **must** be anonymous. The only exception here is
-for data *anyone* on the server can see, such as round end antagonist reports.
+for data _anyone_ on the server can see, such as round end antagonist reports.
## Feedback Data Recording
-Feedback data can be recorded in 5 formats. `amount`, `associative`, `nested
-tally`, `tally` and `text`.
+Feedback data can be recorded in 7 formats. `amount`, `associative`,
+`nested tally`, `tally` `text`, `ledger`, and `nested ledger`.
### Amount
@@ -76,18 +76,18 @@ Will produce the following JSON:
```json
{
- "data": {
- "1": {
- "text": "example",
- "path": "/obj/item",
- "number": "4"
- },
- "2": {
- "number": "7",
- "text": "example",
- "other text": "sample"
- }
- }
+ "data": {
+ "1": {
+ "text": "example",
+ "path": "/obj/item",
+ "number": "4"
+ },
+ "2": {
+ "number": "7",
+ "text": "example",
+ "other text": "sample"
+ }
+ }
}
```
@@ -122,29 +122,29 @@ Will produce the following JSON:
```json
{
- "data":{
- "fruit":{
- "orange":{
- "apricot":4,
- "orange":2
- },
- "red":{
- "apple":10
- }
- },
- "vegetable":{
- "orange":{
- "carrot":1
- }
- }
- }
+ "data": {
+ "fruit": {
+ "orange": {
+ "apricot": 4,
+ "orange": 2
+ },
+ "red": {
+ "apple": 10
+ }
+ },
+ "vegetable": {
+ "orange": {
+ "carrot": 1
+ }
+ }
+ }
}
```
-#### NOTE
+!!! note
-Tracking values associated with a number can't merge with a nesting value,
-trying to do so will append the list
+ Tracking values associated with a number can't merge with a nesting value,
+ trying to do so will append to the list.
```dm
SSblackbox.record_feedback("nested tally", "example", 3, list("fruit", "orange"))
@@ -154,23 +154,23 @@ Will produce the following JSON:
```json
{
- "data":{
- "fruit":{
- "orange":{
- "apricot":4,
- "orange":2
- },
- "red":{
- "apple":10
- },
- "orange":3
- },
- "vegetable":{
- "orange":{
- "carrot":1
- }
- }
- }
+ "data": {
+ "fruit": {
+ "orange": {
+ "apricot": 4,
+ "orange": 2
+ },
+ "red": {
+ "apple": 10
+ },
+ "orange": 3
+ },
+ "vegetable": {
+ "orange": {
+ "carrot": 1
+ }
+ }
+ }
}
```
@@ -194,10 +194,10 @@ Will produce the following JSON:
```json
{
- "data":{
- "sample data":5,
- "other data":2
- }
+ "data": {
+ "sample data": 5,
+ "other data": 2
+ }
}
```
@@ -218,10 +218,7 @@ Will produce the following JSON:
```json
{
- "data":[
- "sample text",
- "other text"
- ]
+ "data": ["sample text", "other text"]
}
```
@@ -230,6 +227,131 @@ instead of a list with duplicates. Also take note how the `increment` parameter
is not used here. It does nothing to the data, and `1` is used just as the value
for consistency.
+### Ledger
+
+!!! warning
+
+ The `ledger` and `nested ledger` feedback types should only be used as a
+ last resort. The primary intent of the blackbox system is to track the
+ number of times something has happened. It is extremely rare that one should
+ require the granularity provided by these feedback types accumulating
+ multiple discrete statistics on a single row. They are provided as an escape
+ hatch for unusual situations, and to avoid unnecessary repetition of text in
+ the JSON.
+
+`ledger` is used for appending entries to a record. It is effectively the same
+as `tally`, except instead of adding the value to the existing one, it stores
+the value of each call in a list. This is useful for situations where you have a
+specific key for which you'd like to store a unique value for each time the key
+is used in feedback. For example, if the clown puts on multiple comedy shows and
+you want to record the attendance for each one:
+
+```dm
+SSblackbox.record_feedback("ledger", "tickets_sold_per_show", 15, "general_admission")
+SSblackbox.record_feedback("ledger", "tickets_sold_per_show", 5, "front_row")
+SSblackbox.record_feedback("ledger", "tickets_sold_per_show", 20, "general_admission")
+SSblackbox.record_feedback("ledger", "tickets_sold_per_show", 2, "front_row")
+```
+
+Will produce the following JSON:
+
+```json
+{
+ "data": {
+ "tickets_sold_per_show": {
+ "general_admission": [15, 20],
+ "front_row": [5, 2]
+ }
+ }
+}
+```
+
+Note that items here may be text. Unlike the `text` feedback type, items are added in order and duplicates are permitted.
+
+```dm
+SSblackbox.record_feedback("ledger", "menu_items", "fried eggs", "breakfast")
+SSblackbox.record_feedback("ledger", "menu_items", "coffee", "breakfast")
+SSblackbox.record_feedback("ledger", "menu_items", "hamburgers", "lunch")
+SSblackbox.record_feedback("ledger", "menu_items", "french fries", "lunch")
+```
+
+Will produce the following JSON:
+
+```json
+{
+ "data": {
+ "breakfast": ["fried eggs", "coffee"],
+ "lunch": ["hamburgers", "french fries"]
+ }
+}
+```
+
+### Nested Ledger
+
+`nested ledger` uses the logic of `nested tally`, except instead of adding the value to the last element, it uses the last element as the tracking key for a list of items, appending each one. For example, if you wanted to store individual crew ratings for meals made by different chefs:
+
+```dm
+SSblackbox.record_feedback("nested ledger", "meal_ratings", 5, list("Chef Marceau", "hamburger"))
+SSblackbox.record_feedback("nested ledger", "meal_ratings", 2, list("Chef Marceau", "hamburger"))
+SSblackbox.record_feedback("nested ledger", "meal_ratings", 1, list("Chef Poincare", "hamburger"))
+SSblackbox.record_feedback("nested ledger", "meal_ratings", 3, list("Chef Poincare", "hamburger"))
+```
+
+Will produce the following JSON:
+
+```json
+{
+ "data": {
+ "Chef Marceau": { "hamburger": [5, 2] },
+ "Chef Poincare": { "hamburger": [1, 3] }
+ }
+}
+```
+
+As with `ledger`, text values may be accumulated in this manner.
+
+### Appropriate use of `ledger`
+
+If one were tracking the individual center coordinates of each ruin placed, and
+the same ruin may be placed more thanonce, use of the `associative` feedback
+type may result in this implementation:
+
+```dm
+var/coord_string = "[central_turf.x],[central_turf.y],[central_turf.z]"
+SSblackbox.record_feedback("associative", "ruin_placement", 1, list(
+ "map" = map_filename,
+ "coords" = coord_string
+))
+```
+
+returning the following JSON:
+
+```json
+{
+ "data": {
+ "1": { "map": "listeningpost.dmm", "coords": "127,169,5" },
+ "2": { "map": "listeningpost.dmm", "coords": "64,134,4" }
+ }
+}
+```
+
+This creates unnecessary repetition of the map name, as well as the `"map"` and `"coords"` keys. As well, the numeric keys associated with each row are meaningless. Using `ledger` may transform this into:
+
+```dm
+var/coord_string = "[central_turf.x],[central_turf.y],[central_turf.z]"
+SSblackbox.record_feedback("ledger", "ruin_placement", coord_string, map_filename)
+```
+
+returning the following JSON:
+
+```json
+{
+ "data": {
+ "listeningpost.dmm": ["127,169,5", "64,134,4"]
+ }
+}
+```
+
## Feedback Versioning
If the logging content (i.e.: What data is logged) for a variable is ever
diff --git a/icons/_nanomaps/Cyberiad220_nanomap_z1.png b/icons/_nanomaps/Cyberiad220_nanomap_z1.png
index 329a9f41ad84..be7faca085e1 100644
Binary files a/icons/_nanomaps/Cyberiad220_nanomap_z1.png and b/icons/_nanomaps/Cyberiad220_nanomap_z1.png differ
diff --git a/icons/_nanomaps/Cyberiad_nanomap_z1.png b/icons/_nanomaps/Cyberiad_nanomap_z1.png
index 0dfa15c98903..72984d0eff04 100644
Binary files a/icons/_nanomaps/Cyberiad_nanomap_z1.png and b/icons/_nanomaps/Cyberiad_nanomap_z1.png differ
diff --git a/icons/_nanomaps/Delta220_nanomap_z1.png b/icons/_nanomaps/Delta220_nanomap_z1.png
index d46650bb65ba..ff6afa9746bf 100644
Binary files a/icons/_nanomaps/Delta220_nanomap_z1.png and b/icons/_nanomaps/Delta220_nanomap_z1.png differ
diff --git a/icons/_nanomaps/Delta_nanomap_z1.png b/icons/_nanomaps/Delta_nanomap_z1.png
index 4a7639246ba0..b7089bf344e0 100644
Binary files a/icons/_nanomaps/Delta_nanomap_z1.png and b/icons/_nanomaps/Delta_nanomap_z1.png differ
diff --git a/icons/effects/beam.dmi b/icons/effects/beam.dmi
index 71eb30617c32..7bd1e5397130 100644
Binary files a/icons/effects/beam.dmi and b/icons/effects/beam.dmi differ
diff --git a/icons/effects/beam_splash.dmi b/icons/effects/beam_splash.dmi
new file mode 100644
index 000000000000..d7deb3e9275c
Binary files /dev/null and b/icons/effects/beam_splash.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 59f096c94316..54528f607ee9 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/exposures.dmi b/icons/effects/exposures.dmi
index 13f976ceb9d6..1560835049e5 100644
Binary files a/icons/effects/exposures.dmi and b/icons/effects/exposures.dmi differ
diff --git a/icons/effects/map_effects_96x96.dmi b/icons/effects/map_effects_96x96.dmi
new file mode 100644
index 000000000000..fa0c418f3740
Binary files /dev/null and b/icons/effects/map_effects_96x96.dmi differ
diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi
index d22a0eb914c3..4fcf4dbf0a8e 100644
Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ
diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi
index 325fb1ae5e09..993e5aa9a249 100644
Binary files a/icons/effects/random_spawners.dmi and b/icons/effects/random_spawners.dmi differ
diff --git a/icons/effects/spawner_icons.dmi b/icons/effects/spawner_icons.dmi
index 1b9730e53796..0417843bf621 100644
Binary files a/icons/effects/spawner_icons.dmi and b/icons/effects/spawner_icons.dmi differ
diff --git a/icons/goonstation/objects/pda_overlay.dmi b/icons/goonstation/objects/pda_overlay.dmi
index 7c4fa677eb5a..3b5068e1303a 100644
Binary files a/icons/goonstation/objects/pda_overlay.dmi and b/icons/goonstation/objects/pda_overlay.dmi differ
diff --git a/icons/mecha/mech_construct.dmi b/icons/mecha/mech_construct.dmi
index fe81a8e2b96c..3ac2bc928f82 100644
Binary files a/icons/mecha/mech_construct.dmi and b/icons/mecha/mech_construct.dmi differ
diff --git a/icons/mecha/mech_construction.dmi b/icons/mecha/mech_construction.dmi
index e89db4ff9adb..f00b27e101c1 100644
Binary files a/icons/mecha/mech_construction.dmi and b/icons/mecha/mech_construction.dmi differ
diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi
index 28b04958109b..ea0d7391cc65 100644
Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ
diff --git a/icons/mecha/mecha_equipment.dmi b/icons/mecha/mecha_equipment.dmi
index 50c0338d8315..f26012f32596 100644
Binary files a/icons/mecha/mecha_equipment.dmi and b/icons/mecha/mecha_equipment.dmi differ
diff --git a/icons/mob/actions/actions_mod.dmi b/icons/mob/actions/actions_mod.dmi
index faef21cd4c72..f4217c872874 100644
Binary files a/icons/mob/actions/actions_mod.dmi and b/icons/mob/actions/actions_mod.dmi differ
diff --git a/icons/mob/alien.dmi b/icons/mob/alien.dmi
index abbbc2b7d2a9..6f74879c7a95 100644
Binary files a/icons/mob/alien.dmi and b/icons/mob/alien.dmi differ
diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi
index 0d669c5831cd..e72a728175b8 100644
Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 1ad1058c2600..5ca919a9b329 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/modsuit/species/vox_modsuits.dmi b/icons/mob/clothing/modsuit/species/vox_modsuits.dmi
index 51062b33f4b5..0897e30a17e8 100644
Binary files a/icons/mob/clothing/modsuit/species/vox_modsuits.dmi and b/icons/mob/clothing/modsuit/species/vox_modsuits.dmi differ
diff --git a/icons/mob/clothing/species/drask/under/color.dmi b/icons/mob/clothing/species/drask/under/color.dmi
index 50da6be897ff..c91b1131eae7 100644
Binary files a/icons/mob/clothing/species/drask/under/color.dmi and b/icons/mob/clothing/species/drask/under/color.dmi differ
diff --git a/icons/mob/clothing/species/drask/under/misc.dmi b/icons/mob/clothing/species/drask/under/misc.dmi
index f0ccad809bf6..cb74beea95b1 100644
Binary files a/icons/mob/clothing/species/drask/under/misc.dmi and b/icons/mob/clothing/species/drask/under/misc.dmi differ
diff --git a/icons/mob/clothing/species/grey/under/color.dmi b/icons/mob/clothing/species/grey/under/color.dmi
index 4e3ae9b67339..e286752d6599 100644
Binary files a/icons/mob/clothing/species/grey/under/color.dmi and b/icons/mob/clothing/species/grey/under/color.dmi differ
diff --git a/icons/mob/clothing/species/grey/underwear.dmi b/icons/mob/clothing/species/grey/underwear.dmi
index 217c7fdfb3b3..372137a3c69c 100644
Binary files a/icons/mob/clothing/species/grey/underwear.dmi and b/icons/mob/clothing/species/grey/underwear.dmi differ
diff --git a/icons/mob/clothing/species/kidan/gloves.dmi b/icons/mob/clothing/species/kidan/gloves.dmi
index 61c77fe0e7f5..a6fe5c50b1b8 100644
Binary files a/icons/mob/clothing/species/kidan/gloves.dmi and b/icons/mob/clothing/species/kidan/gloves.dmi differ
diff --git a/icons/mob/clothing/species/kidan/under/color.dmi b/icons/mob/clothing/species/kidan/under/color.dmi
index babe2b8fcf1c..b9548a7d3d9f 100644
Binary files a/icons/mob/clothing/species/kidan/under/color.dmi and b/icons/mob/clothing/species/kidan/under/color.dmi differ
diff --git a/icons/mob/clothing/species/kidan/underwear.dmi b/icons/mob/clothing/species/kidan/underwear.dmi
index 9bf4c06c22af..89b9c68c3749 100644
Binary files a/icons/mob/clothing/species/kidan/underwear.dmi and b/icons/mob/clothing/species/kidan/underwear.dmi differ
diff --git a/icons/mob/clothing/species/vox/under/color.dmi b/icons/mob/clothing/species/vox/under/color.dmi
index 99c31857f3ee..82303ac4d400 100644
Binary files a/icons/mob/clothing/species/vox/under/color.dmi and b/icons/mob/clothing/species/vox/under/color.dmi differ
diff --git a/icons/mob/clothing/species/vox/underwear.dmi b/icons/mob/clothing/species/vox/underwear.dmi
index 1d8a7873d376..72da557c997c 100644
Binary files a/icons/mob/clothing/species/vox/underwear.dmi and b/icons/mob/clothing/species/vox/underwear.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index b72165ac3c74..fcbd77823588 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/under/color.dmi b/icons/mob/clothing/under/color.dmi
index 9ed1fc55cc59..633488f11cc1 100644
Binary files a/icons/mob/clothing/under/color.dmi and b/icons/mob/clothing/under/color.dmi differ
diff --git a/icons/mob/clothing/under/misc.dmi b/icons/mob/clothing/under/misc.dmi
index d6c57b179932..b090f2cd3cf1 100644
Binary files a/icons/mob/clothing/under/misc.dmi and b/icons/mob/clothing/under/misc.dmi differ
diff --git a/icons/mob/clothing/underwear.dmi b/icons/mob/clothing/underwear.dmi
index d3223ee75a31..e16e5bb4d5f7 100644
Binary files a/icons/mob/clothing/underwear.dmi and b/icons/mob/clothing/underwear.dmi differ
diff --git a/icons/mob/inhands/religion_lefthand.dmi b/icons/mob/inhands/religion_lefthand.dmi
index c4338544e5d4..d866505d0753 100644
Binary files a/icons/mob/inhands/religion_lefthand.dmi and b/icons/mob/inhands/religion_lefthand.dmi differ
diff --git a/icons/mob/inhands/religion_righthand.dmi b/icons/mob/inhands/religion_righthand.dmi
index 4603a803fdd0..b60de5043166 100644
Binary files a/icons/mob/inhands/religion_righthand.dmi and b/icons/mob/inhands/religion_righthand.dmi differ
diff --git a/icons/mob/screen_ai.dmi b/icons/mob/screen_ai.dmi
index a85564d85965..989f62e68d05 100644
Binary files a/icons/mob/screen_ai.dmi and b/icons/mob/screen_ai.dmi differ
diff --git a/icons/mob/screen_midnight.dmi b/icons/mob/screen_midnight.dmi
index f1a82e36245d..ad82f1280802 100644
Binary files a/icons/mob/screen_midnight.dmi and b/icons/mob/screen_midnight.dmi differ
diff --git a/icons/mob/screen_operative.dmi b/icons/mob/screen_operative.dmi
index 3645c91aea5b..e0ace87e5d1a 100644
Binary files a/icons/mob/screen_operative.dmi and b/icons/mob/screen_operative.dmi differ
diff --git a/icons/mob/screen_plasmafire.dmi b/icons/mob/screen_plasmafire.dmi
index 3e22531ad769..da228456ee45 100644
Binary files a/icons/mob/screen_plasmafire.dmi and b/icons/mob/screen_plasmafire.dmi differ
diff --git a/icons/mob/screen_retro.dmi b/icons/mob/screen_retro.dmi
index a7ffcad04fa2..3fa0025ab7bc 100644
Binary files a/icons/mob/screen_retro.dmi and b/icons/mob/screen_retro.dmi differ
diff --git a/icons/mob/screen_slimecore.dmi b/icons/mob/screen_slimecore.dmi
index 42f79c6dde7c..2e261c40cf3e 100644
Binary files a/icons/mob/screen_slimecore.dmi and b/icons/mob/screen_slimecore.dmi differ
diff --git a/icons/mob/screen_white.dmi b/icons/mob/screen_white.dmi
index 82854f531846..8b444e12e2a8 100644
Binary files a/icons/mob/screen_white.dmi and b/icons/mob/screen_white.dmi differ
diff --git a/icons/mob/simple_human.dmi b/icons/mob/simple_human.dmi
index f9d20142d74f..93e03c30a40c 100644
Binary files a/icons/mob/simple_human.dmi and b/icons/mob/simple_human.dmi differ
diff --git a/icons/obj/bodybag.dmi b/icons/obj/bodybag.dmi
index 23ee9f7fe0e2..ed3b0f79b167 100644
Binary files a/icons/obj/bodybag.dmi and b/icons/obj/bodybag.dmi differ
diff --git a/icons/obj/boxes.dmi b/icons/obj/boxes.dmi
index a9f0326fc752..e0c018cb6d63 100644
Binary files a/icons/obj/boxes.dmi and b/icons/obj/boxes.dmi differ
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index 7ee905462de2..632bde3b53aa 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 7b15e3ba1f9d..f8361b867980 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/under/color.dmi b/icons/obj/clothing/under/color.dmi
index 2c51ac4a39f9..8b375da0e675 100644
Binary files a/icons/obj/clothing/under/color.dmi and b/icons/obj/clothing/under/color.dmi differ
diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi
index 8c0188175caf..c11cef0cef1e 100644
Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index e54f4c4cca28..9d78a9877d0b 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/food/bakedgoods.dmi b/icons/obj/food/bakedgoods.dmi
index 967d54ae9689..4f738921fa5f 100644
Binary files a/icons/obj/food/bakedgoods.dmi and b/icons/obj/food/bakedgoods.dmi differ
diff --git a/icons/obj/food/breakfast.dmi b/icons/obj/food/breakfast.dmi
index 0d8cbc9bcbd3..ae5aff5037e6 100644
Binary files a/icons/obj/food/breakfast.dmi and b/icons/obj/food/breakfast.dmi differ
diff --git a/icons/obj/food/candy.dmi b/icons/obj/food/candy.dmi
index a58abc2e9d04..dd7acd3200bc 100644
Binary files a/icons/obj/food/candy.dmi and b/icons/obj/food/candy.dmi differ
diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi
index 224c8bfb9bf4..4ddb808bcd3f 100644
Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index f5388ee43454..d5a6a5c1f098 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi
index c92df9de7682..5a16fcbaee27 100644
Binary files a/icons/obj/food/soupsalad.dmi and b/icons/obj/food/soupsalad.dmi differ
diff --git a/icons/obj/guncabinet.dmi b/icons/obj/guncabinet.dmi
index bf5128e74161..ee54b131fbef 100644
Binary files a/icons/obj/guncabinet.dmi and b/icons/obj/guncabinet.dmi differ
diff --git a/icons/obj/hydroponics/growing_fruits.dmi b/icons/obj/hydroponics/growing_fruits.dmi
index 8d77be19157d..f01bec11fce3 100644
Binary files a/icons/obj/hydroponics/growing_fruits.dmi and b/icons/obj/hydroponics/growing_fruits.dmi differ
diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi
index 0a0965085415..ded1705672d1 100644
Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ
diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi
index a303e76a4db6..db4b781941c9 100644
Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ
diff --git a/icons/obj/lamps.dmi b/icons/obj/lamps.dmi
index e3f9fabb8454..29d8e21bc401 100644
Binary files a/icons/obj/lamps.dmi and b/icons/obj/lamps.dmi differ
diff --git a/icons/obj/legacy_closet.dmi b/icons/obj/legacy_closet.dmi
new file mode 100644
index 000000000000..79af106cc8fd
Binary files /dev/null and b/icons/obj/legacy_closet.dmi differ
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index a934d0a1df01..6d887c8114d5 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi
index 882a166680f1..1a772a813e47 100644
Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index 6b1120c01923..fb0edc51ba4f 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ
diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi
index c46385244658..ef5c8a97767c 100644
Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ
diff --git a/icons/obj/shell_boxes.dmi b/icons/obj/shell_boxes.dmi
new file mode 100644
index 000000000000..615e189a9191
Binary files /dev/null and b/icons/obj/shell_boxes.dmi differ
diff --git a/icons/obj/species_organs/vox.dmi b/icons/obj/species_organs/vox.dmi
index e7af999d3e52..1f5cbc26f2a7 100644
Binary files a/icons/obj/species_organs/vox.dmi and b/icons/obj/species_organs/vox.dmi differ
diff --git a/icons/obj/statue.dmi b/icons/obj/statue.dmi
index 1567097b3c62..de14c4fb7767 100644
Binary files a/icons/obj/statue.dmi and b/icons/obj/statue.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index 56837b40a89c..8a21b505ce4e 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/obj/structures/shelves.dmi b/icons/obj/structures/shelves.dmi
new file mode 100644
index 000000000000..fd3991998c4f
Binary files /dev/null and b/icons/obj/structures/shelves.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 7b660f0615f3..7b9baa407237 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi
index 67375dfa6abf..ada0ef227e20 100644
Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ
diff --git a/icons/obj/weapons/magical_weapons.dmi b/icons/obj/weapons/magical_weapons.dmi
index 78224676efe5..f8be67a8c08c 100644
Binary files a/icons/obj/weapons/magical_weapons.dmi and b/icons/obj/weapons/magical_weapons.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index 8252365ad8a5..371e919052e4 100755
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 3283b4f083bf..e024f21d33c4 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/icons/ui_icons/inventory/pda.png b/icons/ui_icons/inventory/pda.png
index fff1c7fcd8c2..c23438382972 100644
Binary files a/icons/ui_icons/inventory/pda.png and b/icons/ui_icons/inventory/pda.png differ
diff --git a/interface/skin.dmf b/interface/skin.dmf
index b220ebbf9e07..fba3a791d2d5 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -392,7 +392,7 @@ window "infowindow"
elem "statbrowser"
type = BROWSER
pos = 0,0
- size = 640x477
+ size = 640x480
anchor1 = 0,0
anchor2 = 100,100
is-default = true
diff --git a/milla.dll b/milla.dll
deleted file mode 100755
index f2f985c418bb..000000000000
Binary files a/milla.dll and /dev/null differ
diff --git a/milla/Cargo.toml b/milla/Cargo.toml
deleted file mode 100644
index 268df469456a..000000000000
--- a/milla/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "milla"
-version = "1.0.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-atomic_float = "1.0.0"
-bitflags = "2.5.0"
-byondapi = { git = "https://github.com/spacestation13/byondapi-rs.git", version = "0.4.7" }
-eyre = "0.6.12"
-rand = { version = "0.8.5", features = ["small_rng"] }
-scc = "2.1.1"
-thread-priority = "1.1.0"
diff --git a/milla/src/logging.rs b/milla/src/logging.rs
deleted file mode 100644
index 9a5d64291049..000000000000
--- a/milla/src/logging.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use std::backtrace::Backtrace;
-use std::fs::File;
-use std::io::Write;
-
-/// Simple logging function, appends to ./milla_log.txt
-#[allow(dead_code)]
-pub(crate) fn write_log>(x: T) {
- let mut f = File::options()
- .create(true)
- .append(true)
- .open("./milla_log.txt")
- .unwrap();
- writeln!(&mut f, "{}", String::from_utf8_lossy(x.as_ref())).unwrap();
-}
-
-/// Panic handler that dumps info out to ./milla_panic.txt (overwriting) if we crash.
-pub(crate) fn setup_panic_handler() {
- std::panic::set_hook(Box::new(|info| {
- let backtrace = Backtrace::force_capture();
- std::fs::write(
- "./milla_panic.txt",
- format!("Panic {:#?}\n{:#?}", info, backtrace),
- )
- .unwrap();
- }))
-}
diff --git a/mkdocs.yml b/mkdocs.yml
index 6545bbd06e0d..e3533b9ca27e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -86,6 +86,7 @@ nav:
- 'Mapping Quickstart': './mapping/quickstart.md'
- 'Mapping Requirements': './mapping/requirements.md'
- 'Design Guidelines': './mapping/design.md'
+ - 'Guide to Submaps': './mapping/submaps.md'
- 'References':
- 'Glossary': './references/glossary.md'
diff --git a/modular_ss220/_defines220/code/emote.dm b/modular_ss220/_defines220/code/emote.dm
index d22543b1c4a5..2b8bf2c2405f 100644
--- a/modular_ss220/_defines220/code/emote.dm
+++ b/modular_ss220/_defines220/code/emote.dm
@@ -121,6 +121,8 @@
#define EMOTE_HUMAN_WHIP "Ударить хвостом"
#define EMOTE_HUMAN_BARK "Гавкнуть"
#define EMOTE_HUMAN_WBARK "Дважды гавкнуть"
+#define EMOTE_HUMAN_MEOW "Мяукнуть"
+#define EMOTE_HUMAN_MROW "Мяукнуть раздражённо"
/// Carbon Emotes
#define EMOTE_CARBON_BLINK "Моргать"
diff --git a/modular_ss220/aesthetics/closets/icons/closets.dmi b/modular_ss220/aesthetics/closets/icons/closets.dmi
index c36b0b3d1046..63e33eab1a31 100644
Binary files a/modular_ss220/aesthetics/closets/icons/closets.dmi and b/modular_ss220/aesthetics/closets/icons/closets.dmi differ
diff --git a/modular_ss220/aesthetics/floors/code/floors.dm b/modular_ss220/aesthetics/floors/code/floors.dm
index 7a3602c5a14d..c004880c2d30 100644
--- a/modular_ss220/aesthetics/floors/code/floors.dm
+++ b/modular_ss220/aesthetics/floors/code/floors.dm
@@ -1,11 +1,14 @@
-/// Floor icon_states for floor painter
+// MARK: Floor painter
+/datum/painter/floor
+ floor_icon = 'modular_ss220/aesthetics/floors/icons/floors.dmi'
+
/datum/painter/floor/New()
+ . = ..()
allowed_states |= list("darkneutralcorner", "darkneutral", "darkneutralfull", "navybluecorners", "navyblue", "navybluefull",
"navybluealt", "navybluealtstrip", "navybluecornersalt", "darkbluealt", "darkbluealtstrip", "darkbluecornersalt",
"darkredalt", "darkredaltstrip", "darkredcornersalt", "darkyellowalt", "darkyellowaltstrip", "darkyellowcornersalt",
"whitebrowncorner", "whitebrown"
)
- . = ..()
/turf/simulated/floor
icon = 'modular_ss220/aesthetics/floors/icons/floors.dmi'
@@ -19,10 +22,7 @@
/turf/simulated/floor/plasteel/smooth
icon_state = "smooth"
-// LIGHT FLOORS
-/turf/simulated/floor/light
- icon = 'icons/turf/floors.dmi'
-
+// MARK: LIGHT FLOORS
/turf/simulated/floor/light/red
color = "#f23030"
light_color = "#f23030"
diff --git a/modular_ss220/aesthetics/floors/icons/floors.dmi b/modular_ss220/aesthetics/floors/icons/floors.dmi
index 73cf73061e31..285a2b410aa3 100644
Binary files a/modular_ss220/aesthetics/floors/icons/floors.dmi and b/modular_ss220/aesthetics/floors/icons/floors.dmi differ
diff --git a/modular_ss220/aesthetics/floors/icons/tiles.dmi b/modular_ss220/aesthetics/floors/icons/tiles.dmi
index 391fc26f0930..019ca3ba4fb8 100644
Binary files a/modular_ss220/aesthetics/floors/icons/tiles.dmi and b/modular_ss220/aesthetics/floors/icons/tiles.dmi differ
diff --git a/modular_ss220/aesthetics/lights/code/lights.dm b/modular_ss220/aesthetics/lights/code/lights.dm
index 8ceb44863939..84b7c65eaa62 100644
--- a/modular_ss220/aesthetics/lights/code/lights.dm
+++ b/modular_ss220/aesthetics/lights/code/lights.dm
@@ -12,6 +12,9 @@
icon = 'icons/obj/lighting.dmi'
layer = ABOVE_MOB_LAYER
+/obj/machinery/light/floor
+ icon = 'icons/obj/lighting.dmi'
+
/obj/machinery/light_construct
icon = 'modular_ss220/aesthetics/lights/icons/lights.dmi'
layer = ABOVE_MOB_LAYER
@@ -20,11 +23,17 @@
icon = 'icons/obj/lighting.dmi'
layer = ABOVE_MOB_LAYER
+/obj/machinery/light_construct/floor
+ icon = 'icons/obj/lighting.dmi'
+
/obj/item/mounted/frame/light_fixture
icon = 'modular_ss220/aesthetics/lights/icons/lights.dmi'
/obj/item/mounted/frame/light_fixture/small
icon = 'icons/obj/lighting.dmi'
+/obj/item/mounted/frame/light_fixture/floor
+ icon = 'icons/obj/lighting.dmi'
+
/obj/item/flashlight/lamp
on = FALSE
diff --git a/modular_ss220/aesthetics/racks/code/racks.dm b/modular_ss220/aesthetics/racks/code/racks.dm
index 6fc8b358459f..d1dc5520d4d0 100644
--- a/modular_ss220/aesthetics/racks/code/racks.dm
+++ b/modular_ss220/aesthetics/racks/code/racks.dm
@@ -1,109 +1,12 @@
/obj/structure/rack
icon = 'modular_ss220/aesthetics/racks/icons/racks.dmi'
-/obj/structure/rack/gunrack
- name = "gun rack"
- desc = "Стойка для хранения оружия."
- icon_state = "gunrack"
-
-/obj/item/gun
- var/on_rack = FALSE
-
-/obj/item/gun/proc/place_on_rack()
- on_rack = TRUE
- var/matrix/M = matrix()
- M.Turn(-90)
- transform = M
-
-/obj/item/gun/proc/remove_from_rack()
- if(on_rack)
- var/matrix/M = matrix()
- transform = M
- on_rack = FALSE
-
-/obj/item/gun/pickup(mob/user)
- . = ..()
- remove_from_rack()
-
-/obj/structure/rack/gunrack/MouseDrop_T(obj/O, mob/user)
- if(!(istype(O, /obj/item/gun)))
- to_chat(user, span_warning("Этот предмет не помещается!"))
- return
- . = ..()
- if(.)
- add_fingerprint(user)
- var/obj/item/gun/our_gun = O
- our_gun.place_on_rack()
-
-/obj/structure/rack/gunrack/attackby(obj/item/W, mob/user, params) //TODO: fix logic
- if(!(istype(W, /obj/item/gun)))
- to_chat(user, span_warning("Этот предмет не помещается!"))
- return
- . = ..()
- if(W.loc != get_turf(src))
- return
-
- var/obj/item/gun/our_gun = W
- our_gun.place_on_rack()
-
- add_fingerprint(user)
- var/list/click_params = params2list(params)
- if(!length(click_params))
- return
-
- var/click_icon_x = click_params["icon-x"]
- var/click_icon_y = click_params["icon-y"]
-
- //Center the icon where the user clicked.
- if(!click_icon_x || !click_icon_y)
- return
-
- var/max_pixelshift = world.icon_size / 2
- var/min_pixelshift = -max_pixelshift
-
- //Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf)
- W.pixel_x = clamp(text2num(click_icon_x) - 16, min_pixelshift, max_pixelshift)
- W.pixel_y = 0
-
-/obj/structure/rack/gunrack/Initialize(mapload)
- . = ..()
- if(!mapload)
- return
- for(var/obj/item/gun/gun_inside in loc.contents)
- gun_inside.place_on_rack()
-
-/obj/structure/rack/gunrack/deconstruct(disassembled = TRUE)
- if(flags & NODECONSTRUCT)
- return
-
- density = FALSE
- var/obj/item/rack_parts/gunrack/newparts = new(loc)
- transfer_fingerprints_to(newparts)
-
- for(var/obj/item/I in loc.contents)
- if(istype(I, /obj/item/gun))
- var/obj/item/gun/to_remove = I
- to_remove.remove_from_rack()
- qdel(src)
-
-/obj/item/rack_parts/gunrack
- name = "gun rack parts"
- desc = "Детали для сборки оружейной стойки."
+/obj/item/rack_parts
icon = 'modular_ss220/aesthetics/racks/icons/racks.dmi'
- icon_state = "gunrack_parts"
-
-/obj/item/rack_parts/gunrack/attack_self(mob/user)
- if(building)
- return
- building = TRUE
- to_chat(user, span_notice("Вы начинаете собирать оружейную стойку..."))
-
- if(!do_after(user, 50, target = user, progress=TRUE) || !user.drop_item(src))
- building = FALSE
- return
+/obj/structure/gunrack
+ icon = 'modular_ss220/aesthetics/racks/icons/racks.dmi'
- var/obj/structure/rack/gunrack/rack = new(user.loc)
- user.visible_message(span_notice("[user] собирает оружейную стойку."), span_notice("Вы закончили собирать оружейную стойку."))
- rack.add_fingerprint(user)
- qdel(src)
+// Return original icon path
+/obj/structure/rack/skeletal_bar
+ icon = 'icons/obj/stationobjs.dmi'
diff --git a/modular_ss220/aesthetics/racks/icons/racks.dmi b/modular_ss220/aesthetics/racks/icons/racks.dmi
index a06925c0e717..ae46a57da420 100644
Binary files a/modular_ss220/aesthetics/racks/icons/racks.dmi and b/modular_ss220/aesthetics/racks/icons/racks.dmi differ
diff --git a/modular_ss220/agent_id_tgui/code/agent_id_tgui.dm b/modular_ss220/agent_id_tgui/code/agent_id_tgui.dm
index 2afafc97e2b8..effcd2d15b6e 100644
--- a/modular_ss220/agent_id_tgui/code/agent_id_tgui.dm
+++ b/modular_ss220/agent_id_tgui/code/agent_id_tgui.dm
@@ -3,7 +3,8 @@
blood_type = null
fingerprint_hash = null
var/mob/living/carbon/human/registered_human
- var/static/list/appearances
+ var/static/list/restricted_appearances = list("admin", "deathsquad", "clownsquad", "data", "ERT_empty", "silver", "gold", "TDred", "TDgreen")
+ var/static/list/appearances = GLOB.card_skins_ss220 + GLOB.card_skins_special_ss220 + GLOB.card_skins_donor_ss220 - restricted_appearances
var/static/list/departments = list(
"Assistant" = null,
"Service" = GLOB.service_positions,
@@ -17,18 +18,6 @@
"Custom" = null,
)
-/obj/item/card/id/syndicate/New()
- . = ..()
- var/static/list/final_appearances = list()
-
- if(length(final_appearances) == 0)
- var/static/list/restricted_skins = list("admin", "deathsquad", "clownsquad", "data", "ERT_empty", "silver", "gold", "TDred", "TDgreen")
- var/static/list/raw_appearances = GLOB.card_skins_ss220 + GLOB.card_skins_special_ss220 + GLOB.card_skins_donor_ss220 - restricted_skins
- for(var/skin in raw_appearances)
- final_appearances[skin] = "[icon2base64(icon(initial(icon), skin, SOUTH, 1))]"
-
- appearances = final_appearances
-
/obj/item/card/id/syndicate/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..() || !registered_human)
return
@@ -136,6 +125,7 @@
/obj/item/card/id/syndicate/ui_static_data(mob/user)
var/list/data = list()
+ data["icon"] = icon
data["appearances"] = appearances
return data
diff --git a/modular_ss220/antagonists/code/blood_brothers/blood_brothers_team.dm b/modular_ss220/antagonists/code/blood_brothers/blood_brothers_team.dm
index 79f156d7a1d4..3a51c41354c0 100644
--- a/modular_ss220/antagonists/code/blood_brothers/blood_brothers_team.dm
+++ b/modular_ss220/antagonists/code/blood_brothers/blood_brothers_team.dm
@@ -46,11 +46,11 @@
/datum/team/blood_brothers_team/handle_adding_member(datum/mind/new_member)
. = ..()
- update_name()
+ update_brother_name()
/datum/team/blood_brothers_team/handle_removing_member(datum/mind/member, force)
. = ..()
- update_name()
+ update_brother_name()
/datum/team/blood_brothers_team/proc/get_brother_names_text(datum/mind/brother_to_exclude)
var/list/brother_names = list()
@@ -68,7 +68,7 @@
if(istext(chosen_meeting_area))
meeting_area = chosen_meeting_area
-/datum/team/blood_brothers_team/proc/update_name()
+/datum/team/blood_brothers_team/proc/update_brother_name()
PRIVATE_PROC(TRUE)
var/new_name = get_brother_names_text()
if(!new_name)
diff --git a/modular_ss220/antagonists/code/guns/biogun.dm b/modular_ss220/antagonists/code/guns/biogun.dm
index c0261847946d..314b057299e3 100644
--- a/modular_ss220/antagonists/code/guns/biogun.dm
+++ b/modular_ss220/antagonists/code/guns/biogun.dm
@@ -70,7 +70,7 @@
fire_damage = 1
unsuitable_atmos_damage = 0
mob_size = MOB_SIZE_TINY
- flying = FALSE
+ initial_traits = list(TRAIT_FLYING)
melee_damage_lower = 10
melee_damage_upper = 15
diff --git a/modular_ss220/antagonists/code/vox_raider/clothing/vox_clothing.dm b/modular_ss220/antagonists/code/vox_raider/clothing/vox_clothing.dm
index 143a879c9593..b0bcdb329659 100644
--- a/modular_ss220/antagonists/code/vox_raider/clothing/vox_clothing.dm
+++ b/modular_ss220/antagonists/code/vox_raider/clothing/vox_clothing.dm
@@ -41,37 +41,3 @@
name = "vox purple jumpsuit"
icon_state = "vox-jumpsuit_purple"
item_color = "vox-jumpsuit_purple"
-
-// ================
-// loadout
-/datum/gear/racial/vox_jumpsuit
- display_name = "vox work jumpsuit"
- description = "These loose clothes are optimized for the labors of the lower castes onboard the arkships. Large openings in the top allow for breathability while the pants are durable yet flexible enough to not restrict movement."
- path = /obj/item/clothing/under/vox/jumpsuit
- slot = SLOT_HUD_JUMPSUIT
-
-/datum/gear/racial/vox_jumpsuit/red
- display_name = "vox red jumpsuit"
- path = /obj/item/clothing/under/vox/jumpsuit/red
-
-/datum/gear/racial/vox_jumpsuit/teal
- display_name = "vox teal jumpsuit"
- path = /obj/item/clothing/under/vox/jumpsuit/teal
-
-/datum/gear/racial/vox_jumpsuit/blue
- display_name = "vox blue jumpsuit"
- path = /obj/item/clothing/under/vox/jumpsuit/blue
-
-/datum/gear/racial/vox_jumpsuit/green
- display_name = "vox green jumpsuit"
- path = /obj/item/clothing/under/vox/jumpsuit/green
-
-/datum/gear/racial/vox_jumpsuit/yellow
- display_name = "vox yellow jumpsuit"
- path = /obj/item/clothing/under/vox/jumpsuit/yellow
-
-/datum/gear/racial/vox_jumpsuit/purple
- display_name = "vox purple jumpsuit"
- path = /obj/item/clothing/under/vox/jumpsuit/purple
-
-// ================
diff --git a/modular_ss220/antagonists/code/vox_raider/clothing/vox_gloves.dm b/modular_ss220/antagonists/code/vox_raider/clothing/vox_gloves.dm
index 4f4422ab5ab6..57b937b979a3 100644
--- a/modular_ss220/antagonists/code/vox_raider/clothing/vox_gloves.dm
+++ b/modular_ss220/antagonists/code/vox_raider/clothing/vox_gloves.dm
@@ -16,6 +16,15 @@
resistance_flags = NONE
armor = list(MELEE = 30, BULLET = 0, LASER = 10, ENERGY = 10, BOMB = 0, RAD = 0, FIRE = 200, ACID = 50)
+/obj/item/clothing/gloves/vox/light
+ name = "light vox gauntlets"
+ desc = "Легкие рукавицы причудливой формы с когтями."
+ strip_delay = 2 SECONDS
+ cold_protection = 0
+ min_cold_protection_temperature = NONE
+ max_heat_protection_temperature = NONE
+ armor = NONE
+
/obj/item/clothing/gloves/color/yellow/vox
name = "insulated vox gauntlets"
desc = "Плотные изоляционные рукавицы причудливой формы с когтями."
diff --git a/modular_ss220/antagonists/code/vox_raider/vox_raider_team.dm b/modular_ss220/antagonists/code/vox_raider/vox_raider_team.dm
index 07f5746aa4a5..eba5a040bbbe 100644
--- a/modular_ss220/antagonists/code/vox_raider/vox_raider_team.dm
+++ b/modular_ss220/antagonists/code/vox_raider/vox_raider_team.dm
@@ -24,13 +24,13 @@
/datum/team/vox_raiders/handle_adding_member(datum/mind/new_member)
. = ..()
- update_name()
+ update_reider_name()
/datum/team/vox_raiders/handle_removing_member(datum/mind/member, force = FALSE)
. = ..()
- update_name()
+ update_reider_name()
-/datum/team/vox_raiders/proc/update_name()
+/datum/team/vox_raiders/proc/update_reider_name()
PRIVATE_PROC(TRUE)
var/new_name = get_raider_names_text()
if(!new_name)
diff --git a/modular_ss220/awaymission_gun/code/items/awaymission_gun.dm b/modular_ss220/awaymission_gun/code/items/awaymission_gun.dm
index 7963859f9ef0..1e71e346868d 100644
--- a/modular_ss220/awaymission_gun/code/items/awaymission_gun.dm
+++ b/modular_ss220/awaymission_gun/code/items/awaymission_gun.dm
@@ -18,7 +18,7 @@
/obj/item/gun/energy/laser/awaymission_aeg/onTransitZ(old_z, new_z)
. = ..()
- if(is_away_level(new_z) || (!is_station_level(new_z) && check_level_trait(new_z, REACHABLE_SPACE_ONLY)))
+ if(is_away_level(new_z))
if(ismob(loc))
to_chat(loc, span_notice("Ваш [src] активируется, начиная аккумулировать энергию из материи сущего."))
selfcharge = TRUE
diff --git a/modular_ss220/camera_nanomap/code/camera.dm b/modular_ss220/camera_nanomap/code/camera.dm
index 81dcf0bef311..ba92bbb29f59 100644
--- a/modular_ss220/camera_nanomap/code/camera.dm
+++ b/modular_ss220/camera_nanomap/code/camera.dm
@@ -71,7 +71,7 @@
z = C.z,
status = C.status
))
- if("[C.z]" in z_levels || !C.nanomap_png)
+ if(("[C.z]" in z_levels) || !C.nanomap_png)
continue
z_levels += list("[C.z]" = C.nanomap_png)
// Sort it by z levels
diff --git a/modular_ss220/clothing/_clothing.dm b/modular_ss220/clothing/_clothing.dm
index d6e8b24db3df..e8581715c24f 100644
--- a/modular_ss220/clothing/_clothing.dm
+++ b/modular_ss220/clothing/_clothing.dm
@@ -1,7 +1,7 @@
/datum/modpack/clothing
name = "Одежда"
desc = "Всё для модного приговора."
- author = "Aylong220, Yata9arasu"
+ author = "Aylong, Yata9arasu, Dekupich"
/datum/modpack/clothing/initialize()
. = ..()
diff --git a/modular_ss220/clothing/_clothing.dme b/modular_ss220/clothing/_clothing.dme
index 7d41d6f1a1d2..a70b69054c10 100644
--- a/modular_ss220/clothing/_clothing.dme
+++ b/modular_ss220/clothing/_clothing.dme
@@ -11,3 +11,4 @@
#include "code/shoes.dm"
#include "code/suits.dm"
#include "code/under.dm"
+#include "code/mod.dm"
diff --git a/modular_ss220/clothing/code/cloaks.dm b/modular_ss220/clothing/code/cloaks.dm
index 18b5c130f63f..00a8afca9355 100644
--- a/modular_ss220/clothing/code/cloaks.dm
+++ b/modular_ss220/clothing/code/cloaks.dm
@@ -6,6 +6,62 @@
icon_override = 'modular_ss220/clothing/icons/mob/cloaks.dmi'
item_state = "capcloak_black"
-/obj/item/clothing/suit/mantle/armor/captain_black/Initialize(mapload)
+/obj/item/clothing/suit/mantle/armor/captain/black/Initialize(mapload)
. = ..()
desc = "Носится верховным лидером станции [station_name()]."
+
+/* EI cloak */
+/obj/item/clothing/suit/hooded/ei_cloak
+ name = "плащ Gold On Black"
+ desc = "Корпоративный плащ, выполненный в угольных тонах все с тем же золотым покрытием и специальным логотипом от Etamin Industry – золотой звездой."
+ icon = 'modular_ss220/clothing/icons/object/cloaks.dmi'
+ icon_state = "ei_cloak"
+ sprite_sheets = list(
+ "Human" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
+ "Tajaran" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
+ "Vulpkanin" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
+ "Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/cloaks.dmi',
+ "Skrell" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
+ "Nucleation" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
+ "Skeleton" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
+ "Slime People" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
+ "Unathi" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
+ "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/cloaks.dmi',
+ "Abductor" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
+ "Golem" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
+ "Machine" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
+ "Diona" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
+ "Nian" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
+ "Shadow" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
+ "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/cloaks.dmi',
+ "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/cloaks.dmi',
+ )
+ hoodtype = /obj/item/clothing/head/hooded/ei_hood
+
+/obj/item/clothing/head/hooded/ei_hood
+ name = "капюшон Gold On Black"
+ desc = "Капюшон, прикрепленный к плащу Gold On Black."
+ icon = 'modular_ss220/clothing/icons/object/hats.dmi'
+ icon_state = "ei_hood"
+ sprite_sheets = list(
+ "Human" = 'modular_ss220/clothing/icons/mob/hats.dmi',
+ "Tajaran" = 'modular_ss220/clothing/icons/mob/species/tajaran/hats.dmi',
+ "Vulpkanin" = 'modular_ss220/clothing/icons/mob/species/vulpkanin/hats.dmi',
+ "Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/hats.dmi',
+ "Skrell" = 'modular_ss220/clothing/icons/mob/hats.dmi',
+ "Nucleation" = 'modular_ss220/clothing/icons/mob/hats.dmi',
+ "Skeleton" = 'modular_ss220/clothing/icons/mob/hats.dmi',
+ "Slime People" = 'modular_ss220/clothing/icons/mob/hats.dmi',
+ "Unathi" = 'modular_ss220/clothing/icons/mob/hats.dmi',
+ "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/hats.dmi',
+ "Abductor" = 'modular_ss220/clothing/icons/mob/hats.dmi',
+ "Golem" = 'modular_ss220/clothing/icons/mob/hats.dmi',
+ "Machine" = 'modular_ss220/clothing/icons/mob/hats.dmi',
+ "Diona" = 'modular_ss220/clothing/icons/mob/hats.dmi',
+ "Nian" = 'modular_ss220/clothing/icons/mob/hats.dmi',
+ "Shadow" = 'modular_ss220/clothing/icons/mob/hats.dmi',
+ "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/hats.dmi',
+ "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/hats.dmi',
+ )
+ flags = BLOCKHAIR
+ flags_inv = HIDEEARS
diff --git a/modular_ss220/clothing/code/clothing_vendors.dm b/modular_ss220/clothing/code/clothing_vendors.dm
index f81c968c0b00..fc2c06a42e5f 100644
--- a/modular_ss220/clothing/code/clothing_vendors.dm
+++ b/modular_ss220/clothing/code/clothing_vendors.dm
@@ -2,8 +2,12 @@
products += list(
/obj/item/clothing/head/ratge = 1,
)
+ contraband += list(
+ /obj/item/clothing/mask/rooster = 1,
+ )
prices += list(
/obj/item/clothing/head/ratge = 75,
+ /obj/item/clothing/mask/rooster = 100,
)
. = ..()
diff --git a/modular_ss220/clothing/code/garment_bag.dm b/modular_ss220/clothing/code/garment_bag.dm
index 4d2e33cded53..461b6d20af61 100644
--- a/modular_ss220/clothing/code/garment_bag.dm
+++ b/modular_ss220/clothing/code/garment_bag.dm
@@ -1,7 +1,7 @@
/obj/item/storage/bag/garment/captain/populate_contents()
. = ..()
new /obj/item/clothing/head/caphat/beret_black(src)
- new /obj/item/clothing/suit/mantle/armor/captain_black(src)
+ new /obj/item/clothing/suit/mantle/armor/captain/black(src)
/obj/item/storage/bag/garment/head_of_security/populate_contents()
. = ..()
diff --git a/modular_ss220/clothing/code/gloves.dm b/modular_ss220/clothing/code/gloves.dm
index 8aba91917253..4ffc9b00fcbe 100644
--- a/modular_ss220/clothing/code/gloves.dm
+++ b/modular_ss220/clothing/code/gloves.dm
@@ -4,3 +4,30 @@
icon = 'modular_ss220/clothing/icons/object/gloves.dmi'
icon_state = "bike_gloves"
icon_override = 'modular_ss220/clothing/icons/mob/hands.dmi'
+
+/* EI gloves */
+/obj/item/clothing/gloves/color/ei_gloves
+ name = "перчатки Gold On Black"
+ desc = "Качественные перчатки с золотой вставкой 999 пробы."
+ icon = 'modular_ss220/clothing/icons/object/gloves.dmi'
+ icon_state = "ei_gloves"
+ sprite_sheets = list(
+ "Human" = 'modular_ss220/clothing/icons/mob/hands.dmi',
+ "Tajaran" = 'modular_ss220/clothing/icons/mob/hands.dmi',
+ "Vulpkanin" = 'modular_ss220/clothing/icons/mob/hands.dmi',
+ "Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/gloves.dmi',
+ "Skrell" = 'modular_ss220/clothing/icons/mob/hands.dmi',
+ "Nucleation" = 'modular_ss220/clothing/icons/mob/hands.dmi',
+ "Skeleton" = 'modular_ss220/clothing/icons/mob/hands.dmi',
+ "Slime People" = 'modular_ss220/clothing/icons/mob/hands.dmi',
+ "Unathi" = 'modular_ss220/clothing/icons/mob/hands.dmi',
+ "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/gloves.dmi',
+ "Abductor" = 'modular_ss220/clothing/icons/mob/hands.dmi',
+ "Golem" = 'modular_ss220/clothing/icons/mob/hands.dmi',
+ "Machine" = 'modular_ss220/clothing/icons/mob/hands.dmi',
+ "Diona" = 'modular_ss220/clothing/icons/mob/hands.dmi',
+ "Nian" = 'modular_ss220/clothing/icons/mob/hands.dmi',
+ "Shadow" = 'modular_ss220/clothing/icons/mob/hands.dmi',
+ "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/gloves.dmi',
+ "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/gloves.dmi',
+ )
diff --git a/modular_ss220/clothing/code/hats.dm b/modular_ss220/clothing/code/hats.dm
index fa24b469073d..bc0697a2ad7d 100644
--- a/modular_ss220/clothing/code/hats.dm
+++ b/modular_ss220/clothing/code/hats.dm
@@ -134,3 +134,8 @@
/obj/item/clothing/head/towel/brown
name = "коричневая шапочка из полотенца"
color = "#DEB887"
+
+/obj/item/clothing/head/beret/centcom/intern
+ name = "nanotrasen intern beret"
+ desc = "Берет стажера НТ. Белый берет с зеленой звездой. Выглядит подозрительно похожим на берет главного инженера..."
+ icon_state = "beret_ce"
diff --git a/modular_ss220/clothing/code/helmet.dm b/modular_ss220/clothing/code/helmet.dm
index 9cc35613eb78..dafe0ce18f82 100644
--- a/modular_ss220/clothing/code/helmet.dm
+++ b/modular_ss220/clothing/code/helmet.dm
@@ -129,6 +129,15 @@
icon_state = "ember_sec"
item_state = "ember_sec"
+/obj/item/clothing/head/helmet/ert/security/paranormal
+ icon_state = "knight_templar"
+ item_state = "knight_templar"
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi'
+ )
+
/obj/item/clothing/head/helmet/space/ert_engineer
name = "emergency response team engineer space helmet"
desc = "Space helmet worn by engineering members of the Nanotrasen Emergency Response Team. Has orange highlights."
diff --git a/modular_ss220/clothing/code/hev_suit.dm b/modular_ss220/clothing/code/hev_suit.dm
index 5c2358074ae9..690a07abd833 100644
--- a/modular_ss220/clothing/code/hev_suit.dm
+++ b/modular_ss220/clothing/code/hev_suit.dm
@@ -107,7 +107,7 @@
add_queue('modular_ss220/aesthetics_sounds/sound/hev/death.ogg', 5 SECONDS, purge_queue=TRUE)
//Mute
-/obj/item/clothing/suit/space/hev/proc/handle_speech(datum/source, mob/speech_args)
+/obj/item/clothing/suit/space/hev/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER
var/static/list/cancel_messages = list(
"Вам трудно говорить, когда костюм туго сдавливает ваше горло...",
diff --git a/modular_ss220/clothing/code/mask.dm b/modular_ss220/clothing/code/mask.dm
index 53f8378b0142..2b5895df3840 100644
--- a/modular_ss220/clothing/code/mask.dm
+++ b/modular_ss220/clothing/code/mask.dm
@@ -68,3 +68,58 @@
icon = 'modular_ss220/clothing/icons/object/masks.dmi'
icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi'
icon_state = "breathscarf"
+
+/obj/item/clothing/mask/rooster
+ w_class = WEIGHT_CLASS_SMALL
+ flags = BLOCKHAIR
+ flags_inv = HIDEEARS | HIDEEYES | HIDEFACE
+ flags_cover = MASKCOVERSMOUTH
+ modifies_speech = TRUE
+ species_restricted = list("Human", "Nian", "Skrell", "Slime People", "Diona", "Skeleton", "Shadow")
+
+/obj/item/clothing/mask/rooster
+ name = "маска петуха"
+ desc = "Прямо из Острой дороги космо-Майами. Со встроенными фразами."
+ icon = 'modular_ss220/clothing/icons/object/masks.dmi'
+ icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi'
+ icon_state = "rooster_mask"
+
+/obj/item/clothing/mask/rooster/handle_speech(datum/source, list/speech_args)
+ var/message = speech_args[SPEECH_MESSAGE]
+ if(!length(message))
+ return
+ if(prob(3))
+ message += pick(
+ ". Тебе нравится причинять людям боль?",
+ ". Вы вернулись, да?",
+ ". Что, бля, за неуважение?",
+ )
+ speech_args[SPEECH_MESSAGE] = trim(message)
+
+/* EI mask */
+/obj/item/clothing/mask/breath/ei_mask
+ name = "дыхательная маска от EI"
+ desc = "Качество и надежность, а самое главное - безопасность."
+ icon = 'modular_ss220/clothing/icons/object/masks.dmi'
+ icon_state = "ei_mask"
+ flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
+ sprite_sheets = list(
+ "Human" = 'modular_ss220/clothing/icons/mob/mask.dmi',
+ "Tajaran" = 'modular_ss220/clothing/icons/mob/mask.dmi',
+ "Vulpkanin" = 'modular_ss220/clothing/icons/mob/species/vulpkanin/mask.dmi',
+ "Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/mask.dmi',
+ "Skrell" = 'modular_ss220/clothing/icons/mob/mask.dmi',
+ "Nucleation" = 'modular_ss220/clothing/icons/mob/mask.dmi',
+ "Skeleton" = 'modular_ss220/clothing/icons/mob/mask.dmi',
+ "Slime People" = 'modular_ss220/clothing/icons/mob/mask.dmi',
+ "Unathi" = 'modular_ss220/clothing/icons/mob/species/unathi/mask.dmi',
+ "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/mask.dmi',
+ "Abductor" = 'modular_ss220/clothing/icons/mob/mask.dmi',
+ "Golem" = 'modular_ss220/clothing/icons/mob/mask.dmi',
+ "Machine" = 'modular_ss220/clothing/icons/mob/mask.dmi',
+ "Diona" = 'modular_ss220/clothing/icons/mob/mask.dmi',
+ "Nian" = 'modular_ss220/clothing/icons/mob/mask.dmi',
+ "Shadow" = 'modular_ss220/clothing/icons/mob/mask.dmi',
+ "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/mask.dmi',
+ "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/mask.dmi',
+ )
diff --git a/modular_ss220/clothing/code/mod.dm b/modular_ss220/clothing/code/mod.dm
new file mode 100644
index 000000000000..26a4d974fabd
--- /dev/null
+++ b/modular_ss220/clothing/code/mod.dm
@@ -0,0 +1,280 @@
+// MARK: MODsuit clothes
+/obj/item/clothing/head/mod/exclusive
+ icon = 'modular_ss220/clothing/icons/object/mod_clothing.dmi'
+ item_state = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+ icon_override = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+ sprite_sheets = list(
+ "Human" = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi',
+ "Skrell" = 'modular_ss220/clothing/icons/mob/species/skrell/mod_clothing.dmi',
+ )
+
+/obj/item/clothing/suit/mod/exclusive
+ icon = 'modular_ss220/clothing/icons/object/mod_clothing.dmi'
+ item_state = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+ icon_override = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+ sprite_sheets = list(
+ "Human" = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi',
+ "Skrell" = 'modular_ss220/clothing/icons/mob/species/skrell/mod_clothing.dmi',
+ )
+
+/obj/item/clothing/gloves/mod/exclusive
+ icon = 'modular_ss220/clothing/icons/object/mod_clothing.dmi'
+ item_state = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+ icon_override = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+ sprite_sheets = list(
+ "Human" = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi',
+ "Skrell" = 'modular_ss220/clothing/icons/mob/species/skrell/mod_clothing.dmi',
+ )
+
+/obj/item/clothing/shoes/mod/exclusive
+ icon = 'modular_ss220/clothing/icons/object/mod_clothing.dmi'
+ item_state = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+ icon_override = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+ sprite_sheets = list(
+ "Human" = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi',
+ "Skrell" = 'modular_ss220/clothing/icons/mob/species/skrell/mod_clothing.dmi',
+ )
+
+// MARK: MODsuit control
+/obj/item/mod/control/proc/build_head()
+ return new /obj/item/clothing/head/mod(src)
+
+/obj/item/mod/control/proc/build_suit()
+ return new /obj/item/clothing/suit/mod(src)
+
+/obj/item/mod/control/proc/build_gloves()
+ return new /obj/item/clothing/gloves/mod(src)
+
+/obj/item/mod/control/proc/build_shoes()
+ return new /obj/item/clothing/shoes/mod(src)
+
+/obj/item/mod/control/proc/is_any_part_deployed()
+ for(var/obj/item/part as anything in mod_parts)
+ if(part.loc != src)
+ return TRUE
+ return FALSE
+
+// This is kinda sick but we need to retract it before the actual species change.
+/obj/item/mod/control/proc/pre_species_gain(datum/species/new_species)
+ if(!wearer)
+ return
+ if(is_any_part_deployed() && !theme.is_species_allowed(new_species))
+ // Deactivate MODsuit to respect the species allowed.
+ to_chat(wearer, span_warning("Ошибка видовой принадлежности! Деактивация."))
+ if(active)
+ var/old_activation_step_time = activation_step_time
+ activation_step_time = 0.1 SECONDS // gotta go fast
+ toggle_activate(wearer, force_deactivate = TRUE)
+ activation_step_time = old_activation_step_time
+ quick_deploy(wearer)
+
+/obj/item/mod/control/quick_deploy(mob/user)
+ user = user || loc // why the fuck this is nullable
+ if(!is_any_part_deployed() && !theme.is_species_allowed(user.dna.species))
+ to_chat(user, span_warning("Ошибка видовой принадлежности! Развертывание недоступно."))
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ return ..()
+
+/obj/item/mod/control/deploy(mob/user, obj/item/part, mass)
+ user = user || loc // why the fuck this is nullable
+ if(!mass && part.loc != user && !theme.is_species_allowed(user.dna.species))
+ to_chat(user, span_warning("Ошибка видовой принадлежности! Развертывание недоступно."))
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ return ..()
+
+/obj/item/mod/control/pre_equipped/exclusive
+ icon = 'modular_ss220/clothing/icons/object/mod_clothing.dmi'
+ icon_override = 'modular_ss220/clothing/icons/mob/mod_clothing.dmi'
+
+/obj/item/mod/control/pre_equipped/exclusive/build_head()
+ return new /obj/item/clothing/head/mod/exclusive(src)
+
+/obj/item/mod/control/pre_equipped/exclusive/build_suit()
+ return new /obj/item/clothing/suit/mod/exclusive(src)
+
+/obj/item/mod/control/pre_equipped/exclusive/build_gloves()
+ return new /obj/item/clothing/gloves/mod/exclusive(src)
+
+/obj/item/mod/control/pre_equipped/exclusive/build_shoes()
+ return new /obj/item/clothing/shoes/mod/exclusive(src)
+
+// MARK: MODsuit Theme
+/datum/mod_theme
+ /// Which species are allowed to deploy MODsuit. Consider empty list as no restriction.
+ var/list/species_allowed = list()
+
+/datum/mod_theme/proc/is_species_allowed(datum/species/species)
+ if(!length(species_allowed))
+ return TRUE
+ if(!(species.name in species_allowed))
+ return FALSE
+ return TRUE
+
+/mob/living/carbon/human/change_dna(datum/dna/new_dna, include_species_change)
+ if(istype(back, /obj/item/mod/control))
+ INVOKE_ASYNC(back, TYPE_PROC_REF(/obj/item/mod/control, pre_species_gain), new_dna.species)
+ return ..()
+
+/mob/living/carbon/human/set_species(datum/species/new_species, use_default_color = FALSE, delay_icon_update = FALSE, skip_same_check = FALSE, retain_damage = FALSE, transformation = FALSE, keep_missing_bodyparts = FALSE)
+ if(istype(back, /obj/item/mod/control))
+ INVOKE_ASYNC(back, TYPE_PROC_REF(/obj/item/mod/control, pre_species_gain), new_species)
+ return ..()
+
+// MARK: Skrell elite MODsuit - Raskinta
+/datum/mod_theme/skrell_raskinta
+ name = "\improper raskinta"
+ desc = "Боевая броня с функцией костюма для ВКД, созданная для воинов Раскинта Ме'керр-Кэтиш."
+ extended_desc = "Массивный бронекостюм, выполненный в черно-синих цветах, является отличительной чертой \
+ военных формирований Раскинта-Кэтиш. Защитные пластины состоят из укрепленной керамики, в то время как \
+ каркасные пластины выполнены из сплавов вороной пластали, позволяющей эффективно поглощать и рассеивать энергию \
+ через радиаторные отводы на \"хвостовых\" окончаниях шлема. \
+ Этот костюм является самым часто встречаемым в штурмовых отрядах Оборонительных Сил Скреллов."
+ default_skin = "skrell_elite"
+ armor_type_1 = /obj/item/mod/armor/mod_theme_skrell_raskinta
+ flag_2_flags = RAD_PROTECT_CONTENTS_2
+ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+ siemens_coefficient = 0
+ slowdown_inactive = 1
+ slowdown_active = 0.25
+ complexity_max = DEFAULT_MAX_COMPLEXITY + 5
+ allowed_suit_storage = list(
+ /obj/item/ammo_box,
+ /obj/item/ammo_casing,
+ /obj/item/restraints/handcuffs,
+ /obj/item/flash,
+ /obj/item/melee/baton,
+ /obj/item/gun,
+ /obj/item/melee/vibroblade,
+ )
+ species_allowed = list("Skrell")
+ skins = list(
+ "skrell_elite" = list(
+ MOD_ICON_OVERRIDE = 'modular_ss220/clothing/icons/object/mod_clothing.dmi',
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = COLLAR_LAYER,
+
+ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR,
+ UNSEALED_INVISIBILITY = HIDEFACE,
+ SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE,
+ SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT | HIDETAIL,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/obj/item/mod/armor/mod_theme_skrell_raskinta
+ armor = list(MELEE = 40, BULLET = 25, LASER = 25, ENERGY = 20, BOMB = 25, RAD = INFINITY, FIRE = 200, ACID = 200)
+
+/obj/item/mod/control/pre_equipped/exclusive/skrell_raskinta
+ theme = /datum/mod_theme/skrell_raskinta
+ applied_cell = /obj/item/stock_parts/cell/super
+ applied_modules = list(
+ /obj/item/mod/module/storage/syndicate,
+ /obj/item/mod/module/emp_shield,
+ /obj/item/mod/module/status_readout,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/magboot/advanced,
+ /obj/item/mod/module/jetpack/advanced,
+ )
+ default_pins = list(
+ /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/magboot/advanced,
+ )
+
+// MARK: Skrell elite MODsuit - Sardaukars
+/datum/mod_theme/skrell_sardaukars
+ name = "\improper emperor guard"
+ desc = "Элитная боевая броня гвардейцев Скреллианской империи."
+ extended_desc = "Благодаря высшим технологическим достижениям скреллов этот костюм сочетает в себе \
+ невероятные показатели защищенности и мобильности, являясь незаменимой вещью на вооружении свирепых Куи'кверр-Кэтиш. \
+ Носящие его воины являются личной гвардией Императора и выполняют самые сложные задачи по его воле. \
+ Кроваво-белоснежные цвета, отождествляющие кровь врагов и власть Его Величества, скорее всего последнее \
+ что вы увидите в своей жизни."
+ default_skin = "skrell_white"
+ armor_type_1 = /obj/item/mod/armor/mod_theme_skrell_sardaukars
+ resistance_flags = FIRE_PROOF
+ flag_2_flags = RAD_PROTECT_CONTENTS_2
+ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+ siemens_coefficient = 0
+ slowdown_inactive = 0.5
+ slowdown_active = 0
+ complexity_max = DEFAULT_MAX_COMPLEXITY + 10
+ allowed_suit_storage = list(
+ /obj/item/ammo_box,
+ /obj/item/ammo_casing,
+ /obj/item/restraints/handcuffs,
+ /obj/item/flash,
+ /obj/item/melee/baton,
+ /obj/item/gun,
+ /obj/item/melee/vibroblade,
+ )
+ species_allowed = list("Skrell")
+ skins = list(
+ "skrell_white" = list(
+ MOD_ICON_OVERRIDE = 'modular_ss220/clothing/icons/object/mod_clothing.dmi',
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = COLLAR_LAYER,
+
+ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR,
+ UNSEALED_INVISIBILITY = HIDEFACE,
+ SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE,
+ SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT | HIDETAIL,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/obj/item/mod/armor/mod_theme_skrell_sardaukars
+ armor = list(MELEE = 120, BULLET = 120, LASER = 100, ENERGY = 50, BOMB = 100, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY)
+
+/obj/item/mod/control/pre_equipped/exclusive/skrell_sardaukars
+ theme = /datum/mod_theme/skrell_sardaukars
+ applied_cell = /obj/item/stock_parts/cell/bluespace
+ applied_modules = list(
+ /obj/item/mod/module/storage/bluespace,
+ /obj/item/mod/module/emp_shield,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/status_readout,
+ /obj/item/mod/module/magboot/advanced,
+ /obj/item/mod/module/visor/thermal
+ )
+ default_pins = list(
+ /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/magboot/advanced,
+ /obj/item/mod/module/visor/thermal
+ )
+
+/obj/item/mod/control/pre_equipped/exclusive/skrell_sardaukars/Initialize(mapload, new_theme, new_skin, new_core, new_access)
+ . = ..()
+ ADD_TRAIT(chestplate, TRAIT_RSG_IMMUNE, ROUNDSTART_TRAIT)
diff --git a/modular_ss220/clothing/code/shoes.dm b/modular_ss220/clothing/code/shoes.dm
index fbafc4a45651..4e24b850ffe3 100644
--- a/modular_ss220/clothing/code/shoes.dm
+++ b/modular_ss220/clothing/code/shoes.dm
@@ -93,7 +93,7 @@
set_light(0)
glow_active = FALSE
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
/// Opens user input for changing neon color
/obj/item/clothing/shoes/black/neon/proc/change_color(mob/user)
@@ -101,7 +101,7 @@
color = temp
light_color = temp
reload_neon_overlay(user)
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
/* Shark Shoes */
/obj/item/clothing/shoes/shark
@@ -166,3 +166,32 @@
/obj/item/clothing/shoes/clown_shoes/slippers,
)
category = CAT_CLOTHING
+
+/* EI shoes */
+/obj/item/clothing/shoes/ei_shoes
+ name = "ботинки Gold On Black"
+ desc = "Черный ботинки в классическом стиле с легким золотым напылением от корпорации Etamin Industry."
+ icon = 'modular_ss220/clothing/icons/object/shoes.dmi'
+ icon_state = "ei_shoes"
+ lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
+ righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
+ sprite_sheets = list(
+ "Human" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
+ "Tajaran" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
+ "Vulpkanin" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
+ "Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/shoes.dmi',
+ "Skrell" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
+ "Nucleation" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
+ "Skeleton" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
+ "Slime People" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
+ "Unathi" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
+ "Grey" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
+ "Abductor" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
+ "Golem" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
+ "Machine" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
+ "Diona" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
+ "Nian" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
+ "Shadow" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
+ "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/shoes.dmi',
+ "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/shoes.dmi',
+ )
diff --git a/modular_ss220/clothing/code/suits.dm b/modular_ss220/clothing/code/suits.dm
index dc0d4aae4e78..f1b7a3a7960f 100644
--- a/modular_ss220/clothing/code/suits.dm
+++ b/modular_ss220/clothing/code/suits.dm
@@ -262,6 +262,21 @@
desc = "Парадный плащ нового образца, внедряемый на объектах компании в последнее время. Отличительной чертой является стоячий воротник и резаный подол. Невысокие показатели защиты нивелируются пафосом, источаемым этим плащом."
icon_state = "ntsc_coat"
+/obj/item/clothing/under/rank/centcom/intern
+ name = "nanotrasen intern uniform"
+ desc = "Стандартная униформа стажера НТ. Обладает не самым хорошим качеством, однако вполне сгодится для удовлетворения амбиций стажера. В комплекте идёт зеленый галстук. Слава НТ!"
+ icon = 'icons/obj/clothing/under/procedure.dmi'
+ icon_state = "iaa"
+ item_state = "iaa"
+ item_color = "iaa"
+ sprite_sheets = list(
+ "Human" = 'icons/mob/clothing/under/procedure.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/under/procedure.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/under/procedure.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/under/procedure.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/under/procedure.dmi'
+ )
+
/* SYNDICATE */
/obj/item/clothing/suit/space/deathsquad/officer/syndie
name = "куртка офицера синдиката"
@@ -306,6 +321,14 @@
icon_state = "ember_sec"
item_state = "ember_sec"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+
+/obj/item/clothing/suit/armor/vest/ert/security/paranormal
+ icon_state = "knight_templar"
+ item_state = "knight_templar"
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+ )
+
/obj/item/clothing/suit/space/ert_engineer
name = "emergency response team engineer space suit"
desc = "Space suit worn by engineering members of the Nanotrasen Emergency Response Team. Has orange highlights."
@@ -357,3 +380,60 @@
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/suits.dmi',
"Monkey" = 'modular_ss220/clothing/icons/mob/species/monkey/suits.dmi',
)
+
+/* EI suits */
+/obj/item/clothing/suit/storage/ei_jacket
+ name = "кожаная куртка Rock on Black"
+ desc = "Сочетание настоящего рокерского духа и современного стиля. При взгляде на вас, у каждого возникнет лишь одна мысль: «Это настоящий рок спирит!»."
+ icon = 'modular_ss220/clothing/icons/object/suits.dmi'
+ icon_state = "ei_jacket_open"
+ ignore_suitadjust = FALSE
+ suit_adjusted = TRUE
+ actions_types = list(/datum/action/item_action/openclose)
+ adjust_flavour = "unzip"
+ sprite_sheets = list(
+ "Human" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Tajaran" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Vulpkanin" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/suits.dmi',
+ "Skrell" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Nucleation" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Skeleton" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Slime People" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Unathi" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/suits.dmi',
+ "Abductor" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Golem" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Machine" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Diona" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Nian" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Shadow" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/suits.dmi',
+ "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/suits.dmi',
+ )
+ lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
+ righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
+
+/obj/item/clothing/suit/storage/ei_coat
+ name = "офицерский плащ EI"
+ desc = "Этот плащ был создан специально для офицеров корпорации Etamin Industry. Если вы видите его на ком-то, то либо перед вами офицер корпорации, либо тот, кто отдал бешеные бабки за этот плащ."
+ icon = 'modular_ss220/clothing/icons/object/suits.dmi'
+ icon_state = "ei_coat"
+ species_restricted = list("Human", "Tajaran", "Vulpkanin", "Skrell", "Nucleation", "Skeleton", "Slime People", "Unathi", "Abductor", "Golem", "Machine", "Shadow")
+ sprite_sheets = list(
+ "Human" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Tajaran" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Vulpkanin" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Skrell" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Nucleation" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Skeleton" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Slime People" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Unathi" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Abductor" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Golem" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Machine" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ "Shadow" = 'modular_ss220/clothing/icons/mob/suits.dmi',
+ )
+ lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
+ righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
+
diff --git a/modular_ss220/clothing/code/under.dm b/modular_ss220/clothing/code/under.dm
index 21a69ce23a36..bc2703bbe27b 100644
--- a/modular_ss220/clothing/code/under.dm
+++ b/modular_ss220/clothing/code/under.dm
@@ -49,226 +49,6 @@
"Nucleation" = 'modular_ss220/clothing/icons/mob/under.dmi',
)
-/obj/item/clothing/under/yellowgreen_skirt
- name = "жёлто-зеленая юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Жёлто-зеленый экземпляр."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "yellowgreen_skirt"
- item_color = "yellowgreen_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/aqua_skirt
- name = "юбка цвета морской волны"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Морской экземпляр. Любите длинные названия?"
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "aqua_skirt"
- item_color = "aqua_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/black_skirt
- name = "чёрная юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Чёрный экземпляр."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "black_skirt"
- item_color = "black_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/blue_skirt
- name = "синяя юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Синий экземпляр."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "blue_skirt"
- item_color = "blue_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/brown_skirt
- name = "коричневая юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Коричневый экземпляр."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "brown_skirt"
- item_color = "brown_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/darkblue_skirt
- name = "тёмно-синяя юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Тёмно-синий экземпляр."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "darkblue_skirt"
- item_color = "darkblue_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/darkred_skirt
- name = "тёмно-красная юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Тёмно-красный экземпляр."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "darkred_skirt"
- item_color = "darkred_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/green_skirt
- name = "зелёная юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Зелёный экземпляр."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "green_skirt"
- item_color = "green_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/grey_skirt
- name = "серая юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Серый экземпляр. Не забудьте противогаз."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "grey_skirt"
- item_color = "grey_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/lightblue_skirt
- name = "голубая юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Голубой экземпляр."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "lightblue_skirt"
- item_color = "lightblue_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/lightbrown_skirt
- name = "светло-коричневая юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Светло-коричневый экземпляр."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "lightbrown_skirt"
- item_color = "lightbrown_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/lightgreen_skirt
- name = "салатовая юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Салатовый экземпляр."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "lightgreen_skirt"
- item_color = "lightgreen_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/lightpurple_skirt
- name = "сиреневая юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Сиреневый экземпляр."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "lightpurple_skirt"
- item_color = "lightpurple_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/lightred_skirt
- name = "пунцовая юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Пунцовый экземпляр."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "lightred_skirt"
- item_color = "lightred_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/orange_skirt
- name = "оранжевая юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Оранжевый экземпляр."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "orange_skirt"
- item_color = "orange_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/pink_skirt
- name = "розовая юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Розовый экземпляр. Очень нежный."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "pink_skirt"
- item_color = "pink_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/prisoner_skirt
- name = "тюремная юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Тюремный экземпляр. Для самых милых и робких."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "prisoner_skirt"
- item_color = "prisoner_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/purple_skirt
- name = "фиолетовая юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Фиолетовый экземпляр."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "purple_skirt"
- item_color = "purple_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/rainbow_skirt
- name = "разноцветная юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Разноцветный экземпляр. Для неопределившихся."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "rainbow_skirt"
- item_color = "rainbow_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/red_skirt
- name = "красная юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Красный экземпляр. Работая по обе стороны, не забывайте про любовь."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "red_skirt"
- item_color = "red_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/white_skirt
- name = "белая юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Белый экземпляр. Возможно, отбеливатель был лишним."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "white_skirt"
- item_color = "white_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
-/obj/item/clothing/under/yellow_skirt
- name = "жёлтая юбка"
- desc = "Выделитесь одной из множеств новых юбок от NT Couture. Жёлтый экземпляр."
- icon = 'modular_ss220/clothing/icons/object/under.dmi'
- icon_state = "yellow_skirt"
- item_color = "yellow_skirt"
- sprite_sheets = list(
- "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
- )
-
/obj/item/clothing/under/towel
icon = 'modular_ss220/clothing/icons/object/under.dmi'
sprite_sheets = list(
@@ -448,3 +228,89 @@
/obj/item/clothing/under/towel/short/alt/brown
name = "коричневое махровое маленькое полотенце"
color = "#DEB887"
+
+/* EI uniform */
+/obj/item/clothing/under/ei_combat
+ name = "тактическая водолазка Gold on Black"
+ desc = "Все то же удобство, но в прекрасной гамме угольных оттенков."
+ icon = 'modular_ss220/clothing/icons/object/under.dmi'
+ icon_state = "ei_combat"
+ item_color = "ei_combat"
+ lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
+ righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
+ sprite_sheets = list(
+ "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Tajaran" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Vulpkanin" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/under.dmi',
+ "Skrell" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Nucleation" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Skeleton" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Slime People" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Unathi" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/under.dmi',
+ "Abductor" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Golem" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Machine" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Diona" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Nian" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Shadow" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/under.dmi',
+ "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/under.dmi',
+ )
+
+/obj/item/clothing/under/ei_skirt
+ name = "блузка с юбкой Gold on Black"
+ desc = "Не волнуйтесь, запачкать её будет крайне сложно, так что вы всегда будете прелестны и очаровательны. Даже если руки по локоть в крови."
+ icon = 'modular_ss220/clothing/icons/object/under.dmi'
+ icon_state = "ei_skirt"
+ item_color = "ei_skirt"
+ lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
+ righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
+ sprite_sheets = list(
+ "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Tajaran" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Vulpkanin" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/under.dmi',
+ "Skrell" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Nucleation" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Skeleton" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Slime People" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Unathi" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/under.dmi',
+ "Abductor" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Golem" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Machine" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Diona" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Nian" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Shadow" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/under.dmi',
+ "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/under.dmi',
+ )
+
+/obj/item/clothing/under/ei_skirt_alt
+ name = "юбка «Солнце» от EI"
+ desc = "Юбка «Солнце» в классических цветах корпорации EI."
+ icon = 'modular_ss220/clothing/icons/object/under.dmi'
+ icon_state = "ei_skirt_alt"
+ item_color = "ei_skirt_alt"
+ sprite_sheets = list(
+ "Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Tajaran" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Vulpkanin" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/under.dmi',
+ "Skrell" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Nucleation" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Skeleton" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Slime People" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Unathi" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/under.dmi',
+ "Abductor" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Golem" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Machine" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Diona" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Nian" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Shadow" = 'modular_ss220/clothing/icons/mob/under.dmi',
+ "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/under.dmi',
+ "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/under.dmi',
+ )
diff --git a/modular_ss220/clothing/icons/inhands/left_hand.dmi b/modular_ss220/clothing/icons/inhands/left_hand.dmi
index e180fd33c340..388dde1feacd 100644
Binary files a/modular_ss220/clothing/icons/inhands/left_hand.dmi and b/modular_ss220/clothing/icons/inhands/left_hand.dmi differ
diff --git a/modular_ss220/clothing/icons/inhands/right_hand.dmi b/modular_ss220/clothing/icons/inhands/right_hand.dmi
index d80645b832a0..30f99a7a85e7 100644
Binary files a/modular_ss220/clothing/icons/inhands/right_hand.dmi and b/modular_ss220/clothing/icons/inhands/right_hand.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/cloaks.dmi b/modular_ss220/clothing/icons/mob/cloaks.dmi
index 09045e72bd6c..b09be504a679 100644
Binary files a/modular_ss220/clothing/icons/mob/cloaks.dmi and b/modular_ss220/clothing/icons/mob/cloaks.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/hands.dmi b/modular_ss220/clothing/icons/mob/hands.dmi
index 4b4a10fbf5d7..380ab3f64c68 100644
Binary files a/modular_ss220/clothing/icons/mob/hands.dmi and b/modular_ss220/clothing/icons/mob/hands.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/hats.dmi b/modular_ss220/clothing/icons/mob/hats.dmi
index 9eb5dba46045..6c86f54f84bb 100644
Binary files a/modular_ss220/clothing/icons/mob/hats.dmi and b/modular_ss220/clothing/icons/mob/hats.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/helmet.dmi b/modular_ss220/clothing/icons/mob/helmet.dmi
index 4f04df8ddfb9..f446553cf564 100644
Binary files a/modular_ss220/clothing/icons/mob/helmet.dmi and b/modular_ss220/clothing/icons/mob/helmet.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/mask.dmi b/modular_ss220/clothing/icons/mob/mask.dmi
index 2362205420f4..afe1144c0a0c 100644
Binary files a/modular_ss220/clothing/icons/mob/mask.dmi and b/modular_ss220/clothing/icons/mob/mask.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/mod_clothing.dmi b/modular_ss220/clothing/icons/mob/mod_clothing.dmi
new file mode 100644
index 000000000000..b72c882ea4c3
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/mod_clothing.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/shoes.dmi b/modular_ss220/clothing/icons/mob/shoes.dmi
index d8f94b4ffe2b..6bf2712da541 100644
Binary files a/modular_ss220/clothing/icons/mob/shoes.dmi and b/modular_ss220/clothing/icons/mob/shoes.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/drask/cloaks.dmi b/modular_ss220/clothing/icons/mob/species/drask/cloaks.dmi
new file mode 100644
index 000000000000..16e62552dcee
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/drask/cloaks.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/drask/gloves.dmi b/modular_ss220/clothing/icons/mob/species/drask/gloves.dmi
new file mode 100644
index 000000000000..1f502c4a92bb
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/drask/gloves.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/drask/hats.dmi b/modular_ss220/clothing/icons/mob/species/drask/hats.dmi
new file mode 100644
index 000000000000..18ab856b2320
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/drask/hats.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/drask/mask.dmi b/modular_ss220/clothing/icons/mob/species/drask/mask.dmi
new file mode 100644
index 000000000000..098e6d9e1c46
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/drask/mask.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/drask/shoes.dmi b/modular_ss220/clothing/icons/mob/species/drask/shoes.dmi
index f6031b241158..201cacb5d03f 100644
Binary files a/modular_ss220/clothing/icons/mob/species/drask/shoes.dmi and b/modular_ss220/clothing/icons/mob/species/drask/shoes.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/drask/suits.dmi b/modular_ss220/clothing/icons/mob/species/drask/suits.dmi
index 8a7a2a1fb70f..1fdb6b70608c 100644
Binary files a/modular_ss220/clothing/icons/mob/species/drask/suits.dmi and b/modular_ss220/clothing/icons/mob/species/drask/suits.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/drask/under.dmi b/modular_ss220/clothing/icons/mob/species/drask/under.dmi
index b42a03442a89..9e5b8f3a7f07 100644
Binary files a/modular_ss220/clothing/icons/mob/species/drask/under.dmi and b/modular_ss220/clothing/icons/mob/species/drask/under.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/grey/cloaks.dmi b/modular_ss220/clothing/icons/mob/species/grey/cloaks.dmi
new file mode 100644
index 000000000000..8c676731e867
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/grey/cloaks.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/grey/gloves.dmi b/modular_ss220/clothing/icons/mob/species/grey/gloves.dmi
new file mode 100644
index 000000000000..77f4c571ea8f
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/grey/gloves.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/grey/hats.dmi b/modular_ss220/clothing/icons/mob/species/grey/hats.dmi
index 7cabd20be3fc..9d52d6b5939a 100644
Binary files a/modular_ss220/clothing/icons/mob/species/grey/hats.dmi and b/modular_ss220/clothing/icons/mob/species/grey/hats.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/grey/mask.dmi b/modular_ss220/clothing/icons/mob/species/grey/mask.dmi
new file mode 100644
index 000000000000..1b315f9ef806
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/grey/mask.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/grey/suits.dmi b/modular_ss220/clothing/icons/mob/species/grey/suits.dmi
index 182aaeb23311..3f62407fd4d2 100644
Binary files a/modular_ss220/clothing/icons/mob/species/grey/suits.dmi and b/modular_ss220/clothing/icons/mob/species/grey/suits.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/grey/under.dmi b/modular_ss220/clothing/icons/mob/species/grey/under.dmi
index 68b7d8395972..be528b4ba07b 100644
Binary files a/modular_ss220/clothing/icons/mob/species/grey/under.dmi and b/modular_ss220/clothing/icons/mob/species/grey/under.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/kidan/cloaks.dmi b/modular_ss220/clothing/icons/mob/species/kidan/cloaks.dmi
new file mode 100644
index 000000000000..be78528f8df1
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/kidan/cloaks.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/kidan/gloves.dmi b/modular_ss220/clothing/icons/mob/species/kidan/gloves.dmi
new file mode 100644
index 000000000000..e0807cf5e01b
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/kidan/gloves.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/kidan/hats.dmi b/modular_ss220/clothing/icons/mob/species/kidan/hats.dmi
index f9b77a5eadbf..18e2d4b7dc0e 100644
Binary files a/modular_ss220/clothing/icons/mob/species/kidan/hats.dmi and b/modular_ss220/clothing/icons/mob/species/kidan/hats.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/kidan/mask.dmi b/modular_ss220/clothing/icons/mob/species/kidan/mask.dmi
new file mode 100644
index 000000000000..bc686ad2d48e
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/kidan/mask.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/kidan/shoes.dmi b/modular_ss220/clothing/icons/mob/species/kidan/shoes.dmi
new file mode 100644
index 000000000000..f931a3169dd9
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/kidan/shoes.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/kidan/suits.dmi b/modular_ss220/clothing/icons/mob/species/kidan/suits.dmi
index 97d6e623b377..1f95f6438931 100644
Binary files a/modular_ss220/clothing/icons/mob/species/kidan/suits.dmi and b/modular_ss220/clothing/icons/mob/species/kidan/suits.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/kidan/under.dmi b/modular_ss220/clothing/icons/mob/species/kidan/under.dmi
new file mode 100644
index 000000000000..dda63767a270
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/kidan/under.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/skrell/mod_clothing.dmi b/modular_ss220/clothing/icons/mob/species/skrell/mod_clothing.dmi
new file mode 100644
index 000000000000..b72c882ea4c3
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/skrell/mod_clothing.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/tajaran/hats.dmi b/modular_ss220/clothing/icons/mob/species/tajaran/hats.dmi
index 576737256ca5..499768c34054 100644
Binary files a/modular_ss220/clothing/icons/mob/species/tajaran/hats.dmi and b/modular_ss220/clothing/icons/mob/species/tajaran/hats.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/unathi/mask.dmi b/modular_ss220/clothing/icons/mob/species/unathi/mask.dmi
new file mode 100644
index 000000000000..1f1dfc5103c4
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/unathi/mask.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/vox/cloaks.dmi b/modular_ss220/clothing/icons/mob/species/vox/cloaks.dmi
new file mode 100644
index 000000000000..83d59eef44b5
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/vox/cloaks.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/vox/gloves.dmi b/modular_ss220/clothing/icons/mob/species/vox/gloves.dmi
new file mode 100644
index 000000000000..34d6618a1060
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/vox/gloves.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/vox/hats.dmi b/modular_ss220/clothing/icons/mob/species/vox/hats.dmi
index e4b0c0232568..ee53b84a1d9c 100644
Binary files a/modular_ss220/clothing/icons/mob/species/vox/hats.dmi and b/modular_ss220/clothing/icons/mob/species/vox/hats.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/vox/mask.dmi b/modular_ss220/clothing/icons/mob/species/vox/mask.dmi
new file mode 100644
index 000000000000..eeb523eea4ae
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/vox/mask.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/vox/shoes.dmi b/modular_ss220/clothing/icons/mob/species/vox/shoes.dmi
index 3e48a845cf82..a62578dc97fb 100644
Binary files a/modular_ss220/clothing/icons/mob/species/vox/shoes.dmi and b/modular_ss220/clothing/icons/mob/species/vox/shoes.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/vox/suits.dmi b/modular_ss220/clothing/icons/mob/species/vox/suits.dmi
index 1166820e46ff..c1b4423ee12e 100644
Binary files a/modular_ss220/clothing/icons/mob/species/vox/suits.dmi and b/modular_ss220/clothing/icons/mob/species/vox/suits.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/vox/under.dmi b/modular_ss220/clothing/icons/mob/species/vox/under.dmi
index f6d259da3cc1..92db8e05e138 100644
Binary files a/modular_ss220/clothing/icons/mob/species/vox/under.dmi and b/modular_ss220/clothing/icons/mob/species/vox/under.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/vulpkanin/hats.dmi b/modular_ss220/clothing/icons/mob/species/vulpkanin/hats.dmi
index 17f0315187f7..6e61169fc42c 100644
Binary files a/modular_ss220/clothing/icons/mob/species/vulpkanin/hats.dmi and b/modular_ss220/clothing/icons/mob/species/vulpkanin/hats.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/species/vulpkanin/mask.dmi b/modular_ss220/clothing/icons/mob/species/vulpkanin/mask.dmi
new file mode 100644
index 000000000000..7199f7cd3e20
Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/vulpkanin/mask.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/suits.dmi b/modular_ss220/clothing/icons/mob/suits.dmi
index e89635f14900..1fdf65d327a2 100644
Binary files a/modular_ss220/clothing/icons/mob/suits.dmi and b/modular_ss220/clothing/icons/mob/suits.dmi differ
diff --git a/modular_ss220/clothing/icons/mob/under.dmi b/modular_ss220/clothing/icons/mob/under.dmi
index e68fa6a1b24c..d0c71f83a2cb 100644
Binary files a/modular_ss220/clothing/icons/mob/under.dmi and b/modular_ss220/clothing/icons/mob/under.dmi differ
diff --git a/modular_ss220/clothing/icons/object/cloaks.dmi b/modular_ss220/clothing/icons/object/cloaks.dmi
index 7c42872d2fc8..450347b6f451 100644
Binary files a/modular_ss220/clothing/icons/object/cloaks.dmi and b/modular_ss220/clothing/icons/object/cloaks.dmi differ
diff --git a/modular_ss220/clothing/icons/object/gloves.dmi b/modular_ss220/clothing/icons/object/gloves.dmi
index 6ddabb5d7327..4538b9e4dfdb 100644
Binary files a/modular_ss220/clothing/icons/object/gloves.dmi and b/modular_ss220/clothing/icons/object/gloves.dmi differ
diff --git a/modular_ss220/clothing/icons/object/hats.dmi b/modular_ss220/clothing/icons/object/hats.dmi
index 0da59fcd9b1a..c9c47cb05d8f 100644
Binary files a/modular_ss220/clothing/icons/object/hats.dmi and b/modular_ss220/clothing/icons/object/hats.dmi differ
diff --git a/modular_ss220/clothing/icons/object/helmet.dmi b/modular_ss220/clothing/icons/object/helmet.dmi
index 6a9df565e53e..683c86811fb5 100644
Binary files a/modular_ss220/clothing/icons/object/helmet.dmi and b/modular_ss220/clothing/icons/object/helmet.dmi differ
diff --git a/modular_ss220/clothing/icons/object/masks.dmi b/modular_ss220/clothing/icons/object/masks.dmi
index 9c82cc1ce066..0f256e88b4d8 100644
Binary files a/modular_ss220/clothing/icons/object/masks.dmi and b/modular_ss220/clothing/icons/object/masks.dmi differ
diff --git a/modular_ss220/clothing/icons/object/mod_clothing.dmi b/modular_ss220/clothing/icons/object/mod_clothing.dmi
new file mode 100644
index 000000000000..2c08f1e9ca76
Binary files /dev/null and b/modular_ss220/clothing/icons/object/mod_clothing.dmi differ
diff --git a/modular_ss220/clothing/icons/object/shoes.dmi b/modular_ss220/clothing/icons/object/shoes.dmi
index c08226fa7d39..af39eb1b29f8 100644
Binary files a/modular_ss220/clothing/icons/object/shoes.dmi and b/modular_ss220/clothing/icons/object/shoes.dmi differ
diff --git a/modular_ss220/clothing/icons/object/suits.dmi b/modular_ss220/clothing/icons/object/suits.dmi
index 023cb112fbdb..2adce2ca6a0b 100644
Binary files a/modular_ss220/clothing/icons/object/suits.dmi and b/modular_ss220/clothing/icons/object/suits.dmi differ
diff --git a/modular_ss220/clothing/icons/object/under.dmi b/modular_ss220/clothing/icons/object/under.dmi
index f1dc9aac1cb7..b918484e20ea 100644
Binary files a/modular_ss220/clothing/icons/object/under.dmi and b/modular_ss220/clothing/icons/object/under.dmi differ
diff --git a/modular_ss220/emotes/_emotes.dm b/modular_ss220/emotes/_emotes.dm
index f61dac15cda6..3b599c981128 100644
--- a/modular_ss220/emotes/_emotes.dm
+++ b/modular_ss220/emotes/_emotes.dm
@@ -1,4 +1,4 @@
/datum/modpack/emotes
name = "Панель эмоций"
desc = "Добавляет панель эмоций в меню. Добавляет опциональное ТГУИ меню эмоций в IC. Добавляет новые эмоции."
- author = "furior, larentoun, Aylong, PhantomRU, BR54FF"
+ author = "furior, larentoun, Aylong, PhantomRU, BR54FF, Dekupich"
diff --git a/modular_ss220/emotes/audio/tajaran/annoyed_meow_tajaran.ogg b/modular_ss220/emotes/audio/tajaran/annoyed_meow_tajaran.ogg
new file mode 100644
index 000000000000..add32db8d9c7
Binary files /dev/null and b/modular_ss220/emotes/audio/tajaran/annoyed_meow_tajaran.ogg differ
diff --git a/modular_ss220/emotes/audio/tajaran/meow_tajaran.ogg b/modular_ss220/emotes/audio/tajaran/meow_tajaran.ogg
new file mode 100644
index 000000000000..3dcccca7de7c
Binary files /dev/null and b/modular_ss220/emotes/audio/tajaran/meow_tajaran.ogg differ
diff --git a/modular_ss220/emotes/code/emote.dm b/modular_ss220/emotes/code/emote.dm
index 322f1a22c4d8..ab609d669df3 100644
--- a/modular_ss220/emotes/code/emote.dm
+++ b/modular_ss220/emotes/code/emote.dm
@@ -431,3 +431,29 @@
cooldown = 10 SECONDS
volume = 50
muzzled_noises = list("слабо")
+
+/datum/emote/living/carbon/human/meow
+ key = "meow"
+ key_third_person = "meow"
+ message = "мяукает."
+ message_param = "мяукает на %t."
+ sound = 'modular_ss220/emotes/audio/tajaran/meow_tajaran.ogg'
+ species_type_whitelist_typecache = list(/datum/species/tajaran)
+ emote_type = EMOTE_VISIBLE | EMOTE_MOUTH | EMOTE_AUDIBLE
+ vary = TRUE
+ cooldown = 10 SECONDS
+ volume = 50
+ muzzled_noises = list("слабо")
+
+/datum/emote/living/carbon/human/mrow
+ key = "mrow"
+ key_third_person = "mrow"
+ message = "раздражённо мяукает."
+ message_param = "раздражённо мяукает на %t."
+ sound = 'modular_ss220/emotes/audio/tajaran/annoyed_meow_tajaran.ogg'
+ species_type_whitelist_typecache = list(/datum/species/tajaran)
+ emote_type = EMOTE_VISIBLE | EMOTE_MOUTH | EMOTE_AUDIBLE
+ vary = TRUE
+ cooldown = 10 SECONDS
+ volume = 70
+ muzzled_noises = list("слабо")
diff --git a/modular_ss220/emotes/code/emote_names.dm b/modular_ss220/emotes/code/emote_names.dm
index 6cd8ad00d82c..f3fdcc5be3ec 100644
--- a/modular_ss220/emotes/code/emote_names.dm
+++ b/modular_ss220/emotes/code/emote_names.dm
@@ -458,6 +458,12 @@
/datum/emote/living/carbon/human/slime/pop
name = EMOTE_HUMAN_POP
+/datum/emote/living/carbon/human/tajaran/meow
+ name = EMOTE_HUMAN_MEOW
+
+/datum/emote/living/carbon/human/tajaran/mrow
+ name = EMOTE_HUMAN_MROW
+
/// Emote Animal
/datum/emote/living/simple_animal/gorilla/ooga
diff --git a/modular_ss220/emotes/code/emote_verbs.dm b/modular_ss220/emotes/code/emote_verbs.dm
index a31fb8c4486f..e441c13ad8d4 100644
--- a/modular_ss220/emotes/code/emote_verbs.dm
+++ b/modular_ss220/emotes/code/emote_verbs.dm
@@ -483,6 +483,16 @@
set category = "Эмоции"
emote("wiggles", intentional = TRUE)
+/mob/living/carbon/human/proc/emote_meow()
+ set name = "< " + EMOTE_HUMAN_MEOW + " >"
+ set category = "Эмоции"
+ emote("meow", intentional = TRUE)
+
+/mob/living/carbon/human/proc/emote_mrow()
+ set name = "< " + EMOTE_HUMAN_MROW + " >"
+ set category = "Эмоции"
+ emote("mrow", intentional = TRUE)
+
/mob/living/carbon/human/verb/emote_wave()
set name = "◦ " + EMOTE_CARBON_WAVE + " "
set category = "Эмоции"
diff --git a/modular_ss220/emotes/code/racial_emotes.dm b/modular_ss220/emotes/code/racial_emotes.dm
index d70bcac25f68..5b7dab93c7e4 100644
--- a/modular_ss220/emotes/code/racial_emotes.dm
+++ b/modular_ss220/emotes/code/racial_emotes.dm
@@ -109,6 +109,8 @@
H.verbs |= /mob/living/carbon/human/proc/emote_purr
H.verbs |= /mob/living/carbon/human/proc/emote_purrl
H.verbs |= /mob/living/carbon/human/proc/emote_hiss
+ H.verbs |= /mob/living/carbon/human/proc/emote_meow
+ H.verbs |= /mob/living/carbon/human/proc/emote_mrow
/datum/species/tajaran/on_species_loss(mob/living/carbon/human/H)
..()
@@ -117,6 +119,8 @@
H.verbs -= /mob/living/carbon/human/proc/emote_purr
H.verbs -= /mob/living/carbon/human/proc/emote_purrl
H.verbs -= /mob/living/carbon/human/proc/emote_hiss
+ H.verbs -= /mob/living/carbon/human/proc/emote_meow
+ H.verbs -= /mob/living/carbon/human/proc/emote_mrow
/datum/species/unathi/on_species_gain(mob/living/carbon/human/H)
..()
diff --git a/modular_ss220/food_and_drinks/code/food/food.dm b/modular_ss220/food_and_drinks/code/food/food.dm
index 1c58e95bbb36..545368cfd096 100644
--- a/modular_ss220/food_and_drinks/code/food/food.dm
+++ b/modular_ss220/food_and_drinks/code/food/food.dm
@@ -979,6 +979,30 @@
icon = 'modular_ss220/food_and_drinks/icons/trash.dmi'
icon_state = "pan"
+/obj/item/food/soup/sawdust_soup
+ name = "суп из опилок"
+ desc = "Отчаянные времена требуют отчаянных мер..."
+ icon = 'modular_ss220/food_and_drinks/icons/food.dmi'
+ icon_state = "sawdustsoup"
+ lefthand_file = 'modular_ss220/food_and_drinks/icons/food_lefthand.dmi'
+ righthand_file = 'modular_ss220/food_and_drinks/icons/food_righthand.dmi'
+ filling_color = "#fae4b5"
+ trash = /obj/item/trash/snack_bowl
+ list_reagents = list("water" = 10, "nutriment" = 2, "vitamin" = 1)
+ tastes = list("опилки" = 1)
+ goal_difficulty = FOOD_GOAL_SKIP
+
+/datum/recipe/microwave/sawdust_soup
+ reagents = list("water" = 20)
+ items = list(/obj/item/stack/sheet/wood = 1)
+ result = /obj/item/food/soup/sawdust_soup
+
+/obj/item/food/soup/sawdust_soup/On_Consume(mob/M, mob/user)
+ . = ..()
+ var/mob/living/carbon/consumer = user
+ if(prob(5))
+ consumer.vomit(nutritional_value * 2.5)
+
// Infinite Pizza Box
/obj/item/pizzabox/infinite
resistance_flags = FIRE_PROOF | LAVA_PROOF | ACID_PROOF
diff --git a/modular_ss220/food_and_drinks/icons/food.dmi b/modular_ss220/food_and_drinks/icons/food.dmi
index e7b987931d22..02942fde8dd5 100644
Binary files a/modular_ss220/food_and_drinks/icons/food.dmi and b/modular_ss220/food_and_drinks/icons/food.dmi differ
diff --git a/modular_ss220/food_and_drinks/icons/food_lefthand.dmi b/modular_ss220/food_and_drinks/icons/food_lefthand.dmi
new file mode 100644
index 000000000000..6ce3684e0883
Binary files /dev/null and b/modular_ss220/food_and_drinks/icons/food_lefthand.dmi differ
diff --git a/modular_ss220/food_and_drinks/icons/food_righthand.dmi b/modular_ss220/food_and_drinks/icons/food_righthand.dmi
new file mode 100644
index 000000000000..a0eb7219aa8c
Binary files /dev/null and b/modular_ss220/food_and_drinks/icons/food_righthand.dmi differ
diff --git a/modular_ss220/jobs/code/donor/donor_jobs.dm b/modular_ss220/jobs/code/donor/donor_jobs.dm
index ce423ac6cdae..d7cbc1e5a859 100644
--- a/modular_ss220/jobs/code/donor/donor_jobs.dm
+++ b/modular_ss220/jobs/code/donor/donor_jobs.dm
@@ -8,7 +8,7 @@
supervisors = "the head of personnel"
department_head = list("Head of Personnel")
selection_color = "#fbd5ff"
- access = list( ACCESS_MAINT_TUNNELS)
+ access = list(ACCESS_MAINT_TUNNELS)
alt_titles = null
outfit = /datum/outfit/job/donor
hidden_from_job_prefs = TRUE
diff --git a/modular_ss220/jobs/code/jobs_global_list.dm b/modular_ss220/jobs/code/jobs_global_list.dm
index 6da25d934924..02c3923603db 100644
--- a/modular_ss220/jobs/code/jobs_global_list.dm
+++ b/modular_ss220/jobs/code/jobs_global_list.dm
@@ -16,6 +16,11 @@ GLOBAL_LIST_INIT(security_positions_ss220, list(
"Security Cadet",
))
+// ====================== EVENT ======================
+GLOBAL_LIST_INIT(event_ss220, list(
+ "SDTF Raskinta Katish",
+ "Emperor Guard",
+))
// ====================== DONOR ======================
GLOBAL_LIST_INIT(donor_tier_1_jobs, list(
@@ -92,13 +97,13 @@ GLOBAL_LIST_INIT(jobs_excluded_from_selection, list("Donor"))
// ====================== SPECIAL ======================
// cant be antags
GLOBAL_LIST_INIT(restricted_jobs_ss220, security_positions_ss220 + (
- donor_tier_4_jobs + donor_tier_5_jobs + jobs_excluded_from_selection
+ donor_tier_4_jobs + donor_tier_5_jobs + jobs_excluded_from_selection + event_ss220
))
// ===================== ALL JOBS =====================
GLOBAL_LIST_INIT(all_jobs_ss220, (list() + (
- medical_positions_ss220 + science_positions_ss220 + engineering_positions_ss220 + security_positions_ss220 + all_donor_jobs)))
+ medical_positions_ss220 + science_positions_ss220 + engineering_positions_ss220 + security_positions_ss220 + all_donor_jobs + event_ss220)))
// ====================== TITLE ======================
@@ -133,5 +138,8 @@ GLOBAL_LIST_INIT(all_jobs_ss220, (list() + (
/proc/get_all_assistant_titles_ss220()
return GLOB.assistant_donor_jobs + get_alt_titles(GLOB.assistant_donor_jobs)
+/proc/get_all_event_titles_ss220()
+ return GLOB.event_ss220 + get_alt_titles(GLOB.event_ss220)
+
/proc/get_all_titles_ss220()
- return get_all_medical_titles_ss220() + get_all_security_titles_ss220() + get_all_engineering_titles_ss220() + get_all_science_titles_ss220() + get_all_service_titles_ss220() + get_all_supply_titles_ss220() + get_all_assistant_titles_ss220()
+ return get_all_medical_titles_ss220() + get_all_security_titles_ss220() + get_all_engineering_titles_ss220() + get_all_science_titles_ss220() + get_all_service_titles_ss220() + get_all_supply_titles_ss220() + get_all_assistant_titles_ss220() + get_all_event_titles_ss220()
diff --git a/modular_ss220/jobs/icons/hud.dmi b/modular_ss220/jobs/icons/hud.dmi
index 21c2a2aa47f6..9a032a279adf 100644
Binary files a/modular_ss220/jobs/icons/hud.dmi and b/modular_ss220/jobs/icons/hud.dmi differ
diff --git a/modular_ss220/keybindings/code/emote_keybinds.dm b/modular_ss220/keybindings/code/emote_keybinds.dm
index e92a7d3eb3cd..5ce1af0f6202 100644
--- a/modular_ss220/keybindings/code/emote_keybinds.dm
+++ b/modular_ss220/keybindings/code/emote_keybinds.dm
@@ -85,6 +85,22 @@
linked_emote = /datum/emote/living/carbon/human/ururu
name = EMOTE_HUMAN_RUMBLE
+/datum/keybinding/emote/carbon/human/meow
+ linked_emote = /datum/emote/living/carbon/human/meow
+ name = EMOTE_HUMAN_MEOW
+
+/datum/keybinding/emote/carbon/human/meow/New()
+ . = ..()
+ name += " (таяр)"
+
+/datum/keybinding/emote/carbon/human/mrow
+ linked_emote = /datum/emote/living/carbon/human/mrow
+ name = EMOTE_HUMAN_MROW
+
+/datum/keybinding/emote/carbon/human/mrow/New()
+ . = ..()
+ name += " (таяр)"
+
/datum/keybinding/emote/carbon/human/drask_talk/New()
..()
name += " (драск)"
diff --git a/modular_ss220/loadout/_loadout.dm b/modular_ss220/loadout/_loadout.dm
index 0fe0daa60481..9de83602ad79 100644
--- a/modular_ss220/loadout/_loadout.dm
+++ b/modular_ss220/loadout/_loadout.dm
@@ -1,4 +1,4 @@
/datum/modpack/loadout
name = "Loadout"
desc = "Добавляет новые вещи в Loadout."
- author = "Aylong220, Yata9arasu"
+ author = "Aylong, Yata9arasu, Dekupich"
diff --git a/modular_ss220/loadout/_loadout.dme b/modular_ss220/loadout/_loadout.dme
index c2914f30488f..b192ca56568f 100644
--- a/modular_ss220/loadout/_loadout.dme
+++ b/modular_ss220/loadout/_loadout.dme
@@ -2,6 +2,7 @@
#include "code/donor.dm"
#include "code/donor_items.dm"
+#include "code/racial.dm"
#include "code/removal.dm"
#include "code/shoes.dm"
#include "code/suit.dm"
diff --git a/modular_ss220/loadout/code/donor.dm b/modular_ss220/loadout/code/donor.dm
index bb0bbd87c6b3..068b207b0fd3 100644
--- a/modular_ss220/loadout/code/donor.dm
+++ b/modular_ss220/loadout/code/donor.dm
@@ -320,3 +320,58 @@
path = /obj/item/id_skin/boykisser
donator_tier = 4
cost = 5
+
+// MARK: EI clothes
+/datum/gear/donor/ei_cloak
+ display_name = "Плащ Gold On Black"
+ path = /obj/item/clothing/suit/hooded/ei_cloak
+ donator_tier = 2
+ cost = 2
+
+/datum/gear/donor/ei_gloves
+ display_name = "Перчатки Gold On Black"
+ path = /obj/item/clothing/gloves/color/ei_gloves
+ donator_tier = 1
+ cost = 1
+
+/datum/gear/donor/ei_mask
+ display_name = "Дыхательная маска от EI"
+ path = /obj/item/clothing/mask/breath/ei_mask
+ donator_tier = 3
+ cost = 3
+
+/datum/gear/donor/ei_shoes
+ display_name = "Ботинки Gold On Black"
+ path = /obj/item/clothing/shoes/ei_shoes
+ donator_tier = 1
+ cost = 1
+
+/datum/gear/donor/ei_jacket
+ display_name = "Кожаная куртка Rock on Black"
+ path = /obj/item/clothing/suit/storage/ei_jacket
+ donator_tier = 2
+ cost = 1
+
+/datum/gear/donor/ei_coat
+ display_name = "Офицерский плащ EI"
+ path = /obj/item/clothing/suit/storage/ei_coat
+ donator_tier = 4
+ cost = 4
+
+/datum/gear/donor/ei_combat
+ display_name = "Тактическая водолазка Gold on Black"
+ path = /obj/item/clothing/under/ei_combat
+ donator_tier = 1
+ cost = 1
+
+/datum/gear/donor/ei_skirt
+ display_name = "Блузка с юбкой Gold on Black"
+ path = /obj/item/clothing/under/ei_skirt
+ donator_tier = 1
+ cost = 1
+
+/datum/gear/donor/ei_skirt_alt
+ display_name = "Юбка «Солнце» от EI"
+ path = /obj/item/clothing/under/ei_skirt_alt
+ donator_tier = 1
+ cost = 1
diff --git a/modular_ss220/loadout/code/racial.dm b/modular_ss220/loadout/code/racial.dm
new file mode 100644
index 000000000000..b69406d7f986
--- /dev/null
+++ b/modular_ss220/loadout/code/racial.dm
@@ -0,0 +1,42 @@
+// MARK: Vox
+
+/datum/gear/racial/vox_sandal
+ display_name = "Vox sandals"
+ path = /obj/item/clothing/shoes/roman/vox
+ slot = SLOT_HUD_SHOES
+
+/datum/gear/racial/vox_gauntlets
+ display_name = "Vox gauntlets"
+ path = /obj/item/clothing/gloves/vox/light
+ slot = SLOT_HUD_GLOVES
+
+/datum/gear/racial/vox_jumpsuit
+ display_name = "Vox work jumpsuit"
+ description = "These loose clothes are optimized for the labors of the lower castes onboard the arkships. Large openings in the top allow for breathability while the pants are durable yet flexible enough to not restrict movement."
+ path = /obj/item/clothing/under/vox/jumpsuit
+ slot = SLOT_HUD_JUMPSUIT
+
+/datum/gear/racial/vox_jumpsuit/red
+ display_name = "Vox red jumpsuit"
+ path = /obj/item/clothing/under/vox/jumpsuit/red
+
+/datum/gear/racial/vox_jumpsuit/teal
+ display_name = "Vox teal jumpsuit"
+ path = /obj/item/clothing/under/vox/jumpsuit/teal
+
+/datum/gear/racial/vox_jumpsuit/blue
+ display_name = "Vox blue jumpsuit"
+ path = /obj/item/clothing/under/vox/jumpsuit/blue
+
+/datum/gear/racial/vox_jumpsuit/green
+ display_name = "Vox green jumpsuit"
+ path = /obj/item/clothing/under/vox/jumpsuit/green
+
+/datum/gear/racial/vox_jumpsuit/yellow
+ display_name = "Vox yellow jumpsuit"
+ path = /obj/item/clothing/under/vox/jumpsuit/yellow
+
+/datum/gear/racial/vox_jumpsuit/purple
+ display_name = "Vox purple jumpsuit"
+ path = /obj/item/clothing/under/vox/jumpsuit/purple
+
diff --git a/modular_ss220/maps220/code/Station/station_areas.dm b/modular_ss220/maps220/code/Station/station_areas.dm
index 5900b9530910..96d8b808c5e4 100644
--- a/modular_ss220/maps220/code/Station/station_areas.dm
+++ b/modular_ss220/maps220/code/Station/station_areas.dm
@@ -15,6 +15,11 @@
/area/station/security/processing
request_console_name = "Security"
+/area/station/security/restroom
+ name = "Комната отдыха Службы Безопасности"
+ icon_state = "security"
+ request_console_name = "Security"
+
/area/mine/laborcamp
request_console_name = "Labor Camp"
@@ -46,7 +51,7 @@
/area/station/engineering/controlroom
request_console_name = "Engineering"
-
+
/area/station/engineering/dronefabricator
name = "Комната Изготовления Дронов"
icon_state = "engi"
@@ -98,6 +103,9 @@
/area/station/medical/virology
request_console_name = "Virology"
+/area/station/medical/virology/test_room
+ name = "Тестовая Комната Вирусологии"
+
/area/station/medical/chemistry
request_console_name = "Chemistry"
diff --git a/modular_ss220/maps220/code/misc.dm b/modular_ss220/maps220/code/misc.dm
index 50532fb45175..a95f3759894f 100644
--- a/modular_ss220/maps220/code/misc.dm
+++ b/modular_ss220/maps220/code/misc.dm
@@ -52,7 +52,7 @@
else if(!insisting)
to_chat(user, span_cult("Ваше первое прикосновение заставляет [name] зашевелиться, прислушиваясь к вам. Вы действительно уверены, что хотите это сделать?"))
insisting = TRUE
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
return
insisting = FALSE
@@ -60,7 +60,7 @@
if(!wish)
return
charges--
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
var/mob/living/carbon/human/human = user
var/become_shadow = TRUE
diff --git a/modular_ss220/maps220/code/mobs.dm b/modular_ss220/maps220/code/mobs.dm
index db647cb7a77e..6649aab50e05 100644
--- a/modular_ss220/maps220/code/mobs.dm
+++ b/modular_ss220/maps220/code/mobs.dm
@@ -212,7 +212,7 @@
attacktext = "claw"
attack_sound = 'sound/weapons/bladeslice.ogg'
a_intent = INTENT_HARM
- loot = list(/obj/effect/spawner/random/maintenance/one = 1)
+ loot = list(/obj/effect/spawner/random/maintenance = 1)
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 5, "max_n2" = 0)
unsuitable_atmos_damage = 7.5
faction = list("Vox")
@@ -229,7 +229,7 @@
icon_dead = "voxmeleedead"
melee_damage_lower = 15
melee_damage_upper = 15
- loot = list(/obj/effect/spawner/random/maintenance/two = 1)
+ loot = list(/obj/effect/spawner/random/maintenance = 1)
attacktext = "slash"
attack_sound = 'sound/weapons/bladeslice.ogg'
status_flags = 0
@@ -247,7 +247,7 @@
minimum_distance = 5
casingtype = /obj/item/ammo_casing/c45
projectilesound = 'sound/weapons/gunshots/gunshot_strong.ogg'
- loot = list(/obj/effect/spawner/random/maintenance/three = 1)
+ loot = list(/obj/effect/spawner/random/maintenance = 1)
/mob/living/simple_animal/hostile/vox/ranged_laser
name = "Vox Laser Gunman"
@@ -263,7 +263,7 @@
melee_damage_upper = 20
projectiletype = /obj/item/projectile/beam/laser
projectilesound = 'sound/weapons/laser.ogg'
- loot = list(/obj/effect/spawner/random/maintenance/one = 1)
+ loot = list(/obj/effect/spawner/random/maintenance = 1)
/mob/living/simple_animal/hostile/vox/ranged_laser/space
name = "Vox Helmsman"
@@ -274,7 +274,7 @@
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
wander = FALSE
minbodytemp = 0
- loot = list(/obj/effect/spawner/random/maintenance/three = 1)
+ loot = list(/obj/effect/spawner/random/maintenance = 1)
/* Jungle Mob */
/mob/living/simple_animal/hostile/jungle_lizard
@@ -566,7 +566,7 @@
melee_damage_upper = 25
attacktext = "моргает на"
attack_sound = 'sound/weapons/pierce.ogg'
- flying = TRUE
+ initial_traits = list(TRAIT_FLYING)
faction = list("spooky")
del_on_death = TRUE
@@ -1092,7 +1092,7 @@
status_flags = NONE
wander = TRUE
loot = list(/obj/effect/gibspawner/xeno, /obj/item/stack/ore/bluespace_crystal/refined = 30, /obj/item/card/id/xen_key, /obj/item/gun/energy/wormhole_projector)
- flying = TRUE
+ initial_traits = list(TRAIT_FLYING)
death_sound = 'modular_ss220/aesthetics_sounds/sound/mobs/nihilanth/nihilanth_pain01.ogg'
/obj/item/card/id/xen_key
diff --git a/modular_ss220/maps220/code/objects.dm b/modular_ss220/maps220/code/objects.dm
index 3a4c22d47cfc..19e936943000 100644
--- a/modular_ss220/maps220/code/objects.dm
+++ b/modular_ss220/maps220/code/objects.dm
@@ -124,9 +124,6 @@
name = "Syndicate Medical Doctor's Locker"
req_access = list(ACCESS_SYNDICATE)
icon_state = "tac"
- icon_closed = "tac"
- icon_opened = "tac_open"
- open_door_sprite = "syndicate_door"
/obj/structure/closet/secure_closet/syndicate/medbay/populate_contents()
new /obj/item/storage/backpack/duffel/syndie/med/surgery
diff --git a/modular_ss220/maps220/code/spawners.dm b/modular_ss220/maps220/code/spawners.dm
index 94b6559d96ab..4df87a28e78d 100644
--- a/modular_ss220/maps220/code/spawners.dm
+++ b/modular_ss220/maps220/code/spawners.dm
@@ -41,34 +41,6 @@
/obj/effect/spawner/random/maintenance
icon = 'modular_ss220/maps220/icons/spawner_icons.dmi'
-/obj/effect/spawner/random/maintenance/one
- icon_state = "loot"
-
-/obj/effect/spawner/random/maintenance/one/Initialize(mapload)
- . = ..()
- spawn_loot_count = 1
-
-/obj/effect/spawner/random/maintenance/two
- icon_state = "doubleloot"
-
-/obj/effect/spawner/random/maintenance/two/Initialize(mapload)
- . = ..()
- spawn_loot_count = 2
-
-/obj/effect/spawner/random/maintenance/three
- icon_state = "tripleloot"
-
-/obj/effect/spawner/random/maintenance/three/Initialize(mapload)
- . = ..()
- spawn_loot_count = 3
-
-/obj/effect/spawner/random/maintenance/five
- icon_state = "moreloot"
-
-/obj/effect/spawner/random/maintenance/five/Initialize(mapload)
- . = ..()
- spawn_loot_count = 5
-
/obj/effect/spawner/random/trash
icon = 'modular_ss220/maps220/icons/spawner_icons.dmi'
@@ -243,7 +215,7 @@
suit_store = /obj/item/gun/projectile/shotgun/riot
backpack_contents = list(
/obj/item/storage/box/survival = 1,
- /obj/item/storage/box/buck = 1
+ /obj/item/storage/fancy/shell/buck = 1
)
return ..()
@@ -328,7 +300,7 @@
/obj/item/reagent_containers/patch/silver_sulf/small,
/obj/item/reagent_containers/patch/styptic/small,
/obj/item/stock_parts/cell/high = 1,
- /obj/item/storage/box/buck = 1
+ /obj/item/storage/fancy/shell/buck = 1
)
return ..()
diff --git a/modular_ss220/mobs/code/simple_animal/friendly/moth.dm b/modular_ss220/mobs/code/simple_animal/friendly/moth.dm
index e0edb0831125..a1bf128f999b 100644
--- a/modular_ss220/mobs/code/simple_animal/friendly/moth.dm
+++ b/modular_ss220/mobs/code/simple_animal/friendly/moth.dm
@@ -16,7 +16,7 @@
see_in_dark = 100
friendly = "nudges"
density = 0
- flying = TRUE
+ initial_traits = list(TRAIT_FLYING)
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
ventcrawler = 2
mob_size = MOB_SIZE_TINY
diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme
index 3dccb7056186..a77b0986cc38 100644
--- a/modular_ss220/modular_ss220.dme
+++ b/modular_ss220/modular_ss220.dme
@@ -68,6 +68,7 @@
#include "mobs/_mobs.dme"
#include "pixel_shift/_pixel_shift.dme"
#include "screentip_change/_screentip_change.dme"
+#include "station_traits/_station_traits.dme"
#include "smart_equip_targeted/_smart_equip_targeted.dme"
#include "sm_space_drop/sm_space_drop.dme"
#include "text_to_speech/_tts.dme"
diff --git a/modular_ss220/objects/_objects.dme b/modular_ss220/objects/_objects.dme
index 0e95f3c7de7a..e38f4a613dc4 100644
--- a/modular_ss220/objects/_objects.dme
+++ b/modular_ss220/objects/_objects.dme
@@ -16,10 +16,13 @@
#include "code/weapons/melee/baseball_bat.dm"
#include "code/weapons/melee/electrostaff.dm"
#include "code/weapons/melee/stylet.dm"
+#include "code/weapons/melee/vibroblade.dm"
#include "code/weapons/ranged/beretta.dm"
#include "code/weapons/ranged/pneumagun.dm"
#include "code/weapons/ranged/revolvers.dm"
#include "code/weapons/ranged/sslr.dm"
+#include "code/weapons/ranged/sakhno.dm"
+#include "code/weapons/ranged/skrell_rifle.dm"
// Plushies
#include "code/plushies/hampters.dm"
diff --git a/modular_ss220/objects/code/closets.dm b/modular_ss220/objects/code/closets.dm
index 3fe2d00fdbd3..0069d62ffd2e 100644
--- a/modular_ss220/objects/code/closets.dm
+++ b/modular_ss220/objects/code/closets.dm
@@ -1,10 +1,8 @@
/obj/structure/closet/secure_closet/expedition
name = "expeditors locker"
- req_access = list(ACCESS_EXPEDITION)
icon = 'modular_ss220/objects/icons/closets.dmi'
icon_state = "explorer"
- icon_opened = "explorer_open"
- open_door_sprite = "explorer_door"
+ req_access = list(ACCESS_EXPEDITION)
/obj/structure/closet/secure_closet/expedition/populate_contents()
new /obj/item/gun/energy/laser/awaymission_aeg/rnd(src)
@@ -14,9 +12,7 @@
/obj/structure/closet/secure_closet/geneticist
name = "geneticist's locker"
icon = 'modular_ss220/objects/icons/closets.dmi'
- icon_state = "gen_secure"
- icon_opened = "gen_open"
- open_door_sprite = "white_secure_door"
+ icon_state = "gen"
req_access = list(ACCESS_GENETICS)
/obj/structure/closet/secure_closet/geneticist/populate_contents()
@@ -40,3 +36,13 @@
icon_opened = "organ_freezer_open"
icon_closed = "organ_freezer"
storage_capacity = 60
+
+/obj/structure/closet/secure_closet/freezer/products
+ name = "refrigerator"
+ icon_state = "freezer"
+
+/obj/structure/closet/secure_closet/freezer/products/populate_contents()
+ new /obj/item/storage/box/donkpockets(src)
+ new /obj/item/storage/box/donkpockets(src)
+ new /obj/item/storage/fancy/egg_box(src)
+ new /obj/item/storage/fancy/egg_box(src)
diff --git a/modular_ss220/objects/code/coffin.dm b/modular_ss220/objects/code/coffin.dm
index a0ac7aebb4ed..7d28cd19ed78 100644
--- a/modular_ss220/objects/code/coffin.dm
+++ b/modular_ss220/objects/code/coffin.dm
@@ -3,8 +3,6 @@
desc = "Мы потеряли его. Он скукурузился."
icon = 'modular_ss220/objects/icons/closets.dmi'
icon_state = "coffin_corn"
- icon_opened = "coffin_corn_open"
- open_door_sprite = null
resistance_flags = FLAMMABLE
max_integrity = 300
material_drop = /obj/item/food/grown/corn
diff --git a/modular_ss220/objects/code/flora/sakura.dm b/modular_ss220/objects/code/flora/sakura.dm
index 62a6599523ed..146f841ff6b8 100644
--- a/modular_ss220/objects/code/flora/sakura.dm
+++ b/modular_ss220/objects/code/flora/sakura.dm
@@ -135,7 +135,7 @@
/obj/effect/decal/sakura_leaves/New()
. = ..()
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
/obj/effect/decal/sakura_leaves/examine(mob/user)
. = ..()
diff --git a/modular_ss220/objects/code/plushies/hampters.dm b/modular_ss220/objects/code/plushies/hampters.dm
index 26fa7c2d29dc..228c384a5424 100644
--- a/modular_ss220/objects/code/plushies/hampters.dm
+++ b/modular_ss220/objects/code/plushies/hampters.dm
@@ -24,7 +24,7 @@
return
if(ismob(AM))
var/mob/M = AM
- if(M.flying)
+ if(HAS_TRAIT(M, TRAIT_FLYING))
return
if(isliving(AM))
var/mob/living/L = M
diff --git a/modular_ss220/objects/code/posters.dm b/modular_ss220/objects/code/posters.dm
index 25d59cace3b2..c5882030bff7 100644
--- a/modular_ss220/objects/code/posters.dm
+++ b/modular_ss220/objects/code/posters.dm
@@ -1,7 +1,7 @@
/obj/structure/sign/poster
icon = 'modular_ss220/objects/icons/posters.dmi'
-// Contraband
+// MARK: Contraband
/obj/structure/sign/poster/contraband/lady
name = "Соблазнительная Красотка"
desc = "На плакате изображена крайне сексуальная девушка."
@@ -44,7 +44,13 @@
icon = 'modular_ss220/objects/icons/posters.dmi'
icon_state = "contraband7"
-// Legit
+/obj/structure/sign/poster/contraband/argonian
+ name = "Аргонианская горничная"
+ desc = "Вы видите ящероподобную горничную. Вам раньше не доводилось видеть подобную расу, однако она имеет некоторые сходства с унатхами."
+ icon = 'modular_ss220/objects/icons/posters.dmi'
+ icon_state = "contraband8"
+
+// MARK: Legit
/obj/structure/sign/poster/official/mars
name = "Плакат Марса"
desc = "Это плакат, выпущенный компанией Generic Space в рамках серии памятных плакатов, посвящённых чудесам космоса."
diff --git a/modular_ss220/objects/code/weapons/melee/stylet.dm b/modular_ss220/objects/code/weapons/melee/stylet.dm
index 6ee4b98fd88a..354dd4535616 100644
--- a/modular_ss220/objects/code/weapons/melee/stylet.dm
+++ b/modular_ss220/objects/code/weapons/melee/stylet.dm
@@ -55,7 +55,3 @@
H.update_inv_r_hand()
playsound(loc, extend_sound, 50, TRUE)
add_fingerprint(user)
-
-/obj/effect/spawner/random/maintenance/Initialize(mapload)
- loot += list(/obj/item/melee/stylet = 5)
- return ..()
diff --git a/modular_ss220/objects/code/weapons/melee/vibroblade.dm b/modular_ss220/objects/code/weapons/melee/vibroblade.dm
new file mode 100644
index 000000000000..8ef7865d0b26
--- /dev/null
+++ b/modular_ss220/objects/code/weapons/melee/vibroblade.dm
@@ -0,0 +1,173 @@
+// MARK: Vibroblade
+#define CHARGE_LEVEL_NONE 0
+#define CHARGE_LEVEL_LOW 1
+#define CHARGE_LEVEL_MEDIUM 2
+#define CHARGE_LEVEL_HIGH 3
+#define CHARGE_LEVEL_OVERCHARGE 4
+
+/obj/item/melee/vibroblade
+ name = "\improper vibroblade"
+ desc = "Виброклинок воинов Раскинта. Микрогенератор ультразвука в рукояти позволяет лезвию вибрировать \
+ с огромной частотой, что позволяет при его достаточной зарядке наносить глубокие раны даже ударами по касательной."
+ icon = 'modular_ss220/objects/icons/melee.dmi'
+ icon_state = "vibroblade"
+ item_state = "vibroblade"
+ lefthand_file = 'modular_ss220/objects/icons/inhands/melee_lefthand.dmi'
+ righthand_file = 'modular_ss220/objects/icons/inhands/melee_righthand.dmi'
+ hitsound = 'modular_ss220/objects/sound/weapons/melee/sardaukar/knifehit1.ogg'
+ drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/knife.ogg'
+ pickup_sound = 'modular_ss220/objects/sound/weapons/melee/sardaukar/equip.ogg'
+ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ force = 20
+ throwforce = 15
+ throw_speed = 2
+ throw_range = 5
+ armour_penetration_percentage = 75
+ slot_flags = SLOT_FLAG_BELT
+ w_class = WEIGHT_CLASS_NORMAL
+ sharp = TRUE
+ flags = CONDUCT
+ var/charge_level = CHARGE_LEVEL_NONE
+ var/max_charge_level = CHARGE_LEVEL_OVERCHARGE
+ /// How long does it take to reach next level of charge.
+ var/charge_time = 4 SECONDS
+ /// TRUE if the item keeps charge only when is held in hands. FALSE if the item always keeps charge.
+ var/hold_to_be_charged = TRUE
+ var/emp_proof = FALSE
+ /// Body parts that can be cut off.
+ var/list/cutoff_candidates = list(
+ BODY_ZONE_L_LEG,
+ BODY_ZONE_R_LEG,
+ BODY_ZONE_L_ARM,
+ BODY_ZONE_R_ARM,
+ BODY_ZONE_PRECISE_L_FOOT,
+ BODY_ZONE_PRECISE_R_FOOT,
+ BODY_ZONE_PRECISE_L_HAND,
+ BODY_ZONE_PRECISE_R_HAND,
+ )
+
+/obj/item/melee/vibroblade/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_MOVABLE_POST_THROW, PROC_REF(thrown))
+ AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = ALL_ATTACK_TYPES)
+
+/obj/item/melee/vibroblade/Destroy()
+ . = ..()
+ UnregisterSignal(src, COMSIG_MOVABLE_POST_THROW)
+
+/obj/item/melee/vibroblade/update_icon_state()
+ icon_state = initial(icon_state) + (charge_level > CHARGE_LEVEL_NONE ? "_[charge_level]" : "")
+
+/obj/item/melee/vibroblade/examine(mob/user)
+ . = ..()
+ . += span_notice("Используйте [src] в руке, чтобы повысить уровень заряда.")
+ if(charge_level == CHARGE_LEVEL_NONE)
+ . += span_notice("[src] не заряжен.")
+ return
+
+ . += span_notice("[src] заряжен на [(charge_level / max_charge_level)*100]%.")
+ . += charge_level == max_charge_level \
+ ? span_danger("Следующий удар будет крайне травмирующим!") \
+ : span_warning("Следующий удар будет усиленным!")
+
+/obj/item/melee/vibroblade/attack_self(mob/living/user)
+ . = ..()
+ if(charge_level >= max_charge_level)
+ user.visible_message(
+ span_notice("[user.name] пытается зарядить [src], но кнопка на рукояти не поддается!"),
+ span_notice("Вы пытаетесь нажать на кнопку зарядки [src], но она заблокирована.")
+ )
+ return FALSE
+
+ user.visible_message(
+ span_notice("[user.name] нажимает на кнопку зарядки [src]..."),
+ span_notice("Вы нажимаете на кнопку зарядки [src], заряжая микрогенератор...")
+ )
+
+ if(!do_after_once(user, charge_time, allow_moving = TRUE, must_be_held = TRUE, target = src))
+ return
+ playsound(loc, 'sound/effects/sparks3.ogg', vol = 10, vary = TRUE)
+ do_sparks(1, TRUE, src)
+ set_charge_level(charge_level + 1)
+
+/obj/item/melee/vibroblade/pre_attack(atom/A, mob/living/user, params)
+ . = ..()
+ force = initial(force) * get_damage_factor()
+
+/obj/item/melee/vibroblade/attack(mob/living/target, mob/living/user, def_zone)
+ var/obj/item/organ/external/selected_bodypart
+ if(user.zone_selected in cutoff_candidates)
+ selected_bodypart = target.get_organ(user.zone_selected)
+ . = ..()
+
+ if(charge_level == CHARGE_LEVEL_HIGH)
+ target.Weaken(1.5 SECONDS)
+ else if(charge_level == CHARGE_LEVEL_OVERCHARGE && selected_bodypart && istype(target, /mob/living/carbon/human))
+ var/obj/item/organ/external/after_attack_bodypart = target.get_organ(user.zone_selected)
+
+ // We compare these in case the body part hasn't been cut off by standard attack logic
+ if(after_attack_bodypart == selected_bodypart)
+ after_attack_bodypart.droplimb(TRUE, DROPLIMB_SHARP)
+ user.visible_message(
+ span_danger("[user] изящно и непринужденно отсекает [selected_bodypart] [target]!"),
+ span_biggerdanger("Вы искусно отсекаете [selected_bodypart] [target]!")
+ )
+
+ set_charge_level(CHARGE_LEVEL_NONE)
+
+/obj/item/melee/vibroblade/suicide_act(mob/living/carbon/human/user)
+ var/obj/item/organ/external/head = user.get_organ(BODY_ZONE_HEAD)
+ user.visible_message(span_suicide("[user] прижимает лезвие [src] к своей шее и нажимает на кнопку зарядки микрогенератора. \
+ Кажется, это попытка самоубийства!"))
+ user.atom_say("Слава Вечной Империи!")
+ head.droplimb(TRUE, DROPLIMB_SHARP, FALSE, TRUE)
+ set_charge_level(CHARGE_LEVEL_NONE)
+ return BRUTELOSS
+
+/obj/item/melee/vibroblade/emp_act(severity)
+ . = ..()
+ if(emp_proof)
+ return
+ set_charge_level(CHARGE_LEVEL_NONE)
+
+/obj/item/melee/vibroblade/equipped(mob/user, slot, initial)
+ . = ..()
+ if(hold_to_be_charged && slot != SLOT_HUD_LEFT_HAND && slot != SLOT_HUD_RIGHT_HAND)
+ set_charge_level(CHARGE_LEVEL_NONE)
+
+/obj/item/melee/vibroblade/dropped(mob/user, silent)
+ . = ..()
+ if(hold_to_be_charged && !silent)
+ set_charge_level(CHARGE_LEVEL_NONE)
+
+/obj/item/melee/vibroblade/proc/thrown(datum/thrownthing/thrown_thing, spin)
+ SIGNAL_HANDLER
+ if(hold_to_be_charged)
+ set_charge_level(CHARGE_LEVEL_NONE)
+
+/obj/item/melee/vibroblade/proc/get_damage_factor()
+ return 1 + 0.25 * clamp(charge_level, CHARGE_LEVEL_NONE, max_charge_level)
+
+/obj/item/melee/vibroblade/proc/set_charge_level(charge_level)
+ src.charge_level = charge_level
+ force = initial(force) * get_damage_factor()
+ update_icon(UPDATE_ICON_STATE)
+
+/obj/item/melee/vibroblade/sardaukar
+ name = "\improper emperor guard vibroblade"
+ desc = "Виброклинок гвардейцев Императора. Микрогенератор ультразвука в рукояти позволяет лезвию вибрировать \
+ с огромной частотой, что позволяет при его достаточной зарядке наносить глубокие раны даже ударами по касательной. \
+ Воины Куи'кверр-Кэтиш обучаются мастерству ближнего боя с детства, поэтому в их руках он особо опасен и жесток. \
+ Каждый будущий гвардеец добывает свой клинок в ритуальном бою, и его сохранность есть вопрос жизни и смерти владельца."
+ icon_state = "vibroblade_elite"
+ item_state = "vibroblade_elite"
+ force = 25
+ charge_time = 2 SECONDS
+ hold_to_be_charged = FALSE
+ emp_proof = TRUE
+
+#undef CHARGE_LEVEL_NONE
+#undef CHARGE_LEVEL_LOW
+#undef CHARGE_LEVEL_MEDIUM
+#undef CHARGE_LEVEL_HIGH
+#undef CHARGE_LEVEL_OVERCHARGE
diff --git a/modular_ss220/objects/code/weapons/ranged/revolvers.dm b/modular_ss220/objects/code/weapons/ranged/revolvers.dm
index ab3af135a95e..31e004735b6c 100644
--- a/modular_ss220/objects/code/weapons/ranged/revolvers.dm
+++ b/modular_ss220/objects/code/weapons/ranged/revolvers.dm
@@ -208,7 +208,13 @@
icon = 'modular_ss220/objects/icons/ammo.dmi'
item_state = "peashooter_bullet"
stamina = 5
- damage_type = STAMINA
+ damage = 0
+ var/additional_zombie_damage = 10
+
+/obj/item/projectile/bullet/midbullet_r/peas_shooter/prehit(atom/target)
+ if(HAS_TRAIT(target, TRAIT_I_WANT_BRAINS))
+ damage += additional_zombie_damage
+ return ..()
/obj/item/projectile/bullet/midbullet_r/peas_shooter/on_hit(mob/H)
. = ..()
diff --git a/modular_ss220/objects/code/weapons/ranged/sakhno.dm b/modular_ss220/objects/code/weapons/ranged/sakhno.dm
new file mode 100644
index 000000000000..cd1f09d88c25
--- /dev/null
+++ b/modular_ss220/objects/code/weapons/ranged/sakhno.dm
@@ -0,0 +1,43 @@
+// MARK: Sakhno rifle
+/obj/item/gun/projectile/shotgun/boltaction/sakhno
+ name = "\improper Sakhno precision rifle"
+ desc = "Высокоточная винтовка Sakhno со скользящим затвором, которая была (и, безусловно, остается) крайне популярной среди \
+ покорителей фронтира, контрабандистов, ЧОП'овцев, исследователей, и прочих рисковых ребят. Эта модель \
+ была разработана и производится с 2440 года."
+ icon = 'modular_ss220/objects/icons/wide_guns.dmi'
+ icon_state = "sakhno"
+ item_state = "sakhno"
+ lefthand_file = 'modular_ss220/objects/icons/inhands/guns_lefthand.dmi'
+ righthand_file = 'modular_ss220/objects/icons/inhands/guns_righthand.dmi'
+ fire_sound = 'modular_ss220/objects/sound/weapons/gunshots/shot_heavy.ogg'
+ mag_type = /obj/item/ammo_box/magazine/internal/boltaction/sakhno
+ knife_x_offset = 30
+ knife_y_offset = 12
+
+/obj/item/ammo_box/magazine/internal/boltaction/sakhno
+ icon = 'modular_ss220/objects/icons/ammo.dmi'
+ icon_state = "310"
+ ammo_type = /obj/item/ammo_casing/s310
+ caliber = "s310"
+ max_ammo = 5
+ multiload = 1
+
+// MARK: .310
+/obj/item/ammo_box/s310
+ name = "stripper clip (.310)"
+ desc = "A stripper clip for .310 cartridges, used in Sakhno rifles. Five round capacity."
+ icon = 'modular_ss220/objects/icons/ammo.dmi'
+ icon_state = "310"
+ ammo_type = /obj/item/ammo_casing/s310
+ max_ammo = 5
+ multi_sprite_step = 1
+
+/obj/item/ammo_casing/s310
+ name = ".310 round"
+ desc = "A .310 rifle cartridge"
+ icon = 'modular_ss220/objects/icons/ammo.dmi'
+ icon_state = "310-casing"
+ caliber = "s310"
+ projectile_type = /obj/item/projectile/bullet/midbullet3/hp
+ muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_STRONG
+ muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG
diff --git a/modular_ss220/objects/code/weapons/ranged/skrell_rifle.dm b/modular_ss220/objects/code/weapons/ranged/skrell_rifle.dm
new file mode 100644
index 000000000000..e7844b3d0c20
--- /dev/null
+++ b/modular_ss220/objects/code/weapons/ranged/skrell_rifle.dm
@@ -0,0 +1,148 @@
+// MARK: Skrellian carbine
+/obj/item/gun/energy/gun/skrell_carbine
+ name = "\improper skrellian carbine"
+ desc = "Энергетический карабин Vuu'Xqu*ix T-3, более известный в ТСФ как 'VT-3'. Это оружие редко можно увидеть где-то, помимо ОСС. \
+ Имеет два режима мощности энерголуча: 'летальный' и 'штурмовой'. Второй предназначен для прорыва сквозь укрпеления противника."
+ icon = 'modular_ss220/objects/icons/guns.dmi'
+ lefthand_file = 'modular_ss220/objects/icons/inhands/guns_lefthand.dmi'
+ righthand_file = 'modular_ss220/objects/icons/inhands/guns_righthand.dmi'
+ item_state = "skrell_carbine"
+ icon_state = "skrell_carbine"
+ cell_type = /obj/item/stock_parts/cell/skrell_carbine_cell
+ ammo_type = list(/obj/item/ammo_casing/energy/laser/skrell_light, /obj/item/ammo_casing/energy/laser/skrell_assault)
+ origin_tech = "combat=6;magnets=5"
+ modifystate = 2
+ execution_speed = 3 SECONDS
+ w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/gun/energy/gun/skrell_carbine/elite
+ name = "\improper elite skrellian carbine"
+ desc = "Энергетический карабин Vuu'Xqu*ix T-3, более известный в ТСФ как 'VT-3'. Это оружие редко можно увидеть где-то, помимо ОСС. \
+ Этот экземпляр обладает батареей повышенной емкости, а так же дополнительными стабилизаторами стрельбы. \
+ Имеет два режима мощности энерголуча: 'летальный' и 'штурмовой'. Второй предназначен для прорыва сквозь укрпеления противника."
+ ammo_type = list(/obj/item/ammo_casing/energy/laser/skrell_light/elite, /obj/item/ammo_casing/energy/laser/skrell_assault/elite)
+
+/obj/item/ammo_casing/energy/laser/skrell_light
+ projectile_type = /obj/item/projectile/beam/laser/skrell_light
+ muzzle_flash_color = LIGHT_COLOR_LAVENDER
+ select_name = "light"
+ fire_sound = 'modular_ss220/objects/sound/weapons/gunshots/blaster.ogg'
+
+/obj/item/ammo_casing/energy/laser/skrell_assault
+ projectile_type = /obj/item/projectile/beam/pulse/skrell_laser_assault
+ muzzle_flash_color = LIGHT_COLOR_LAVENDER
+ select_name = "assault"
+ e_cost = 1600
+ fire_sound = 'modular_ss220/objects/sound/weapons/gunshots/blaster.ogg'
+
+/obj/item/ammo_casing/energy/laser/skrell_light/elite
+ e_cost = 50
+
+/obj/item/ammo_casing/energy/laser/skrell_assault/elite
+ e_cost = 200
+
+/obj/item/projectile/beam/laser/skrell_light
+ name = "laser"
+ icon_state = "purple_laser"
+ damage = 23
+ impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
+ light_color = LIGHT_COLOR_LAVENDER
+
+/obj/item/projectile/beam/pulse/skrell_laser_assault
+ name = "heavy laser"
+ icon_state = "u_laser_alt"
+ damage = 10
+ stamina = 80
+ impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
+ light_color = LIGHT_COLOR_DARK_BLUE
+ weakened_against_rwalls = TRUE
+
+/obj/item/stock_parts/cell/skrell_carbine_cell
+ name = "\improper Vuu'Xqu*ix T-3 gun power cell"
+ maxcharge = 1600
+
+// MARK: Skrellian railgun rifle
+/obj/item/gun/projectile/automatic/sniper_rifle/skrell_rifle
+ name = "\improper skrellian rifle"
+ desc = "Винтовка Zquiv*Tzuuli-8, или ''ZT-8'' - это рельсотрон, стоящий на вооружении тяжелых штурмовых отрядов Раскинта из ОСС. \
+ Имеет цилиндрический магазин заряжания, разгонный магнитный блок и стабилизаторы для точной стрельбы."
+ icon = 'modular_ss220/objects/icons/guns.dmi'
+ lefthand_file = 'modular_ss220/objects/icons/inhands/guns_lefthand.dmi'
+ righthand_file = 'modular_ss220/objects/icons/inhands/guns_righthand.dmi'
+ icon_state = "sniper"
+ item_state = "sniper"
+ fire_sound = 'modular_ss220/objects/sound/weapons/gunshots/railgun.ogg'
+ recoil = 0
+ fire_delay = 25
+ slot_flags = SLOT_FLAG_BELT
+ zoomable = FALSE
+ can_suppress = FALSE
+ mag_type = /obj/item/ammo_box/magazine/skrell_magazine
+
+/obj/item/gun/projectile/automatic/sniper_rifle/skrell_rifle/elite
+ name = "\improper elite skrellian rifle"
+ desc = "Винтовка Zquiv*Tzuuli-8, или ''ZT-8'' - это рельсотрон, стоящий на вооружении тяжелых штурмовых отрядов Раскинта из ОСС. \
+ Имеет цилиндрический магазин заряжания, разгонный магнитный блок и стабилизаторы для точной стрельбы. \
+ Этот экземпляр обладает расширенным магазинным гнездом, а так же оптическим прицелом."
+ fire_delay = 20
+ zoomable = TRUE
+ mag_type = /obj/item/ammo_box/magazine/skrell_magazine/skrell_magazine_elite
+
+/obj/item/ammo_box/magazine/skrell_magazine
+ name = "\improper ammo cylinder"
+ desc = "Цилиндровый магазин для рельсотрона."
+ icon = 'modular_ss220/objects/icons/ammo.dmi'
+ icon_state = "skrell_magazine"
+ multi_sprite_step = 3
+ ammo_type = /obj/item/ammo_casing/railgun
+ max_ammo = 4
+ caliber = "railgun"
+ multiload = TRUE
+
+/obj/item/ammo_box/magazine/skrell_magazine/skrell_magazine_elite
+ icon_state = "skrell_magazine_elite"
+ multi_sprite_step = 7
+ max_ammo = 8
+ ammo_type = /obj/item/ammo_casing/railgun/railgun_strong
+
+/obj/item/ammo_casing/railgun
+ name = "\improper railgun ammo casing"
+ desc = "Снаряд для рельсотрона. Состоит из поражающего элемента и магнитного стабилизатора."
+ icon = 'modular_ss220/objects/icons/ammo.dmi'
+ icon_state = "railgun-casing"
+ caliber = "railgun"
+ projectile_type = /obj/item/projectile/bullet/railgun
+
+/obj/item/ammo_casing/railgun/railgun_strong
+ projectile_type = /obj/item/projectile/bullet/railgun/railgun_strong
+
+/obj/item/projectile/bullet/railgun
+ damage = 35
+ armour_penetration_flat = 80
+ pass_flags = PASSTABLE | PASSGRILLE | PASSGIRDER
+ speed = 0.2
+ icon_state = "gauss_silenced"
+ light_color = LIGHT_COLOR_LIGHT_CYAN
+
+/obj/item/projectile/bullet/railgun/railgun_strong
+ damage = 45
+ armour_penetration_flat = 30
+ weaken = 0.2
+ speed = 0.2
+
+// MARK: Skrellian pistol
+/obj/item/gun/energy/gun/skrell_pistol
+ name = "\improper self-charge skrellian pistol"
+ desc = "Энергетический пистолет Qua'l*Sarqzix-44x, известный на территориях ТСФ как QS-44. Компактный и удобный в использовании, имеет два режима мощности энерголуча: 'летальный' и 'нейтрализующий'. \
+ Встроенный микрогенератор постепенно пополняет запас аккамулятора прямо в бою."
+ icon = 'modular_ss220/objects/icons/guns.dmi'
+ icon_state = "skrell_pistol"
+ item_state = "skrell_pistol"
+ lefthand_file = 'modular_ss220/objects/icons/inhands/guns_lefthand.dmi'
+ righthand_file = 'modular_ss220/objects/icons/inhands/guns_righthand.dmi'
+ ammo_type = list(/obj/item/ammo_casing/energy/laser/skrell_light, /obj/item/ammo_casing/energy/disabler)
+ w_class = WEIGHT_CLASS_SMALL
+ shaded_charge = FALSE
+ can_holster = TRUE
+ execution_speed = 4 SECONDS
+ selfcharge = TRUE
diff --git a/modular_ss220/objects/icons/ammo.dmi b/modular_ss220/objects/icons/ammo.dmi
index a3fab60866e5..9e52b4ae7c81 100644
Binary files a/modular_ss220/objects/icons/ammo.dmi and b/modular_ss220/objects/icons/ammo.dmi differ
diff --git a/modular_ss220/objects/icons/boxes.dmi b/modular_ss220/objects/icons/boxes.dmi
new file mode 100644
index 000000000000..7290c8bf0f25
Binary files /dev/null and b/modular_ss220/objects/icons/boxes.dmi differ
diff --git a/modular_ss220/objects/icons/closets.dmi b/modular_ss220/objects/icons/closets.dmi
index 562deaa526b0..4551f3423ae8 100644
Binary files a/modular_ss220/objects/icons/closets.dmi and b/modular_ss220/objects/icons/closets.dmi differ
diff --git a/modular_ss220/objects/icons/guns.dmi b/modular_ss220/objects/icons/guns.dmi
index dee535c69061..0b1e0c63091e 100644
Binary files a/modular_ss220/objects/icons/guns.dmi and b/modular_ss220/objects/icons/guns.dmi differ
diff --git a/modular_ss220/objects/icons/inhands/guns_lefthand.dmi b/modular_ss220/objects/icons/inhands/guns_lefthand.dmi
index 204f9527ebe0..8b77e53ebc47 100644
Binary files a/modular_ss220/objects/icons/inhands/guns_lefthand.dmi and b/modular_ss220/objects/icons/inhands/guns_lefthand.dmi differ
diff --git a/modular_ss220/objects/icons/inhands/guns_righthand.dmi b/modular_ss220/objects/icons/inhands/guns_righthand.dmi
index 29da95a9c061..bbecbad178b5 100644
Binary files a/modular_ss220/objects/icons/inhands/guns_righthand.dmi and b/modular_ss220/objects/icons/inhands/guns_righthand.dmi differ
diff --git a/modular_ss220/objects/icons/inhands/melee_lefthand.dmi b/modular_ss220/objects/icons/inhands/melee_lefthand.dmi
index 446d4dd0ad31..738f8c58acc4 100644
Binary files a/modular_ss220/objects/icons/inhands/melee_lefthand.dmi and b/modular_ss220/objects/icons/inhands/melee_lefthand.dmi differ
diff --git a/modular_ss220/objects/icons/inhands/melee_righthand.dmi b/modular_ss220/objects/icons/inhands/melee_righthand.dmi
index c15e31bfa1d9..844e8b00b1c7 100644
Binary files a/modular_ss220/objects/icons/inhands/melee_righthand.dmi and b/modular_ss220/objects/icons/inhands/melee_righthand.dmi differ
diff --git a/modular_ss220/objects/icons/melee.dmi b/modular_ss220/objects/icons/melee.dmi
index bd594df9aa10..d219ebe2a30d 100644
Binary files a/modular_ss220/objects/icons/melee.dmi and b/modular_ss220/objects/icons/melee.dmi differ
diff --git a/modular_ss220/objects/icons/posters.dmi b/modular_ss220/objects/icons/posters.dmi
index bb1d7e3cb440..3e9e1fdaaae5 100644
Binary files a/modular_ss220/objects/icons/posters.dmi and b/modular_ss220/objects/icons/posters.dmi differ
diff --git a/modular_ss220/objects/icons/wide_guns.dmi b/modular_ss220/objects/icons/wide_guns.dmi
new file mode 100644
index 000000000000..9e84712f81f2
Binary files /dev/null and b/modular_ss220/objects/icons/wide_guns.dmi differ
diff --git a/modular_ss220/objects/sound/weapons/gunshots/blaster.ogg b/modular_ss220/objects/sound/weapons/gunshots/blaster.ogg
new file mode 100644
index 000000000000..829a5c365579
Binary files /dev/null and b/modular_ss220/objects/sound/weapons/gunshots/blaster.ogg differ
diff --git a/modular_ss220/objects/sound/weapons/gunshots/railgun.ogg b/modular_ss220/objects/sound/weapons/gunshots/railgun.ogg
new file mode 100644
index 000000000000..0b939fd9a60e
Binary files /dev/null and b/modular_ss220/objects/sound/weapons/gunshots/railgun.ogg differ
diff --git a/modular_ss220/objects/sound/weapons/gunshots/shot_heavy.ogg b/modular_ss220/objects/sound/weapons/gunshots/shot_heavy.ogg
new file mode 100644
index 000000000000..f91b21ec4d80
Binary files /dev/null and b/modular_ss220/objects/sound/weapons/gunshots/shot_heavy.ogg differ
diff --git a/modular_ss220/objects/sound/weapons/melee/sardaukar/equip.ogg b/modular_ss220/objects/sound/weapons/melee/sardaukar/equip.ogg
new file mode 100644
index 000000000000..92ca5f02172f
Binary files /dev/null and b/modular_ss220/objects/sound/weapons/melee/sardaukar/equip.ogg differ
diff --git a/modular_ss220/objects/sound/weapons/melee/sardaukar/knifehit1.ogg b/modular_ss220/objects/sound/weapons/melee/sardaukar/knifehit1.ogg
new file mode 100644
index 000000000000..3e4a04c0f1de
Binary files /dev/null and b/modular_ss220/objects/sound/weapons/melee/sardaukar/knifehit1.ogg differ
diff --git a/modular_ss220/outfits/code/outfits.dm b/modular_ss220/outfits/code/outfits.dm
index c59e4007244f..f19ce9ceb7ec 100644
--- a/modular_ss220/outfits/code/outfits.dm
+++ b/modular_ss220/outfits/code/outfits.dm
@@ -37,8 +37,99 @@
/obj/item/clothing/head/beret/centcom/officer/navy/marine
name = "navy blue beret"
-// MARK: NT Navy Field Officer
-/datum/outfit/job/ntnavyofficer/field
+// MARK: NT Officer outfits
+/datum/outfit/job/admin/ntnavyofficer
+ name = "Nanotrasen Navy Officer"
+ jobtype = /datum/job/ntnavyofficer
+
+ uniform = /obj/item/clothing/under/rank/centcom/officer
+ gloves = /obj/item/clothing/gloves/color/white
+ shoes = /obj/item/clothing/shoes/centcom
+ head = /obj/item/clothing/head/beret/centcom/officer
+ l_ear = /obj/item/radio/headset/centcom
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ id = /obj/item/card/id/centcom
+ pda = /obj/item/pda/centcom
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/dust
+ )
+ backpack = /obj/item/storage/backpack/satchel
+ backpack_contents = list(
+ /obj/item/stamp/centcom = 1,
+ )
+ box = /obj/item/storage/box/centcomofficer
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/chest/nutriment/plus/hardened,
+ /obj/item/organ/internal/cyberimp/arm/combat/centcom
+ )
+
+/datum/outfit/job/admin/ntnavyofficer/on_mind_initialize(mob/living/carbon/human/H)
+ . = ..()
+ H.mind.offstation_role = TRUE
+
+/datum/outfit/job/admin/ntspecops
+ name = "Special Operations Officer"
+ jobtype = /datum/job/ntspecops
+ allow_backbag_choice = FALSE
+ uniform = /obj/item/clothing/under/rank/centcom/captain
+ suit = /obj/item/clothing/suit/space/deathsquad/officer
+ belt = /obj/item/storage/belt/military/assault
+ gloves = /obj/item/clothing/gloves/combat
+ shoes = /obj/item/clothing/shoes/combat
+ mask = /obj/item/clothing/mask/holo_cigar
+ head = /obj/item/clothing/head/helmet/space/deathsquad/beret
+ l_ear = /obj/item/radio/headset/centcom
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ id = /obj/item/card/id/centcom
+ pda = /obj/item/pda/centcom
+ r_pocket = /obj/item/storage/fancy/matches
+ back = /obj/item/storage/backpack/satchel
+ box = /obj/item/storage/box/centcomofficer
+ backpack_contents = list(
+ /obj/item/clothing/shoes/magboots/advance = 1,
+ /obj/item/storage/box/zipties = 1
+ )
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/dust
+ )
+ cybernetic_implants = list(
+ /obj/item/organ/internal/eyes/cybernetic/xray/hardened,
+ /obj/item/organ/internal/cyberimp/brain/anti_stam/hardened,
+ /obj/item/organ/internal/cyberimp/chest/nutriment/plus/hardened,
+ /obj/item/organ/internal/cyberimp/arm/combat/centcom
+ )
+
+/datum/outfit/job/admin/ntspecops/on_mind_initialize(mob/living/carbon/human/H)
+ . = ..()
+ H.mind.offstation_role = TRUE
+
+/datum/outfit/job/admin/ntspecops/alt
+ name = "Specops alt. RSH-12, saber, bandana"
+ belt = /obj/item/storage/belt/sheath/saber
+ backpack_contents = list(
+ /obj/item/gun/projectile/revolver/reclinable/rsh12,
+ /obj/item/ammo_box/speed_loader_mm127,
+ /obj/item/ammo_box/speed_loader_mm127,
+ /obj/item/ammo_box/speed_loader_mm127,
+ /obj/item/clothing/mask/bandana/red
+ )
+ suit_store = /obj/item/ammo_box/box_mm127
+
+/datum/outfit/job/admin/ntnavyofficer/alt
+ name = "NT Navy Officer alt. Coat NT, holo, noble, cane"
+ mask = /obj/item/clothing/mask/holo_cigar
+ suit = /obj/item/clothing/suit/space/deathsquad/officer/field/cloak_nt/coat_nt
+ shoes = /obj/item/clothing/shoes/fluff/noble_boot
+ belt = /obj/item/melee/classic_baton/ntcane
+
+/datum/outfit/job/admin/ntnavyofficer/alt2
+ name = "NT Navy Officer alt. Cloak NT, holo"
+ suit = /obj/item/clothing/suit/space/deathsquad/officer/field/cloak_nt
+ mask = /obj/item/clothing/mask/holo_cigar
+
+/datum/outfit/job/admin/ntnavyofficer/field
name = "Nanotrasen Navy Field Officer"
gloves = /obj/item/clothing/gloves/combat
@@ -56,7 +147,62 @@
/obj/item/organ/internal/eyes/cybernetic/thermals/hardened
)
-/datum/outfit/job/ntnavyofficer/field/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/datum/outfit/job/admin/ntnavyofficer/field/alt
+ name = "Nanotrasen Navy Field Officer alt. Ring, mateba, holster"
+ gloves =/obj/item/clothing/gloves/ring/silver
+ mask = /obj/item/clothing/mask/holo_cigar
+ backpack_contents = list(
+ /obj/item/clothing/accessory/scarf/purple,
+ /obj/item/clothing/gloves/combat,
+ /obj/item/gun/projectile/revolver/mateba,
+ /obj/item/ammo_box/a357,
+ /obj/item/ammo_box/a357,
+ /obj/item/ammo_box/a357,
+ /obj/item/clothing/accessory/holster
+ )
+
+/datum/outfit/job/admin/nt_navy_captain
+ name = "NT Navy Captain (Advanced)"
+
+ uniform = /obj/item/clothing/under/rank/centcom/captain
+ back = /obj/item/storage/backpack/satchel
+ belt = /obj/item/storage/belt/sheath/saber
+ gloves = /obj/item/clothing/gloves/color/white
+ shoes = /obj/item/clothing/shoes/centcom
+ head = /obj/item/clothing/head/beret/centcom/captain
+ l_ear = /obj/item/radio/headset/centcom
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ id = /obj/item/card/id/centcom
+ pda = /obj/item/pda/centcom
+ backpack_contents = list(
+ /obj/item/storage/box/centcomofficer,
+ /obj/item/bio_chip_implanter/death_alarm,
+ /obj/item/stamp/centcom,
+ /obj/item/gun/projectile/revolver/reclinable/rsh12,
+ /obj/item/ammo_box/speed_loader_mm127,
+ /obj/item/ammo_box/speed_loader_mm127
+ )
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield,
+ /obj/item/bio_chip/dust
+ )
+ cybernetic_implants = list(
+ /obj/item/organ/internal/eyes/cybernetic/xray/hardened,
+ /obj/item/organ/internal/cyberimp/brain/anti_stam/hardened,
+ /obj/item/organ/internal/cyberimp/chest/nutriment/plus/hardened
+ )
+
+/datum/outfit/job/admin/nt_navy_captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ . = ..()
+ if(visualsOnly)
+ return
+
+ var/obj/item/card/id/I = H.wear_id
+ if(istype(I))
+ apply_to_card(I, H, get_centcom_access("Nanotrasen Navy Captain"), "Nanotrasen Navy Captain")
+ H.sec_hud_set_ID()
+
+/datum/outfit/job/admin/ntnavyofficer/field/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
@@ -64,7 +210,39 @@
var/obj/item/card/id/I = H.wear_id
if(istype(I))
apply_to_card(I, H, get_centcom_access("Nanotrasen Navy Officer"), "Nanotrasen Navy Field Officer")
- I.assignment = "Nanotrasen Navy Officer"
+ I.rank = "Nanotrasen Navy Officer"
+ I.assignment = "Nanotrasen Navy Field Officer"
+ H.sec_hud_set_ID()
+
+/datum/outfit/job/admin/ntnavyofficer/intern
+ name = "NT Intern"
+ uniform = /obj/item/clothing/under/rank/centcom/intern
+ head = /obj/item/clothing/head/beret/centcom/intern
+ glasses = /obj/item/clothing/glasses/hud/skills/sunglasses
+ gloves = /obj/item/clothing/gloves/fingerless
+ id = /obj/item/card/id/centcom
+ backpack_contents = list(
+ /obj/item/stamp/centcom,
+ /obj/item/clipboard,
+ /obj/item/stack/spacecash/c200
+ )
+ bio_chips = list(
+ /obj/item/bio_chip/mindshield
+ )
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/chest/nutriment/plus/hardened
+ )
+
+/datum/outfit/job/admin/ntnavyofficer/intern/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ . = ..()
+ if(visualsOnly)
+ return
+
+ var/obj/item/card/id/I = H.wear_id
+ if(istype(I))
+ apply_to_card(I, H, get_centcom_access("Nanotrasen Navy Officer"), "Nanotrasen CentCom Intern")
+ I.rank = "Nanotrasen Navy Officer"
+ I.assignment = "Nanotrasen CentCom Intern"
H.sec_hud_set_ID()
/obj/item/clothing/head/helmet/space/deathsquad/beret/field
@@ -138,3 +316,138 @@
/datum/outfit/job/centcom/response_team/engineer/amber
suit = /obj/item/clothing/suit/space/ert_engineer
head = /obj/item/clothing/head/helmet/space/ert_engineer
+
+// MARK: Skrell
+/datum/outfit/admin/sdtf
+ name = "Skrellian Defence Task Forces Marine"
+ uniform = /obj/item/clothing/under/solgov/srt
+ back = /obj/item/mod/control/pre_equipped/exclusive/skrell_raskinta
+ belt = /obj/item/melee/vibroblade
+ glasses = /obj/item/clothing/glasses/night
+ gloves = /obj/item/clothing/gloves/combat
+ shoes = /obj/item/clothing/shoes/combat
+ l_ear = /obj/item/radio/headset/skrellian
+ id = /obj/item/card/id
+ l_hand = /obj/item/gun/energy/gun/skrell_carbine/elite
+ r_pocket = /obj/item/reagent_containers/hypospray/autoinjector/nt_emergency/skrell
+ l_pocket = /obj/item/tank/internals/emergency_oxygen/double
+ mask = /obj/item/clothing/mask/gas/swat
+ backpack_contents = list(
+ /obj/item/storage/box/skrell,
+ /obj/item/storage/box/smoke_grenades,
+ /obj/item/grenade/plastic/c4 = 2,
+ /obj/item/storage/box/handcuffs,
+ /obj/item/clothing/accessory/holster,
+ /obj/item/gun/energy/gun/skrell_pistol
+ )
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+ /obj/item/organ/internal/cyberimp/brain/anti_drop,
+ /obj/item/organ/internal/cyberimp/eyes/hud/medical,
+ )
+ var/is_sardaukar = FALSE
+
+/datum/outfit/admin/sdtf/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ . = ..()
+ if(visualsOnly)
+ return
+
+ H.add_language("Skrellian")
+ H.set_default_language(GLOB.all_languages["Skrellian"])
+
+ var/obj/item/card/id/I = H.wear_id
+ if(istype(I))
+ var/applied_rank = is_sardaukar ? "Emperor Guard" : "SDTF Raskinta Katish"
+ apply_to_card(I, H, list(ACCESS_MAINT_TUNNELS), applied_rank, /obj/item/card/id/away/old/med::icon_state)
+ H.sec_hud_set_ID()
+
+/datum/outfit/admin/sdtf/rifleman
+ name = "Skrellian Defence Task Forces Officer"
+ l_hand = /obj/item/gun/projectile/automatic/sniper_rifle/skrell_rifle
+ belt = /obj/item/storage/belt/military/assault/skrell
+ suit_store = /obj/item/melee/vibroblade
+ backpack_contents = list(
+ /obj/item/storage/box/skrell,
+ /obj/item/gun/energy/gun/skrell_carbine/elite,
+ /obj/item/storage/box/smoke_grenades,
+ /obj/item/grenade/plastic/c4 = 2,
+ /obj/item/clothing/accessory/holster,
+ /obj/item/gun/energy/gun/skrell_pistol
+ )
+
+/datum/outfit/admin/sdtf/sardaukar
+ name = "Skrellian Defence Task Forces Emperor Guard"
+ l_hand = /obj/item/gun/projectile/automatic/sniper_rifle/skrell_rifle/elite
+ belt = /obj/item/storage/belt/military/assault/skrell_elite
+ back = /obj/item/mod/control/pre_equipped/exclusive/skrell_sardaukars
+ r_pocket = /obj/item/reagent_containers/hypospray/combat/nanites
+ suit_store = /obj/item/melee/vibroblade/sardaukar
+ backpack_contents = list(
+ /obj/item/gun/energy/gun/skrell_carbine/elite,
+ /obj/item/storage/box/skrell,
+ /obj/item/storage/box/smoke_grenades,
+ /obj/item/grenade/plastic/c4 = 2,
+ /obj/item/clothing/accessory/holster,
+ /obj/item/CQC_manual,
+ /obj/item/shield/energy,
+ /obj/item/gun/energy/gun/skrell_pistol
+ )
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+ /obj/item/organ/internal/cyberimp/brain/anti_drop,
+ /obj/item/organ/internal/cyberimp/eyes/hud/medical,
+ /obj/item/organ/internal/cyberimp/brain/sensory_enhancer,
+ /obj/item/organ/internal/cyberimp/brain/anti_stam
+ )
+ is_sardaukar = TRUE
+
+/obj/item/radio/headset/skrellian
+ name = "skrellian bowman headset"
+ desc = "Used by SDFT forces. Protects ears from flashbangs."
+ flags = EARBANGPROTECT
+ origin_tech = "syndicate=3"
+ icon_state = "com_headset_alt"
+ item_state = "com_headset_alt"
+ ks1type = /obj/item/encryptionkey/skrell
+ requires_tcomms = FALSE
+
+/obj/item/encryptionkey/skrell
+ name = "skrellian encryption key"
+ icon_state = "cypherkey"
+ channels = list("Special Ops" = 1, "Security" = 1, "Command" = 1)
+ origin_tech = "syndicate=4"
+
+/obj/item/reagent_containers/hypospray/autoinjector/nt_emergency/skrell
+ name = "nanites emergency autoinjector"
+ desc = "Одноразовый автоинжектор с нанитами."
+ list_reagents = list("nanites" = 10)
+
+/obj/item/storage/box/skrell
+ name = "boxed survival kit"
+ desc = "A standard issue SDTF survival kit."
+ icon = 'modular_ss220/objects/icons/boxes.dmi'
+ icon_state = "skrell_box"
+
+/obj/item/storage/box/skrell/populate_contents()
+ new /obj/item/tank/internals/emergency_oxygen/engi(src)
+ new /obj/item/crowbar/small(src)
+ new /obj/item/flashlight/flare(src)
+ new /obj/item/kitchen/knife/combat(src)
+ new /obj/item/reagent_containers/hypospray/autoinjector/nt_emergency/skrell(src)
+ new /obj/item/reagent_containers/hypospray/autoinjector/nt_emergency/skrell(src)
+
+/obj/item/storage/belt/military/assault/skrell/populate_contents()
+ new /obj/item/ammo_box/magazine/skrell_magazine(src)
+ new /obj/item/ammo_box/magazine/skrell_magazine(src)
+ new /obj/item/ammo_box/magazine/skrell_magazine(src)
+ new /obj/item/ammo_box/magazine/skrell_magazine(src)
+ new /obj/item/ammo_box/magazine/skrell_magazine(src)
+ new /obj/item/restraints/legcuffs/bola/energy(src)
+
+/obj/item/storage/belt/military/assault/skrell_elite/populate_contents()
+ new /obj/item/ammo_box/magazine/skrell_magazine/skrell_magazine_elite(src)
+ new /obj/item/ammo_box/magazine/skrell_magazine/skrell_magazine_elite(src)
+ new /obj/item/ammo_box/magazine/skrell_magazine/skrell_magazine_elite(src)
+ new /obj/item/ammo_box/magazine/skrell_magazine/skrell_magazine_elite(src)
+ new /obj/item/ammo_box/magazine/skrell_magazine/skrell_magazine_elite(src)
+ new /obj/item/restraints/legcuffs/bola/energy(src)
diff --git a/modular_ss220/sm_space_drop/code/sm_drop_button.dm b/modular_ss220/sm_space_drop/code/sm_drop_button.dm
index ae956940fb17..c3376a007942 100644
--- a/modular_ss220/sm_space_drop/code/sm_drop_button.dm
+++ b/modular_ss220/sm_space_drop/code/sm_drop_button.dm
@@ -72,7 +72,7 @@
user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
glass = FALSE
playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 100, TRUE)
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
else
user.visible_message(span_notice("[user] дружески похлопывает по [name]."), span_notice("Вы дружески похлопываете по [name]."))
playsound(loc, 'sound/effects/glassknock.ogg', 50, TRUE)
@@ -85,7 +85,7 @@
playsound(loc, "modular_ss220/sm_space_drop/sound/button[rand(1, 5)].ogg", 100, TRUE)
visible_message(span_notice("Кнопка громко щелкает."))
launch_sequence()
- update_icon_state()
+ update_icon(UPDATE_ICON_STATE)
if(SSticker && SSticker.current_state == GAME_STATE_PLAYING)
var/area/area = get_area(src)
if(area)
diff --git a/modular_ss220/station_traits/_station_traits.dm b/modular_ss220/station_traits/_station_traits.dm
new file mode 100644
index 000000000000..9e518dd24de9
--- /dev/null
+++ b/modular_ss220/station_traits/_station_traits.dm
@@ -0,0 +1,5 @@
+/datum/modpack/station_traits
+ name = "Station Traits"
+ desc = "Станционные трейты, которые добавили мы. Возможно в будущем будут на апстриме."
+ author = "Aylong"
+
diff --git a/modular_ss220/station_traits/_station_traits.dme b/modular_ss220/station_traits/_station_traits.dme
new file mode 100644
index 000000000000..b32c95c94a52
--- /dev/null
+++ b/modular_ss220/station_traits/_station_traits.dme
@@ -0,0 +1,3 @@
+#include "_station_traits.dm"
+
+#include "code/neutral_traits.dm"
diff --git a/modular_ss220/station_traits/code/neutral_traits.dm b/modular_ss220/station_traits/code/neutral_traits.dm
new file mode 100644
index 000000000000..b09668325a05
--- /dev/null
+++ b/modular_ss220/station_traits/code/neutral_traits.dm
@@ -0,0 +1,28 @@
+/datum/station_trait/darkness
+ name = "Electricity Saving"
+ trait_type = STATION_TRAIT_NEUTRAL
+ weight = 5
+ show_in_report = TRUE
+ report_message = "Предыдущая смена позаботилась об экономии энергии перед уходом."
+ blacklist = list(/datum/station_trait/rave)
+
+/datum/station_trait/darkness/on_round_start()
+ . = ..()
+ for(var/obj/machinery/light_switch/light_switch in GLOB.machines)
+ var/turf/our_turf = get_turf(light_switch)
+ if(!is_station_level(our_turf.z))
+ continue
+
+ var/area/switch_area = get_area(light_switch)
+ switch_area.lightswitch = FALSE
+ light_switch.update_icon(UPDATE_ICON)
+
+ for(var/obj/machinery/light/light in switch_area)
+ light.power_change()
+
+ for(var/obj/item/flashlight/lamp/lamp in switch_area)
+ lamp.on = FALSE
+ lamp.update_brightness()
+
+ for(var/turf/simulated/floor/light/floor_light in switch_area)
+ floor_light.toggle_light(FALSE)
diff --git a/modular_ss220/text_to_speech/code/_defines.dm b/modular_ss220/text_to_speech/code/_defines.dm
index 7f97c065707e..1e46ef58ef60 100644
--- a/modular_ss220/text_to_speech/code/_defines.dm
+++ b/modular_ss220/text_to_speech/code/_defines.dm
@@ -58,6 +58,7 @@
#define TTS_CATEGORY_TLOU "The Last of Us"
#define TTS_CATEGORY_DEEP_ROCK_GALACTIC "Deep Rock Galactic"
#define TTS_CATEGORY_SUNBOY "Пророк Санбой"
+#define TTS_CATEGORY_WH40k "Warhammer 40k"
#define TTS_GENDER_ANY "Любой"
diff --git a/modular_ss220/text_to_speech/code/seeds/silero.dm b/modular_ss220/text_to_speech/code/seeds/silero.dm
index 5f5e1c786ce0..89c4634865e1 100644
--- a/modular_ss220/text_to_speech/code/seeds/silero.dm
+++ b/modular_ss220/text_to_speech/code/seeds/silero.dm
@@ -5251,3 +5251,63 @@
value = "last_years_snow_narrator"
category = TTS_CATEGORY_OTHER
gender = TTS_GENDER_MALE
+
+/datum/tts_seed/silero/last_years_snow_man
+ name = "last_years_snow_man"
+ value = "last_years_snow_man"
+ category = TTS_CATEGORY_OTHER
+ gender = TTS_GENDER_MALE
+
+/datum/tts_seed/silero/marine2_titus
+ name = "marine2_titus"
+ value = "marine2_titus"
+ category = TTS_CATEGORY_WH40k
+ gender = TTS_GENDER_MALE
+
+/datum/tts_seed/silero/marine2_berserk
+ name = "marine2_berserk"
+ value = "marine2_berserk"
+ category = TTS_CATEGORY_WH40k
+ gender = TTS_GENDER_MALE
+
+/datum/tts_seed/silero/marine2_gadriel
+ name = "marine2_gadriel"
+ value = "marine2_gadriel"
+ category = TTS_CATEGORY_WH40k
+ gender = TTS_GENDER_MALE
+
+/datum/tts_seed/silero/marine2_chairon
+ name = "marine2_chairon"
+ value = "marine2_chairon"
+ category = TTS_CATEGORY_WH40k
+ gender = TTS_GENDER_MALE
+
+/datum/tts_seed/silero/marine2_acheran
+ name = "marine2_acheran"
+ value = "marine2_acheran"
+ category = TTS_CATEGORY_WH40k
+ gender = TTS_GENDER_MALE
+
+/datum/tts_seed/silero/marine2_machine_spirit_4
+ name = "marine2_machine_spirit_4"
+ value = "marine2_machine_spirit_4"
+ category = TTS_CATEGORY_WH40k
+ gender = TTS_GENDER_FEMALE
+
+/datum/tts_seed/silero/marine2_magos_galeo
+ name = "marine2_magos_galeo"
+ value = "marine2_magos_galeo"
+ category = TTS_CATEGORY_WH40k
+ gender = TTS_GENDER_MALE
+
+/datum/tts_seed/silero/marine2_servo_skull
+ name = "marine2_servo-skull"
+ value = "marine2_servo-skull"
+ category = TTS_CATEGORY_WH40k
+ gender = TTS_GENDER_MALE
+
+/datum/tts_seed/silero/marine2_balthazar
+ name = "marine2_balthazar"
+ value = "marine2_balthazar"
+ category = TTS_CATEGORY_WH40k
+ gender = TTS_GENDER_MALE
diff --git a/modular_ss220/vending/code/vending.dm b/modular_ss220/vending/code/vending.dm
index 017fa5bbead3..4ac5b9fae813 100644
--- a/modular_ss220/vending/code/vending.dm
+++ b/modular_ss220/vending/code/vending.dm
@@ -10,27 +10,27 @@
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
refill_canister = /obj/item/vending_refill/nta
products = list(
- /obj/item/storage/box/slug = 4,
+ /obj/item/storage/fancy/shell/slug = 4,
/obj/item/grenade/flashbang = 4,
/obj/item/flash = 5,
- /obj/item/storage/box/buck = 4,
+ /obj/item/storage/fancy/shell/buck = 4,
/obj/item/ammo_box/magazine/enforcer = 8,
/obj/item/flashlight/seclite = 4,
/obj/item/restraints/legcuffs/bola/energy = 8,
/obj/item/ammo_box/magazine/enforcer/lethal = 8,
/obj/item/ammo_box/magazine/laser = 12,
/obj/item/ammo_box/magazine/wt550m9 = 8,
- /obj/item/storage/box/rubbershot = 4,
+ /obj/item/storage/fancy/shell/rubbershot = 4,
/obj/item/ammo_box/magazine/m556/arg = 12,
/obj/item/ammo_box/a40mm = 4,
/obj/item/ammo_box/magazine/smgm9mm = 12)
/obj/machinery/economy/vending/nta/admin/Initialize(mapload)
products = list()
- var/list/new_products = list() + subtypesof(/obj/item/ammo_box) + /obj/item/storage/box/rubbershot +\
- /obj/item/storage/box/buck + /obj/item/storage/box/dragonsbreath + /obj/item/storage/box/holy +\
- /obj/item/storage/box/rubbershot + /obj/item/storage/box/slug + /obj/item/storage/box/stun +\
- /obj/item/storage/box/tranquilizer - /obj/item/ammo_box/magazine - typesof(/obj/item/ammo_box/magazine/internal)
+ var/list/new_products = list() + subtypesof(/obj/item/ammo_box) + /obj/item/storage/fancy/shell/rubbershot +\
+ /obj/item/storage/fancy/shell/buck + /obj/item/storage/fancy/shell/dragonsbreath + /obj/item/storage/fancy/shell/holy +\
+ /obj/item/storage/fancy/shell/rubbershot + /obj/item/storage/fancy/shell/slug + /obj/item/storage/fancy/shell/stun +\
+ /obj/item/storage/fancy/shell/tranquilizer - /obj/item/ammo_box/magazine - typesof(/obj/item/ammo_box/magazine/internal)
for(var/ammo_type in new_products)
products[ammo_type] = 999
. = ..()
@@ -48,9 +48,9 @@
/obj/item/gun/projectile/automatic/wt550 = 3,
/obj/item/ammo_box/magazine/wt550m9 = 6,
/obj/item/gun/projectile/shotgun/riot = 6,
- /obj/item/storage/box/rubbershot = 6,
- /obj/item/storage/box/beanbag = 4,
- /obj/item/storage/box/tranquilizer = 4)
+ /obj/item/storage/fancy/shell/rubbershot = 6,
+ /obj/item/storage/fancy/shell/beanbag = 4,
+ /obj/item/storage/fancy/shell/tranquilizer = 4)
/obj/machinery/economy/vending/nta/red
name = "NT ERT Heavy Gear & Ammunition"
@@ -63,9 +63,9 @@
/obj/item/gun/energy/immolator = 3,
/obj/item/gun/energy/gun/nuclear = 3,
/obj/item/gun/projectile/shotgun/automatic/combat = 3,
- /obj/item/storage/box/slug = 4,
- /obj/item/storage/box/buck = 4,
- /obj/item/storage/box/dragonsbreath = 2,
+ /obj/item/storage/fancy/shell/slug = 4,
+ /obj/item/storage/fancy/shell/buck = 4,
+ /obj/item/storage/fancy/shell/dragonsbreath = 2,
/obj/item/storage/lockbox/t4 = 3,
/obj/item/grenade/smokebomb = 3,
/obj/item/grenade/frag = 4)
@@ -83,7 +83,7 @@
/obj/item/gun/projectile/automatic/pistol/enforcer = 6,
/obj/item/ammo_box/magazine/enforcer = 12,
/obj/item/gun/projectile/shotgun/riot = 1,
- /obj/item/storage/box/rubbershot = 3)
+ /obj/item/storage/fancy/shell/rubbershot = 3)
/obj/machinery/economy/vending/nta/yellow
name = "NT ERT Death Wish Gear & Ammunition"
@@ -173,54 +173,8 @@
icon_lightmask = "Cola_Machine_Red"
slogan_list = list("Кола в космосе!")
-/obj/machinery/economy/vending/suitdispenser/Initialize(mapload)
- products += list(/obj/item/clothing/under/yellowgreen_skirt = 10,
- /obj/item/clothing/under/black_skirt = 10,
- /obj/item/clothing/under/aqua_skirt = 10,
- /obj/item/clothing/under/blue_skirt = 10,
- /obj/item/clothing/under/brown_skirt = 10,
- /obj/item/clothing/under/darkblue_skirt = 10,
- /obj/item/clothing/under/darkred_skirt = 10,
- /obj/item/clothing/under/green_skirt = 10,
- /obj/item/clothing/under/grey_skirt = 10,
- /obj/item/clothing/under/lightblue_skirt = 10,
- /obj/item/clothing/under/lightbrown_skirt = 10,
- /obj/item/clothing/under/lightgreen_skirt = 10,
- /obj/item/clothing/under/lightpurple_skirt = 10,
- /obj/item/clothing/under/lightred_skirt = 10,
- /obj/item/clothing/under/orange_skirt = 10,
- /obj/item/clothing/under/pink_skirt = 10,
- /obj/item/clothing/under/purple_skirt = 10,
- /obj/item/clothing/under/red_skirt = 10,
- /obj/item/clothing/under/white_skirt = 10,
- /obj/item/clothing/under/yellow_skirt = 10,
- /obj/item/clothing/under/rainbow_skirt = 1)
-
- contraband += list(/obj/item/clothing/under/prisoner_skirt = 1)
-
- prices += list(/obj/item/clothing/under/yellowgreen_skirt = 30,
- /obj/item/clothing/under/aqua_skirt = 50,
- /obj/item/clothing/under/black_skirt = 30,
- /obj/item/clothing/under/blue_skirt = 50,
- /obj/item/clothing/under/brown_skirt = 30,
- /obj/item/clothing/under/darkblue_skirt = 50,
- /obj/item/clothing/under/darkred_skirt = 50,
- /obj/item/clothing/under/green_skirt = 50,
- /obj/item/clothing/under/grey_skirt = 30,
- /obj/item/clothing/under/lightblue_skirt = 30,
- /obj/item/clothing/under/lightbrown_skirt = 30,
- /obj/item/clothing/under/lightgreen_skirt = 50,
- /obj/item/clothing/under/lightpurple_skirt = 50,
- /obj/item/clothing/under/lightred_skirt = 50,
- /obj/item/clothing/under/orange_skirt = 50,
- /obj/item/clothing/under/pink_skirt = 50,
- /obj/item/clothing/under/purple_skirt = 50,
- /obj/item/clothing/under/red_skirt = 50,
- /obj/item/clothing/under/white_skirt = 50,
- /obj/item/clothing/under/yellow_skirt = 50,
- /obj/item/clothing/under/prisoner_skirt = 175,
- /obj/item/clothing/under/rainbow_skirt = 100)
- . = ..()
+/obj/machinery/economy/vending/suitdispenser/free
+ prices = list()
/obj/machinery/economy/vending/wallmed/emergency_ntmed
name = "\improper Advanced Nanomed"
@@ -242,3 +196,14 @@
contraband |= list(/obj/item/clothing/shoes/clown_shoes/moffers = 1)
prices |= list(/obj/item/clothing/shoes/clown_shoes/moffers = 80)
. = ..()
+
+/obj/machinery/economy/vending/shoedispenser/free
+ prices = list()
+
+/obj/machinery/economy/vending/engidrobe/Initialize(mapload)
+ contraband |= list(/obj/item/clothing/gloves/color/yellow/vox = 1)
+ prices |= list(/obj/item/clothing/gloves/color/yellow/vox = 300)
+ . = ..()
+
+/obj/machinery/economy/vending/engidrobe/free
+ prices = list()
diff --git a/modular_ss220/vending/code/vending_food.dm b/modular_ss220/vending/code/vending_food.dm
index 758128c02a94..bfb647af2a85 100644
--- a/modular_ss220/vending/code/vending_food.dm
+++ b/modular_ss220/vending/code/vending_food.dm
@@ -45,6 +45,9 @@
/obj/item/poster/mac_vulpix = 3,
)
+/obj/machinery/economy/vending/vulpix/free
+ prices = list()
+
// MARK: Nanotrasen Food
/obj/machinery/economy/vending/nt_food
name = "\improper Nanotrasen Food"
diff --git a/paradise.dme b/paradise.dme
index 97cc919fef08..5990a2124077 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -17,6 +17,7 @@
#include "code\__byond_version_compat.dm"
#include "code\_compile_options.dm"
#include "code\world_definition.dm"
+#include "code\__DEFINES\__proc_refs.dm"
#include "code\__DEFINES\_click.dm"
#include "code\__DEFINES\_globals.dm"
#include "code\__DEFINES\_init.dm"
@@ -89,7 +90,6 @@
#include "code\__DEFINES\mecha_defines.dm"
#include "code\__DEFINES\mecha_hides.dm"
#include "code\__DEFINES\medal.dm"
-#include "code\__DEFINES\milla.dm"
#include "code\__DEFINES\misc_defines.dm"
#include "code\__DEFINES\mob_defines.dm"
#include "code\__DEFINES\mod.dm"
@@ -102,7 +102,6 @@
#include "code\__DEFINES\pipes.dm"
#include "code\__DEFINES\power_defines.dm"
#include "code\__DEFINES\preferences_defines.dm"
-#include "code\__DEFINES\proc_refs.dm"
#include "code\__DEFINES\procpath.dm"
#include "code\__DEFINES\qdel_defines.dm"
#include "code\__DEFINES\radiation_defines.dm"
@@ -112,6 +111,7 @@
#include "code\__DEFINES\revolution_defines.dm"
#include "code\__DEFINES\role_preferences.dm"
#include "code\__DEFINES\rolebans.dm"
+#include "code\__DEFINES\rust.dm"
#include "code\__DEFINES\rust_g.dm"
#include "code\__DEFINES\shuttle_defines.dm"
#include "code\__DEFINES\sight.dm"
@@ -448,6 +448,7 @@
#include "code\datums\components\proximity_monitor.dm"
#include "code\datums\components\radioactive.dm"
#include "code\datums\components\scope.dm"
+#include "code\datums\components\shelved.dm"
#include "code\datums\components\shielded.dm"
#include "code\datums\components\slippery.dm"
#include "code\datums\components\spawner.dm"
@@ -708,6 +709,7 @@
#include "code\game\area\ss13_areas\science_areas.dm"
#include "code\game\area\ss13_areas\security_areas.dm"
#include "code\game\area\ss13_areas\service_areas.dm"
+#include "code\game\area\ss13_areas\station_area.dm"
#include "code\game\area\ss13_areas\supply_areas.dm"
#include "code\game\dna\dna2.dm"
#include "code\game\dna\dna2_domutcheck.dm"
@@ -790,8 +792,8 @@
#include "code\game\gamemodes\traitor\traitor.dm"
#include "code\game\gamemodes\trifecta\trifecta.dm"
#include "code\game\gamemodes\vampire\traitor_vamp.dm"
-#include "code\game\gamemodes\vampire\vampire_gamemode.dm"
#include "code\game\gamemodes\vampire\vampire_chan.dm"
+#include "code\game\gamemodes\vampire\vampire_gamemode.dm"
#include "code\game\gamemodes\wizard\artefact.dm"
#include "code\game\gamemodes\wizard\godhand.dm"
#include "code\game\gamemodes\wizard\magic_tarot.dm"
@@ -956,11 +958,13 @@
#include "code\game\mecha\combat\phazon.dm"
#include "code\game\mecha\combat\reticence.dm"
#include "code\game\mecha\equipment\mecha_equipment.dm"
+#include "code\game\mecha\equipment\tools\janitor_tools.dm"
#include "code\game\mecha\equipment\tools\mecha_mining_tools.dm"
#include "code\game\mecha\equipment\tools\medical_tools.dm"
#include "code\game\mecha\equipment\tools\other_tools.dm"
#include "code\game\mecha\equipment\tools\work_tools.dm"
#include "code\game\mecha\equipment\weapons\weapons.dm"
+#include "code\game\mecha\janitor\nkarrdem.dm"
#include "code\game\mecha\medical\medical_base.dm"
#include "code\game\mecha\medical\odysseus.dm"
#include "code\game\mecha\working\ripley.dm"
@@ -1016,6 +1020,7 @@
#include "code\game\objects\effects\effect_system\effects_smoke.dm"
#include "code\game\objects\effects\effect_system\effects_sparks.dm"
#include "code\game\objects\effects\effect_system\effects_water.dm"
+#include "code\game\objects\effects\map_effects\mapmanip.dm"
#include "code\game\objects\effects\spawners\airlock_spawner.dm"
#include "code\game\objects\effects\spawners\bombspawner.dm"
#include "code\game\objects\effects\spawners\decorative_spawners.dm"
@@ -1031,10 +1036,12 @@
#include "code\game\objects\effects\spawners\windowspawner.dm"
#include "code\game\objects\effects\spawners\random\engineering_spawners.dm"
#include "code\game\objects\effects\spawners\random\food_spawners.dm"
+#include "code\game\objects\effects\spawners\random\furniture_spawners.dm"
#include "code\game\objects\effects\spawners\random\maint_loot_spawners.dm"
#include "code\game\objects\effects\spawners\random\misc_spawners.dm"
#include "code\game\objects\effects\spawners\random\random_spawner.dm"
#include "code\game\objects\effects\spawners\random\trash_spawners.dm"
+#include "code\game\objects\effects\spawners\random\wall_decal_spawners.dm"
#include "code\game\objects\effects\temporary_visuals\clockcult.dm"
#include "code\game\objects\effects\temporary_visuals\cult_visuals.dm"
#include "code\game\objects\effects\temporary_visuals\explosion_temp_visuals.dm"
@@ -1205,6 +1212,7 @@
#include "code\game\objects\items\weapons\tape.dm"
#include "code\game\objects\items\weapons\teleportation.dm"
#include "code\game\objects\items\weapons\teleprod.dm"
+#include "code\game\objects\items\weapons\thurible.dm"
#include "code\game\objects\items\weapons\twohanded.dm"
#include "code\game\objects\items\weapons\vending_items.dm"
#include "code\game\objects\items\weapons\weaponry.dm"
@@ -1319,6 +1327,7 @@
#include "code\game\objects\structures\railings.dm"
#include "code\game\objects\structures\reflector.dm"
#include "code\game\objects\structures\safe.dm"
+#include "code\game\objects\structures\shelves.dm"
#include "code\game\objects\structures\signs.dm"
#include "code\game\objects\structures\snow.dm"
#include "code\game\objects\structures\spirit_board.dm"
@@ -1917,7 +1926,6 @@
#include "code\modules\food_and_drinks\kitchen_machinery\cereal_maker.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\cooker.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\deep_fryer.dm"
-#include "code\modules\food_and_drinks\kitchen_machinery\food_grill.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\gibber.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\grill_new.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\icecream_vat.dm"
@@ -1986,6 +1994,7 @@
#include "code\modules\hydroponics\grown\onion.dm"
#include "code\modules\hydroponics\grown\peanut.dm"
#include "code\modules\hydroponics\grown\pineapple.dm"
+#include "code\modules\hydroponics\grown\plum.dm"
#include "code\modules\hydroponics\grown\potato.dm"
#include "code\modules\hydroponics\grown\pumpkin.dm"
#include "code\modules\hydroponics\grown\random_seeds.dm"
@@ -2017,6 +2026,7 @@
#include "code\modules\instruments\songs\_song_ui.dm"
#include "code\modules\instruments\songs\play_legacy.dm"
#include "code\modules\instruments\songs\play_synthesized.dm"
+#include "code\modules\lavaland\caves_theme.dm"
#include "code\modules\lavaland\lavaland_theme.dm"
#include "code\modules\library\book.dm"
#include "code\modules\library\library_admin.dm"
@@ -2390,8 +2400,8 @@
#include "code\modules\mob\living\simple_animal\hostile\mushroom.dm"
#include "code\modules\mob\living\simple_animal\hostile\netherworld.dm"
#include "code\modules\mob\living\simple_animal\hostile\pirate.dm"
-#include "code\modules\mob\living\simple_animal\hostile\russian.dm"
#include "code\modules\mob\living\simple_animal\hostile\skeleton_mob.dm"
+#include "code\modules\mob\living\simple_animal\hostile\soviet.dm"
#include "code\modules\mob\living\simple_animal\hostile\syndicate_mobs.dm"
#include "code\modules\mob\living\simple_animal\hostile\tree.dm"
#include "code\modules\mob\living\simple_animal\hostile\venus_human_trap.dm"
@@ -2872,6 +2882,7 @@
#include "code\modules\surgery\organs\robolimbs.dm"
#include "code\modules\surgery\organs\skeleton_organs.dm"
#include "code\modules\surgery\organs\vocal_cords.dm"
+#include "code\modules\surgery\organs\organ_datums\battery_datum.dm"
#include "code\modules\surgery\organs\organ_datums\heart_datum.dm"
#include "code\modules\surgery\organs\organ_datums\lung_datum.dm"
#include "code\modules\surgery\organs\organ_datums\organ_datum.dm"
@@ -2935,6 +2946,7 @@
#include "code\modules\tgui\tgui_input\keycombo_input.dm"
#include "code\modules\tgui\tgui_input\list_input.dm"
#include "code\modules\tgui\tgui_input\number_input.dm"
+#include "code\modules\tgui\tgui_input\ranked_list_input.dm"
#include "code\modules\tgui\tgui_input\text_input.dm"
#include "code\modules\tgui\tgui_panel\audio.dm"
#include "code\modules\tgui\tgui_panel\telemetry.dm"
diff --git a/milla/Cargo.lock b/rust/Cargo.lock
similarity index 57%
rename from milla/Cargo.lock
rename to rust/Cargo.lock
index eee0b6908eb6..a3c486a8d949 100644
--- a/milla/Cargo.lock
+++ b/rust/Cargo.lock
@@ -2,6 +2,31 @@
# It is not intended for manual editing.
version = 3
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+[[package]]
+name = "adler32"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "getrandom",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
[[package]]
name = "aho-corasick"
version = "1.1.3"
@@ -17,16 +42,50 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c4b08ed8a30ff7320117c190eb4d73d47f0ac0c930ab853b8224cef7cd9a5e7"
+[[package]]
+name = "attribute-derive"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c124f12ade4e670107b132722d0ad1a5c9790bcbc1b265336369ea05626b4498"
+dependencies = [
+ "attribute-derive-macro",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "attribute-derive-macro"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b217a07446e0fb086f83401a98297e2d81492122f5874db5391bd270a185f88"
+dependencies = [
+ "collection_literals",
+ "interpolator",
+ "proc-macro-error",
+ "proc-macro-utils",
+ "proc-macro2",
+ "quote",
+ "quote-use",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
[[package]]
name = "bindgen"
version = "0.69.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
dependencies = [
- "bitflags",
+ "bitflags 2.5.0",
"cexpr",
"clang-sys",
- "itertools",
+ "itertools 0.12.1",
"lazy_static",
"lazycell",
"log",
@@ -36,16 +95,38 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn",
+ "syn 2.0.60",
"which",
]
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
[[package]]
name = "bitflags"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+[[package]]
+name = "builtins-proc-macro"
+version = "0.0.0"
+source = "git+https://github.com/SpaceManiac/SpacemanDMM?rev=6c5a751516ae0e8add4b2aa4388a1e84e96e7082#6c5a751516ae0e8add4b2aa4388a1e84e96e7082"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
[[package]]
name = "byondapi"
version = "0.4.7"
@@ -67,7 +148,7 @@ source = "git+https://github.com/spacestation13/byondapi-rs.git#aa4addd95c33b666
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.60",
]
[[package]]
@@ -82,6 +163,32 @@ dependencies = [
"walkdir",
]
+[[package]]
+name = "bytemuck"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
[[package]]
name = "cexpr"
version = "0.6.0"
@@ -108,6 +215,72 @@ dependencies = [
"libloading",
]
+[[package]]
+name = "collection_literals"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186dce98367766de751c42c4f03970fc60fc012296e706ccbb9d5df9b6c1e271"
+
+[[package]]
+name = "color_space"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52fdfaf2bee6357023bf7f95b15a8ef0b82759d2bce705cc45efcae9ae10f0ff"
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive-where"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
+[[package]]
+name = "dmm-tools"
+version = "0.1.0"
+source = "git+https://github.com/SpaceManiac/SpacemanDMM?rev=6c5a751516ae0e8add4b2aa4388a1e84e96e7082#6c5a751516ae0e8add4b2aa4388a1e84e96e7082"
+dependencies = [
+ "ahash",
+ "bumpalo",
+ "bytemuck",
+ "dreammaker",
+ "either",
+ "indexmap 1.9.3",
+ "inflate",
+ "lodepng",
+ "ndarray",
+ "rand",
+]
+
[[package]]
name = "doxygen-rs"
version = "0.4.2"
@@ -117,6 +290,29 @@ dependencies = [
"phf",
]
+[[package]]
+name = "dreammaker"
+version = "0.1.0"
+source = "git+https://github.com/SpaceManiac/SpacemanDMM?rev=6c5a751516ae0e8add4b2aa4388a1e84e96e7082#6c5a751516ae0e8add4b2aa4388a1e84e96e7082"
+dependencies = [
+ "ahash",
+ "bitflags 1.3.2",
+ "builtins-proc-macro",
+ "color_space",
+ "derivative",
+ "get-size",
+ "get-size-derive",
+ "indexmap 1.9.3",
+ "interval-tree",
+ "lodepng",
+ "ordered-float",
+ "phf",
+ "serde",
+ "serde_derive",
+ "termcolor",
+ "toml",
+]
+
[[package]]
name = "either"
version = "1.11.0"
@@ -149,6 +345,42 @@ dependencies = [
"once_cell",
]
+[[package]]
+name = "flate2"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "get-size"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b61e2dab7eedce93a83ab3468b919873ff16bac5a3e704011ff836d22b2120"
+
+[[package]]
+name = "get-size-derive"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13a1bcfb855c1f340d5913ab542e36f25a1c56f57de79022928297632435dec2"
+dependencies = [
+ "attribute-derive",
+ "quote",
+ "syn 2.0.60",
+]
+
[[package]]
name = "getrandom"
version = "0.2.14"
@@ -166,6 +398,12 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
[[package]]
name = "hashbrown"
version = "0.14.5"
@@ -187,6 +425,16 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+]
+
[[package]]
name = "indexmap"
version = "2.2.6"
@@ -194,15 +442,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
dependencies = [
"equivalent",
- "hashbrown",
+ "hashbrown 0.14.5",
]
+[[package]]
+name = "inflate"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff"
+dependencies = [
+ "adler32",
+]
+
+[[package]]
+name = "interpolator"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71dd52191aae121e8611f1e8dc3e324dd0dd1dee1e6dd91d10ee07a3cfb4d9d8"
+
+[[package]]
+name = "interval-tree"
+version = "0.8.0"
+source = "git+https://github.com/SpaceManiac/SpacemanDMM?rev=6c5a751516ae0e8add4b2aa4388a1e84e96e7082#6c5a751516ae0e8add4b2aa4388a1e84e96e7082"
+
[[package]]
name = "inventory"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767"
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
[[package]]
name = "itertools"
version = "0.12.1"
@@ -212,6 +489,12 @@ dependencies = [
"either",
]
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
[[package]]
name = "lazy_static"
version = "1.4.0"
@@ -246,12 +529,34 @@ version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+[[package]]
+name = "lodepng"
+version = "3.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b2dea7cda68e381418c985fd8f32a9c279a21ae8c715f2376adb20c27a0fad3"
+dependencies = [
+ "crc32fast",
+ "flate2",
+ "libc",
+ "rgb",
+]
+
[[package]]
name = "log"
version = "0.4.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+[[package]]
+name = "matrixmultiply"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a"
+dependencies = [
+ "autocfg",
+ "rawpointer",
+]
+
[[package]]
name = "memchr"
version = "2.7.2"
@@ -259,23 +564,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
[[package]]
-name = "milla"
-version = "1.0.0"
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
dependencies = [
- "atomic_float",
- "bitflags",
- "byondapi",
- "eyre",
- "rand",
- "scc",
- "thread-priority",
+ "adler2",
]
[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
+name = "ndarray"
+version = "0.15.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32"
+dependencies = [
+ "matrixmultiply",
+ "num-complex",
+ "num-integer",
+ "num-traits",
+ "rawpointer",
+]
[[package]]
name = "nom"
@@ -287,6 +601,33 @@ dependencies = [
"minimal-lexical",
]
+[[package]]
+name = "num-complex"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
[[package]]
name = "num_enum"
version = "0.7.2"
@@ -305,7 +646,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.60",
]
[[package]]
@@ -314,6 +655,15 @@ version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+[[package]]
+name = "ordered-float"
+version = "3.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
+dependencies = [
+ "num-traits",
+]
+
[[package]]
name = "phf"
version = "0.11.2"
@@ -344,7 +694,7 @@ dependencies = [
"phf_shared",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.60",
]
[[package]]
@@ -369,7 +719,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550"
dependencies = [
"proc-macro2",
- "syn",
+ "syn 2.0.60",
]
[[package]]
@@ -381,6 +731,41 @@ dependencies = [
"toml_edit",
]
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-utils"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f59e109e2f795a5070e69578c4dc101068139f74616778025ae1011d4cd41a8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "smallvec",
+]
+
[[package]]
name = "proc-macro2"
version = "1.0.81"
@@ -399,6 +784,29 @@ dependencies = [
"proc-macro2",
]
+[[package]]
+name = "quote-use"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7b5abe3fe82fdeeb93f44d66a7b444dedf2e4827defb0a8e69c437b2de2ef94"
+dependencies = [
+ "quote",
+ "quote-use-macros",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "quote-use-macros"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97ea44c7e20f16017a76a245bb42188517e13d16dcb1aa18044bc406cdc3f4af"
+dependencies = [
+ "derive-where",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
[[package]]
name = "rand"
version = "0.8.5"
@@ -429,11 +837,17 @@ dependencies = [
"getrandom",
]
+[[package]]
+name = "rawpointer"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
+
[[package]]
name = "regex"
-version = "1.10.4"
+version = "1.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
dependencies = [
"aho-corasick",
"memchr",
@@ -458,6 +872,15 @@ version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+[[package]]
+name = "rgb"
+version = "0.8.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
+dependencies = [
+ "bytemuck",
+]
+
[[package]]
name = "rustc-hash"
version = "1.1.0"
@@ -479,19 +902,46 @@ version = "0.38.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
dependencies = [
- "bitflags",
+ "bitflags 2.5.0",
"errno",
"libc",
"linux-raw-sys",
"windows-sys",
]
+[[package]]
+name = "rustlibs"
+version = "1.0.0"
+dependencies = [
+ "atomic_float",
+ "bitflags 2.5.0",
+ "byondapi",
+ "diff",
+ "dmm-tools",
+ "eyre",
+ "fxhash",
+ "itertools 0.10.5",
+ "rand",
+ "regex",
+ "scc",
+ "serde",
+ "serde_json",
+ "thread-priority",
+ "walkdir",
+]
+
[[package]]
name = "rustversion"
version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0"
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
[[package]]
name = "same-file"
version = "1.0.6"
@@ -522,6 +972,38 @@ version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+[[package]]
+name = "serde"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.128"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
[[package]]
name = "shlex"
version = "1.3.0"
@@ -534,6 +1016,23 @@ version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
[[package]]
name = "syn"
version = "2.0.60"
@@ -545,13 +1044,22 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
[[package]]
name = "thread-priority"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d3b04d33c9633b8662b167b847c7ab521f83d1ae20f2321b65b5b925e532e36"
dependencies = [
- "bitflags",
+ "bitflags 2.5.0",
"cfg-if",
"libc",
"log",
@@ -559,6 +1067,15 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "toml"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "toml_datetime"
version = "0.6.5"
@@ -571,7 +1088,7 @@ version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
dependencies = [
- "indexmap",
+ "indexmap 2.2.6",
"toml_datetime",
"winnow",
]
@@ -582,6 +1099,12 @@ version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
[[package]]
name = "walkdir"
version = "2.5.0"
@@ -722,3 +1245,23 @@ checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
dependencies = [
"memchr",
]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
new file mode 100644
index 000000000000..06e948f3bec0
--- /dev/null
+++ b/rust/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+name = "rustlibs"
+version = "1.0.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+atomic_float = "1.0.0"
+bitflags = "2.5.0"
+byondapi = { git = "https://github.com/spacestation13/byondapi-rs.git", version = "0.4.7" }
+eyre = "0.6.12"
+rand = { version = "0.8.5", features = ["small_rng"] }
+scc = "2.1.1"
+thread-priority = "1.1.0"
+
+# spacemandmm, also used by strongmandmm
+dmmtools = { git = "https://github.com/SpaceManiac/SpacemanDMM", rev = "6c5a751516ae0e8add4b2aa4388a1e84e96e7082", package = "dmm-tools" }
+# diffs between two strings/texts/files, used in tests
+diff = "0.1"
+# general utility lib for iterator operations
+itertools = "0.10.5"
+# fast hashmap
+fxhash = "0.2.1"
+# interface for serialization
+serde = { version = "1.0", features = ["derive"] }
+# json implementation for serde
+serde_json = { version = "1.0" }
+# utility function for walking through a dir recursively
+walkdir = "2.5.0"
+# regex
+regex = "1.10.5"
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
new file mode 100644
index 000000000000..66ed4b0b1bbb
--- /dev/null
+++ b/rust/src/lib.rs
@@ -0,0 +1,3 @@
+mod logging;
+mod mapmanip;
+mod milla;
diff --git a/rust/src/logging/mod.rs b/rust/src/logging/mod.rs
new file mode 100644
index 000000000000..fc5312ae5941
--- /dev/null
+++ b/rust/src/logging/mod.rs
@@ -0,0 +1,24 @@
+/// Call stack trace dm method with message.
+pub(crate) fn dm_call_stack_trace(msg: String) {
+ let msg = byondapi::value::ByondValue::try_from(msg).unwrap();
+ // this is really ugly, cause we want to get id/ref to a proc name string
+ // that is already allocated, and don't want to allocate a new string entirely
+ byondapi::global_call::call_global_id(
+ {
+ static STRING_ID: std::sync::OnceLock = std::sync::OnceLock::new();
+ *STRING_ID.get_or_init(|| byondapi::byond_string::str_id_of("_stack_trace").unwrap())
+ },
+ &[msg],
+ )
+ .unwrap();
+}
+
+/// Panic handler, called on unhandled errors.
+/// Writes panic info to a text file, and calls dm stack trace proc as well.
+pub(crate) fn setup_panic_handler() {
+ std::panic::set_hook(Box::new(|info| {
+ let msg = format!("Panic \n {:#?}", info);
+ let _ = std::fs::write("./rustlibs_panic.txt", msg.clone());
+ dm_call_stack_trace(msg);
+ }))
+}
diff --git a/rust/src/mapmanip/.gitignore b/rust/src/mapmanip/.gitignore
new file mode 100644
index 000000000000..99912a867148
--- /dev/null
+++ b/rust/src/mapmanip/.gitignore
@@ -0,0 +1 @@
+test-out/*
diff --git a/rust/src/mapmanip/core/map_to_string.rs b/rust/src/mapmanip/core/map_to_string.rs
new file mode 100644
index 000000000000..f931d97ac206
--- /dev/null
+++ b/rust/src/mapmanip/core/map_to_string.rs
@@ -0,0 +1,7 @@
+/// Turns spacemandmm map object to string.
+pub fn map_to_string(map: &dmmtools::dmm::Map) -> eyre::Result {
+ let mut v = vec![];
+ map.to_writer(&mut v)?;
+ let s = String::from_utf8(v)?;
+ Ok(s)
+}
diff --git a/rust/src/mapmanip/core/mod.rs b/rust/src/mapmanip/core/mod.rs
new file mode 100644
index 000000000000..7aa0dd994c7b
--- /dev/null
+++ b/rust/src/mapmanip/core/mod.rs
@@ -0,0 +1,147 @@
+pub mod to_dict_map;
+pub use to_dict_map::to_dict_map;
+pub mod to_grid_map;
+pub use to_grid_map::to_grid_map;
+
+pub mod map_to_string;
+pub use map_to_string::map_to_string;
+
+use dmmtools::dmm;
+use dmmtools::dmm::Coord3;
+
+/// A representation of a single tile on a map that may or may not be mapped to an existing key.
+#[derive(Clone, Debug, Default)]
+pub struct Tile {
+ /// A key temporarily assigned to the tile until an appropriate new/existing
+ /// key can be assigned to it, or if it is already being used by a different
+ /// prefab list in the file.
+ pub key_suggestion: dmm::Key,
+ /// The prefabs on the tile.
+ pub prefabs: Vec,
+}
+
+impl Tile {
+ /// Return the first /area that exists in the prefab.
+ pub fn get_area(&self) -> Option<&dmm::Prefab> {
+ self.prefabs
+ .iter()
+ .find(|prefab| prefab.path.starts_with("/area/"))
+ }
+
+ /// Remove and return the first /area that exists in the prefab.
+ pub fn remove_area(&mut self) -> Option {
+ let area = self.get_area().cloned();
+ if area.is_some() {
+ self.prefabs
+ .retain(|prefab| !prefab.path.starts_with("/area/"))
+ }
+ area
+ }
+
+ /// Return the first /turf that exists in the prefab.
+ pub fn get_turf(&self) -> Option<&dmm::Prefab> {
+ self.prefabs
+ .iter()
+ .find(|prefab| prefab.path.starts_with("/turf/"))
+ }
+
+ /// Remove and return the first /turf that exists in the prefab.
+ pub fn remove_turf(&mut self) -> Option {
+ let turf = self.get_turf().cloned();
+ if turf.is_some() {
+ self.prefabs
+ .retain(|prefab| !prefab.path.starts_with("/turf/"))
+ }
+ turf
+ }
+}
+
+/// Thin abstraction over a flat vec, to provide a simple hashmap-like interface,
+/// and to translate between 3D dmm coords (start at 1), and 1D flat vec coords (start at 0).
+/// The translation is so that it looks better in logs/errors/etc,
+/// where shown coords would correspond to coords seen in game or in strongdmm.
+#[derive(Clone, Debug)]
+pub struct TileGrid {
+ pub size: Coord3,
+ pub grid: Vec,
+}
+
+impl TileGrid {
+ pub fn new(size_x: i32, size_y: i32, size_z: i32) -> TileGrid {
+ Self {
+ size: Coord3::new(size_x, size_y, size_z),
+ grid: vec![Tile::default(); (size_x * size_y * size_z) as usize],
+ }
+ }
+
+ pub fn len(&self) -> usize {
+ self.grid.len()
+ }
+
+ fn coord_to_index(&self, coord: &Coord3) -> usize {
+ let coord = Coord3::new(coord.x - 1, coord.y - 1, coord.z - 1);
+ ((coord.x) + (coord.y * self.size.x) + (coord.z * self.size.x * self.size.y)) as usize
+ }
+
+ fn index_to_coord(&self, index: usize) -> Coord3 {
+ let index = index as i32;
+ Coord3::new(
+ (index % self.size.x) + 1,
+ ((index / self.size.x) % self.size.y) + 1,
+ (index / (self.size.x * self.size.y)) + 1,
+ )
+ }
+
+ pub fn get_mut(&mut self, coord: &Coord3) -> Option<&mut Tile> {
+ let index = self.coord_to_index(coord);
+ self.grid.get_mut(index)
+ }
+
+ pub fn get(&self, coord: &Coord3) -> Option<&Tile> {
+ self.grid.get(self.coord_to_index(coord))
+ }
+
+ pub fn insert(&mut self, coord: &Coord3, tile: Tile) {
+ *self.get_mut(coord).unwrap() = tile;
+ }
+
+ pub fn iter(&self) -> impl Iterator {
+ self.grid
+ .iter()
+ .enumerate()
+ .map(|(i, t)| (self.index_to_coord(i), t))
+ }
+
+ pub fn keys(&self) -> impl Iterator + '_ {
+ self.grid
+ .iter()
+ .enumerate()
+ .map(|(i, _t)| self.index_to_coord(i))
+ }
+
+ pub fn values(&self) -> impl Iterator {
+ self.grid.iter()
+ }
+
+ pub fn values_mut(&mut self) -> impl Iterator {
+ self.grid.iter_mut()
+ }
+}
+
+/// This is analogous to `dmmtools::dmm::Map`, but instead of being structured like dmm maps are,
+/// where they have a dictionary of keys-to-prefabs and a separate grid of keys,
+/// this is only a direct coord-to-prefab grid.
+/// It is not memory efficient, but it allows for much greater flexibility of manipulation.
+#[derive(Clone, Debug)]
+pub struct GridMap {
+ ///
+ pub size: dmm::Coord3,
+ ///
+ pub grid: crate::mapmanip::core::TileGrid,
+}
+
+impl GridMap {
+ pub fn from_file(path: &std::path::Path) -> Option {
+ Some(to_grid_map(&dmm::Map::from_file(&path).ok()?))
+ }
+}
diff --git a/rust/src/mapmanip/core/to_dict_map.rs b/rust/src/mapmanip/core/to_dict_map.rs
new file mode 100644
index 000000000000..6920e6ab6db6
--- /dev/null
+++ b/rust/src/mapmanip/core/to_dict_map.rs
@@ -0,0 +1,71 @@
+use crate::mapmanip::GridMap;
+use dmmtools::dmm::{self, Coord3};
+use eyre::ContextCompat;
+use fxhash::FxHashMap;
+use std::collections::BTreeSet;
+
+fn coord3_to_index(coord: dmm::Coord3, size: dmm::Coord3) -> (usize, usize, usize) {
+ (
+ coord.z as usize - 1,
+ (size.y - coord.y) as usize,
+ coord.x as usize - 1,
+ )
+}
+
+fn int_to_key(i: u16) -> dmm::Key {
+ // Unsafe is used here to convert basic int to key type, as `dmm::Key` interior var is private.
+ // This is "safe", as key will always be `u16` to maintain compability with the `dmm` format.
+ // Could be at some point be made safe when the key type is made public in the `dmm_tools` crate.
+ unsafe { std::mem::transmute::(i) }
+}
+
+pub fn to_dict_map(grid_map: &GridMap) -> eyre::Result {
+ let mut dict_map = dmm::Map::new(
+ grid_map.size.x as usize,
+ grid_map.size.y as usize,
+ grid_map.size.z as usize,
+ "".to_string(),
+ "".to_string(),
+ );
+ dict_map.dictionary.clear();
+
+ let mut used_dict_keys = BTreeSet::::new();
+
+ let mut dictionary_reverse = FxHashMap::, dmm::Key>::default();
+
+ for tile in grid_map.grid.values() {
+ if !dictionary_reverse.contains_key(&tile.prefabs) {
+ if used_dict_keys.contains(&tile.key_suggestion) {
+ let next_free_key = (0..65534)
+ .map(int_to_key)
+ .filter(|k| !used_dict_keys.contains(k))
+ .next()
+ .wrap_err(format!("ran out of free keys"))?;
+ dictionary_reverse.insert(tile.prefabs.clone(), next_free_key);
+ used_dict_keys.insert(next_free_key);
+ } else {
+ dictionary_reverse.insert(tile.prefabs.clone(), tile.key_suggestion.clone());
+ used_dict_keys.insert(tile.key_suggestion.clone());
+ }
+ }
+ }
+
+ for x in 1..(grid_map.size.x + 1) {
+ for y in 1..(grid_map.size.y + 1) {
+ for z in 1..(grid_map.size.z + 1) {
+ let coord = Coord3::new(x, y, z);
+ if let Some(tile) = grid_map.grid.get(&coord) {
+ let key = dictionary_reverse.get(&tile.prefabs).unwrap().clone();
+ dict_map.dictionary.insert(key, tile.prefabs.clone());
+ dict_map.grid[coord3_to_index(coord, grid_map.size)] = key;
+ } else {
+ eyre::bail!("to_dict_map fail; grid map has no coord: {coord:?}");
+ }
+ }
+ }
+ }
+
+ dict_map.adjust_key_length();
+
+ Ok(dict_map)
+}
diff --git a/rust/src/mapmanip/core/to_grid_map.rs b/rust/src/mapmanip/core/to_grid_map.rs
new file mode 100644
index 000000000000..ec8c703f8d82
--- /dev/null
+++ b/rust/src/mapmanip/core/to_grid_map.rs
@@ -0,0 +1,37 @@
+use super::Tile;
+use crate::mapmanip::core::GridMap;
+use dmmtools::dmm::{self, Coord3};
+use std::ops::Index;
+
+fn tuple_to_size(xyz: (usize, usize, usize)) -> Coord3 {
+ Coord3::new(xyz.0 as i32, xyz.1 as i32, xyz.2 as i32)
+}
+
+pub fn to_grid_map(dict_map: &dmm::Map) -> GridMap {
+ let mut grid_map = GridMap {
+ size: tuple_to_size(dict_map.dim_xyz()),
+ grid: crate::mapmanip::core::TileGrid::new(
+ dict_map.dim_xyz().0 as i32,
+ dict_map.dim_xyz().1 as i32,
+ dict_map.dim_xyz().2 as i32,
+ ),
+ };
+
+ for x in 1..grid_map.size.x + 1 {
+ for y in 1..grid_map.size.y + 1 {
+ for z in 1..grid_map.size.z + 1 {
+ let coord = dmm::Coord3::new(x, y, z);
+ let key = dict_map.index(coord);
+ let prefabs = dict_map.dictionary[key].clone();
+ let tile = Tile {
+ key_suggestion: *key,
+ prefabs,
+ };
+ let coord = dmm::Coord3::new(coord.x, coord.y, coord.z);
+ grid_map.grid.insert(&coord, tile);
+ }
+ }
+ }
+
+ grid_map
+}
diff --git a/rust/src/mapmanip/mod.rs b/rust/src/mapmanip/mod.rs
new file mode 100644
index 000000000000..70bc79b8cf34
--- /dev/null
+++ b/rust/src/mapmanip/mod.rs
@@ -0,0 +1,282 @@
+use core::map_to_string;
+use core::to_grid_map;
+use core::GridMap;
+
+use byondapi::byond_string;
+use byondapi::value::ByondValue;
+use eyre::Context;
+use eyre::ContextCompat;
+use itertools::Itertools;
+use rand::prelude::IteratorRandom;
+use serde::{Deserialize, Serialize};
+use tools::extract_submap;
+use tools::insert_submap;
+
+use crate::logging::dm_call_stack_trace;
+use crate::logging::setup_panic_handler;
+
+mod core;
+mod tools;
+
+#[cfg(test)]
+mod test;
+
+///
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(tag = "type")]
+pub enum MapManipulation {
+ SubmapExtractInsert {
+ submap_size_x: i64,
+ submap_size_y: i64,
+ submap_size_z: i64,
+ submaps_dmm: String,
+ marker_extract: String,
+ marker_insert: String,
+ submaps_can_repeat: bool,
+ },
+}
+
+pub fn mapmanip_config_parse(config_path: &std::path::Path) -> eyre::Result> {
+ // read
+ let config = std::fs::read_to_string(config_path)
+ .wrap_err(format!("mapmanip config read err: {config_path:?}"))?;
+
+ // strip comments
+ // as the jsonc format is "json with comments"
+ // but serde_json lib can only handle actual json
+ let re = regex::Regex::new(r"\/\/.*")?;
+ let config = re.replace_all(&config, "");
+
+ // parse
+ let config = serde_json::from_str::>(&config)
+ .wrap_err(format!("mapmanip config json parse err: {config_path:?}"))?;
+
+ Ok(config)
+}
+
+pub fn mapmanip(
+ map_dir_path: &std::path::Path,
+ map: dmmtools::dmm::Map,
+ config: &Vec,
+) -> eyre::Result {
+ // convert to gridmap
+ let mut map = to_grid_map(&map);
+
+ // go through all the manipulations in `.jsonc` config for this `.dmm`
+ for (n, manipulation) in config.iter().enumerate() {
+ // readable index for errors
+ let n = n + 1;
+ let config_len = config.len();
+
+ match manipulation {
+ MapManipulation::SubmapExtractInsert {
+ submap_size_x,
+ submap_size_y,
+ submap_size_z,
+ submaps_dmm,
+ marker_extract,
+ marker_insert,
+ submaps_can_repeat,
+ } => mapmanip_submap_extract_insert(
+ map_dir_path,
+ &mut map,
+ *submap_size_x,
+ *submap_size_y,
+ *submap_size_z,
+ submaps_dmm,
+ marker_extract,
+ marker_insert,
+ *submaps_can_repeat,
+ )
+ .wrap_err(format!(
+ "submap extract insert fail;
+ submaps path: {submaps_dmm:?};
+ markers: {marker_extract}, {marker_insert};"
+ )),
+ }
+ .wrap_err(format!("mapmanip fail; manip n is: {n}/{config_len}"))?;
+ }
+
+ Ok(core::to_dict_map(&map).wrap_err("failed on `to_dict_map`")?)
+}
+
+fn mapmanip_submap_extract_insert(
+ map_dir_path: &std::path::Path,
+ map: &mut GridMap,
+ submap_size_x: i64,
+ submap_size_y: i64,
+ submap_size_z: i64,
+ submaps_dmm: &String,
+ marker_extract: &String,
+ marker_insert: &String,
+ submaps_can_repeat: bool,
+) -> eyre::Result<()> {
+ let submap_size = dmmtools::dmm::Coord3::new(
+ submap_size_x.try_into().wrap_err("invalid submap_size_x")?,
+ submap_size_y.try_into().wrap_err("invalid submap_size_y")?,
+ submap_size_z.try_into().wrap_err("invalid submap_size_z")?,
+ );
+
+ // get the submaps map
+ let submaps_dmm: std::path::PathBuf = submaps_dmm.try_into().wrap_err("invalid path")?;
+ let submaps_dmm = map_dir_path.join(submaps_dmm);
+ let submaps_map = GridMap::from_file(&submaps_dmm)
+ .wrap_err(format!("can't read and parse submap dmm: {submaps_dmm:?}"))?;
+
+ // find all the submap extract markers
+ let mut marker_extract_coords = vec![];
+ for (coord, tile) in submaps_map.grid.iter() {
+ if tile.prefabs.iter().any(|p| p.path == *marker_extract) {
+ marker_extract_coords.push(coord);
+ }
+ }
+
+ // find all the insert markers
+ let mut marker_insert_coords = vec![];
+ for (coord, tile) in map.grid.iter() {
+ if tile.prefabs.iter().any(|p| p.path == *marker_insert) {
+ marker_insert_coords.push(coord);
+ }
+ }
+
+ // do all the extracts-inserts
+ for insert_coord in marker_insert_coords {
+ // pick a submap
+ let (extract_coord_index, extract_coord) = marker_extract_coords
+ .iter()
+ .cloned()
+ .enumerate()
+ .choose(&mut rand::thread_rng())
+ .wrap_err(format!(
+ "can't pick a submap to extract; no more extract markers in the submaps dmm; marker type: {marker_extract}"
+ ))?;
+
+ // if submaps should not be repeating, remove this one from the list
+ if !submaps_can_repeat {
+ marker_extract_coords.remove(extract_coord_index);
+ }
+
+ // extract that submap from the submap dmm
+ let extracted = extract_submap(&submaps_map, extract_coord, submap_size)
+ .wrap_err(format!("submap extraction failed; from {extract_coord}"))?;
+
+ // and insert the submap into the manipulated map
+ insert_submap(&extracted, insert_coord, map)
+ .wrap_err(format!("submap insertion failed; at {insert_coord}"))?;
+ }
+
+ Ok(())
+}
+
+///
+#[byondapi::bind]
+fn mapmanip_read_dmm_file(path: ByondValue) {
+ internal_mapmanip_read_dmm_file(path)
+}
+
+pub(crate) fn internal_mapmanip_read_dmm_file(path: ByondValue) -> eyre::Result {
+ setup_panic_handler();
+
+ let path: String = path
+ .get_string()
+ .wrap_err(format!("path arg is not a string: {:?}", path))?;
+ let path: std::path::PathBuf = path
+ .clone()
+ .try_into()
+ .wrap_err(format!("path arg is not a valid file path: {}", path))?;
+
+ // just return null if path is bad for whatever reason
+ if !path.is_file() || !path.exists() {
+ return Ok(ByondValue::null());
+ }
+
+ // read file and parse with spacemandmm
+ let mut dmm = dmmtools::dmm::Map::from_file(&path).wrap_err(format!(
+ "spacemandmm parsing error; dmm file path: {path:?}; see error from spacemandmm below for more information"
+ ))?;
+
+ // do mapmanip if defined for this dmm
+ let path_mapmanip_config = {
+ let mut p = path.clone();
+ p.set_extension("jsonc");
+ p
+ };
+ if path_mapmanip_config.exists() {
+ // get path for dir of this dmm
+ let path_dir = path.parent().wrap_err("no parent")?;
+ // parse config
+ let config = crate::mapmanip::mapmanip_config_parse(&path_mapmanip_config).wrap_err(
+ format!("config parse fail; path: {:?}", path_mapmanip_config),
+ )?;
+ // do actual map manipulation
+ dmm = crate::mapmanip::mapmanip(path_dir, dmm, &config)
+ .wrap_err(format!("mapmanip fail; dmm file path: {path:?}"))?;
+ }
+
+ // convert the map back to a string
+ let dmm = crate::mapmanip::core::map_to_string(&dmm).wrap_err(format!(
+ "error in converting map back to string; dmm file path: {path:?}"
+ ))?;
+
+ // and return it
+ Ok(ByondValue::new_str(dmm)?)
+}
+
+///
+#[no_mangle]
+pub unsafe extern "C" fn read_dmm_file_ffi(
+ argc: byondapi::sys::u4c,
+ argv: *mut byondapi::value::ByondValue,
+) -> byondapi::value::ByondValue {
+ setup_panic_handler();
+ let args = unsafe { ::byondapi::parse_args(argc, argv) };
+ match crate::mapmanip::internal_mapmanip_read_dmm_file(
+ args.get(0).map(ByondValue::clone).unwrap_or_default(),
+ ) {
+ Ok(val) => val,
+ Err(info) => {
+ dm_call_stack_trace(format!("Rustlibs ERROR read_dmm_file_ffi() \n {info:#?}"));
+ ByondValue::null()
+ }
+ }
+}
+
+/// To be used by the `tools/rustlib_tools/mapmanip.ps1` script.
+/// Not to be called from the game server, so bad error-handling is fine.
+/// This should run map manipulations on every `.dmm` map that has a `.jsonc` config file,
+/// and write it to a `.mapmanipout.dmm` file in the same location.
+#[no_mangle]
+pub unsafe extern "C" fn all_mapmanip_configs_execute_ffi() {
+ let mapmanip_configs = walkdir::WalkDir::new("./_maps")
+ .into_iter()
+ .map(|d| d.unwrap().path().to_owned())
+ .filter(|p| p.extension().is_some())
+ .filter(|p| p.extension().unwrap() == "jsonc")
+ .collect_vec();
+ assert_ne!(mapmanip_configs.len(), 0);
+
+ for config_path in mapmanip_configs {
+ let dmm_path = {
+ let mut p = config_path.clone();
+ p.set_extension("dmm");
+ p
+ };
+
+ let path_dir: &std::path::Path = dmm_path.parent().unwrap();
+
+ let mut dmm = dmmtools::dmm::Map::from_file(&dmm_path).unwrap();
+
+ let config = crate::mapmanip::mapmanip_config_parse(&config_path).unwrap();
+
+ dmm = crate::mapmanip::mapmanip(path_dir, dmm, &config).unwrap();
+
+ let dmm = map_to_string(&dmm).unwrap();
+
+ let dmm_out_path = {
+ let mut p = dmm_path.clone();
+ p.set_extension("mapmanipout.dmm");
+ p
+ };
+ std::fs::write(dmm_out_path, dmm).unwrap();
+ }
+}
diff --git a/rust/src/mapmanip/test-in/_tiny_test_map.dmm b/rust/src/mapmanip/test-in/_tiny_test_map.dmm
new file mode 100644
index 000000000000..48ad3798f2d9
--- /dev/null
+++ b/rust/src/mapmanip/test-in/_tiny_test_map.dmm
@@ -0,0 +1,359 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/floor/marble,
+/area/space)
+"b" = (
+/obj/random/mre,
+/turf/simulated/floor/shuttle,
+/area/space)
+"f" = (
+/obj/random/energy,
+/turf/simulated/wall,
+/area/space)
+"j" = (
+/obj/random/energy_antag,
+/turf/simulated/wall,
+/area/space)
+"k" = (
+/obj/random/action_figure,
+/obj/random/action_figure,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"n" = (
+/obj/random/mre,
+/turf/simulated/floor/marble,
+/area/space)
+"o" = (
+/obj/random/mre,
+/turf/simulated/wall,
+/area/space)
+"p" = (
+/obj/random/handgun,
+/turf/simulated/floor/marble,
+/area/space)
+"q" = (
+/obj/random/action_figure,
+/turf/simulated/floor/shuttle,
+/area/space)
+"r" = (
+/obj/random/action_figure,
+/obj/aiming_overlay,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"s" = (
+/obj/random/action_figure,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"u" = (
+/obj/random/handgun,
+/turf/simulated/wall,
+/area/space)
+"y" = (
+/obj/random/glowstick,
+/turf/simulated/floor/marble,
+/area/space)
+"z" = (
+/obj/random/firstaid,
+/turf/simulated/floor/marble,
+/area/space)
+"B" = (
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"E" = (
+/turf/simulated/wall,
+/area/space)
+"F" = (
+/turf/simulated/floor/shuttle,
+/area/space)
+"G" = (
+/obj/random/finances,
+/turf/simulated/wall,
+/area/space)
+"H" = (
+/obj/random/gift,
+/turf/simulated/floor/marble,
+/area/space)
+"J" = (
+/obj/random/chameleon,
+/turf/simulated/floor/shuttle,
+/area/space)
+"Q" = (
+/obj/aiming_overlay,
+/turf/simulated/floor/marble,
+/area/space)
+"S" = (
+/obj/aiming_overlay,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"U" = (
+/obj/random/mre,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"W" = (
+/obj/random/chameleon,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"Y" = (
+/obj/random/action_figure,
+/turf/simulated/floor/marble,
+/area/space)
+"Z" = (
+/obj/random/chameleon,
+/turf/simulated/floor/marble,
+/area/space)
+
+(1,1,1) = {"
+E
+j
+j
+E
+E
+E
+E
+E
+E
+E
+E
+E
+G
+G
+a
+"}
+(2,1,1) = {"
+f
+B
+B
+B
+B
+B
+B
+B
+B
+B
+B
+B
+B
+B
+z
+"}
+(3,1,1) = {"
+f
+B
+B
+B
+B
+Q
+a
+a
+a
+a
+a
+a
+a
+B
+z
+"}
+(4,1,1) = {"
+E
+B
+B
+a
+a
+Q
+B
+B
+B
+B
+B
+B
+B
+B
+a
+"}
+(5,1,1) = {"
+E
+B
+s
+Y
+B
+S
+B
+B
+B
+B
+B
+s
+B
+F
+a
+"}
+(6,1,1) = {"
+E
+s
+s
+Y
+s
+S
+s
+B
+B
+B
+B
+s
+B
+F
+a
+"}
+(7,1,1) = {"
+E
+B
+B
+a
+B
+r
+s
+k
+k
+B
+B
+s
+B
+F
+a
+"}
+(8,1,1) = {"
+E
+W
+a
+a
+B
+S
+B
+B
+k
+k
+B
+s
+F
+F
+a
+"}
+(9,1,1) = {"
+o
+W
+n
+U
+U
+S
+U
+U
+U
+s
+k
+U
+b
+U
+n
+"}
+(10,1,1) = {"
+E
+W
+Z
+B
+B
+B
+B
+B
+B
+B
+k
+B
+F
+B
+a
+"}
+(11,1,1) = {"
+E
+B
+Z
+W
+B
+B
+B
+B
+B
+B
+q
+F
+F
+B
+a
+"}
+(12,1,1) = {"
+E
+B
+B
+W
+W
+B
+B
+F
+F
+F
+F
+s
+B
+B
+a
+"}
+(13,1,1) = {"
+u
+B
+B
+B
+B
+J
+J
+J
+B
+B
+B
+s
+B
+B
+H
+"}
+(14,1,1) = {"
+u
+B
+B
+B
+F
+F
+B
+W
+W
+B
+B
+B
+s
+B
+H
+"}
+(15,1,1) = {"
+a
+p
+p
+a
+a
+a
+a
+a
+a
+a
+a
+a
+y
+y
+a
+"}
diff --git a/rust/src/mapmanip/test-in/extracted.dmm b/rust/src/mapmanip/test-in/extracted.dmm
new file mode 100644
index 000000000000..4df41ac838ea
--- /dev/null
+++ b/rust/src/mapmanip/test-in/extracted.dmm
@@ -0,0 +1,115 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"b" = (
+/obj/random/action_figure,
+/obj/aiming_overlay,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"k" = (
+/obj/random/action_figure,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"p" = (
+/turf/simulated/floor/marble,
+/area/space)
+"u" = (
+/obj/aiming_overlay,
+/turf/simulated/floor/marble,
+/area/space)
+"G" = (
+/obj/random/mre,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"H" = (
+/obj/random/chameleon,
+/turf/simulated/floor/shuttle,
+/area/space)
+"L" = (
+/obj/random/action_figure,
+/obj/random/action_figure,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"N" = (
+/turf/simulated/floor/shuttle,
+/area/space)
+"R" = (
+/obj/random/chameleon,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"T" = (
+/obj/aiming_overlay,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+
+(1,1,1) = {"
+p
+u
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+T
+a
+a
+a
+"}
+(3,1,1) = {"
+k
+T
+k
+a
+a
+"}
+(4,1,1) = {"
+a
+b
+k
+L
+L
+"}
+(5,1,1) = {"
+a
+T
+a
+a
+L
+"}
+(6,1,1) = {"
+G
+T
+G
+G
+G
+"}
+(7,1,1) = {"
+a
+a
+a
+a
+a
+"}
+(8,1,1) = {"
+a
+a
+a
+a
+a
+"}
+(9,1,1) = {"
+R
+a
+a
+N
+N
+"}
+(10,1,1) = {"
+a
+H
+H
+H
+a
+"}
diff --git a/rust/src/mapmanip/test-in/inserted.dmm b/rust/src/mapmanip/test-in/inserted.dmm
new file mode 100644
index 000000000000..dad09b97a864
--- /dev/null
+++ b/rust/src/mapmanip/test-in/inserted.dmm
@@ -0,0 +1,355 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/floor/marble,
+/area/space)
+"b" = (
+/obj/random/mre,
+/turf/simulated/floor/shuttle,
+/area/space)
+"f" = (
+/obj/random/energy,
+/turf/simulated/wall,
+/area/space)
+"j" = (
+/obj/random/energy_antag,
+/turf/simulated/wall,
+/area/space)
+"k" = (
+/obj/random/action_figure,
+/obj/random/action_figure,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"n" = (
+/obj/random/mre,
+/turf/simulated/floor/marble,
+/area/space)
+"o" = (
+/obj/random/mre,
+/turf/simulated/wall,
+/area/space)
+"p" = (
+/obj/random/handgun,
+/turf/simulated/floor/marble,
+/area/space)
+"r" = (
+/obj/random/action_figure,
+/obj/aiming_overlay,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"s" = (
+/obj/random/action_figure,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"u" = (
+/obj/random/handgun,
+/turf/simulated/wall,
+/area/space)
+"y" = (
+/obj/random/glowstick,
+/turf/simulated/floor/marble,
+/area/space)
+"z" = (
+/obj/random/firstaid,
+/turf/simulated/floor/marble,
+/area/space)
+"B" = (
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"E" = (
+/turf/simulated/wall,
+/area/space)
+"F" = (
+/turf/simulated/floor/shuttle,
+/area/space)
+"G" = (
+/obj/random/finances,
+/turf/simulated/wall,
+/area/space)
+"H" = (
+/obj/random/gift,
+/turf/simulated/floor/marble,
+/area/space)
+"J" = (
+/obj/random/chameleon,
+/turf/simulated/floor/shuttle,
+/area/space)
+"Q" = (
+/obj/aiming_overlay,
+/turf/simulated/floor/marble,
+/area/space)
+"S" = (
+/obj/aiming_overlay,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"U" = (
+/obj/random/mre,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"W" = (
+/obj/random/chameleon,
+/turf/simulated/floor/lino/diamond,
+/area/space)
+"Y" = (
+/obj/random/action_figure,
+/turf/simulated/floor/marble,
+/area/space)
+"Z" = (
+/obj/random/chameleon,
+/turf/simulated/floor/marble,
+/area/space)
+
+(1,1,1) = {"
+E
+j
+j
+E
+E
+E
+E
+E
+E
+E
+E
+E
+G
+G
+a
+"}
+(2,1,1) = {"
+f
+B
+B
+B
+B
+B
+B
+B
+B
+B
+B
+B
+B
+B
+z
+"}
+(3,1,1) = {"
+f
+B
+B
+B
+B
+Q
+a
+a
+a
+a
+a
+a
+a
+B
+z
+"}
+(4,1,1) = {"
+E
+B
+B
+a
+a
+Q
+B
+B
+B
+B
+B
+B
+B
+B
+a
+"}
+(5,1,1) = {"
+E
+B
+s
+Y
+B
+S
+B
+B
+B
+B
+B
+s
+B
+F
+a
+"}
+(6,1,1) = {"
+E
+s
+s
+Y
+s
+S
+s
+a
+Q
+B
+B
+B
+B
+F
+a
+"}
+(7,1,1) = {"
+E
+B
+B
+a
+B
+r
+s
+B
+S
+B
+B
+B
+B
+F
+a
+"}
+(8,1,1) = {"
+E
+W
+a
+a
+B
+S
+B
+s
+S
+s
+B
+B
+F
+F
+a
+"}
+(9,1,1) = {"
+o
+W
+n
+U
+U
+S
+U
+B
+r
+s
+k
+k
+b
+U
+n
+"}
+(10,1,1) = {"
+E
+W
+Z
+B
+B
+B
+B
+B
+S
+B
+B
+k
+F
+B
+a
+"}
+(11,1,1) = {"
+E
+B
+Z
+W
+B
+B
+B
+U
+S
+U
+U
+U
+F
+B
+a
+"}
+(12,1,1) = {"
+E
+B
+B
+W
+W
+B
+B
+B
+B
+B
+B
+B
+B
+B
+a
+"}
+(13,1,1) = {"
+u
+B
+B
+B
+B
+J
+J
+B
+B
+B
+B
+B
+B
+B
+H
+"}
+(14,1,1) = {"
+u
+B
+B
+B
+F
+F
+B
+W
+B
+B
+F
+F
+s
+B
+H
+"}
+(15,1,1) = {"
+a
+p
+p
+a
+a
+a
+a
+B
+J
+J
+J
+B
+y
+y
+a
+"}
diff --git a/rust/src/mapmanip/test.rs b/rust/src/mapmanip/test.rs
new file mode 100644
index 000000000000..5f1076d913ab
--- /dev/null
+++ b/rust/src/mapmanip/test.rs
@@ -0,0 +1,163 @@
+use dmmtools::dmm::{self, Coord3};
+use itertools::Itertools;
+
+use super::all_mapmanip_configs_execute_ffi;
+
+fn print_diff(left: &str, right: &str) {
+ for (i, diff) in diff::lines(&left, &right).iter().enumerate() {
+ match diff {
+ diff::Result::Left(l) => println!("{} diff - : {}", i, l),
+ diff::Result::Both(l, r) => {
+ assert_eq!(l, r);
+ }
+ diff::Result::Right(r) => println!("{} diff + : {}", i, r),
+ }
+ }
+}
+
+fn all_test_dmm() -> Vec {
+ std::fs::read_dir("src/mapmanip/test-in")
+ .unwrap()
+ .map(|r| r.unwrap().path())
+ .filter(|p| p.extension().unwrap() == "dmm")
+ .sorted()
+ .collect_vec()
+}
+
+#[test]
+fn to_grid_and_back() {
+ for path in all_test_dmm() {
+ println!("path: {}", path.display());
+
+ let dict_map_original = dmmtools::dmm::Map::from_file(&path).unwrap();
+ let grid_map = crate::mapmanip::core::to_grid_map(&dict_map_original);
+ let dict_map_again = crate::mapmanip::core::to_dict_map(&grid_map).unwrap();
+ let map_str_original = crate::mapmanip::core::map_to_string(&dict_map_original).unwrap();
+ let map_str_from_grid = crate::mapmanip::core::map_to_string(&dict_map_again).unwrap();
+
+ dict_map_again
+ .to_file(&std::path::Path::new("src/mapmanip/test-out").join(path.file_name().unwrap()))
+ .unwrap();
+
+ print_diff(&map_str_original, &map_str_from_grid);
+
+ if map_str_original != map_str_from_grid {
+ assert!(false);
+ }
+ }
+}
+
+#[test]
+fn extract() {
+ let path_src = std::path::Path::new("src/mapmanip/test-in/_tiny_test_map.dmm");
+ let path_xtr = std::path::Path::new("src/mapmanip/test-in/extracted.dmm");
+ let path_xtr_out = std::path::Path::new("src/mapmanip/test-out/extracted_out.dmm");
+
+ let dict_map_src = dmmtools::dmm::Map::from_file(&path_src).unwrap();
+ let dict_map_xtr_expected = dmmtools::dmm::Map::from_file(&path_xtr).unwrap();
+
+ let grid_map_src = crate::mapmanip::core::to_grid_map(&dict_map_src);
+ let grid_map_xtr = crate::mapmanip::tools::extract_submap(
+ &grid_map_src,
+ Coord3::new(4, 7, 1),
+ Coord3::new(10, 5, 1),
+ )
+ .unwrap();
+ let grid_map_xtr_expected = crate::mapmanip::core::to_grid_map(&dict_map_xtr_expected);
+
+ let dict_map_xtr = crate::mapmanip::core::to_dict_map(&grid_map_xtr).unwrap();
+ dict_map_xtr.to_file(path_xtr_out).unwrap();
+
+ assert_eq!(
+ grid_map_xtr_expected.grid.keys().collect::>(),
+ grid_map_xtr.grid.keys().collect::>(),
+ );
+
+ for key in grid_map_xtr_expected.grid.keys() {
+ let tile_xtr_expected = grid_map_xtr_expected.grid.get(&key).unwrap();
+ let tile_xtr = grid_map_xtr.grid.get(&key).unwrap();
+ assert_eq!(tile_xtr_expected.prefabs, tile_xtr.prefabs);
+ }
+}
+
+#[test]
+fn insert() {
+ let path_xtr = std::path::Path::new("src/mapmanip/test-in/extracted.dmm");
+ let path_dst = std::path::Path::new("src/mapmanip/test-in/_tiny_test_map.dmm");
+ let path_dst_expected = std::path::Path::new("src/mapmanip/test-in/inserted.dmm");
+
+ let grid_map_dst_expected =
+ crate::mapmanip::core::GridMap::from_file(&path_dst_expected).unwrap();
+ let grid_map_xtr = crate::mapmanip::core::GridMap::from_file(&path_xtr).unwrap();
+ let mut grid_map_dst = crate::mapmanip::core::GridMap::from_file(&path_dst).unwrap();
+ crate::mapmanip::tools::insert_submap(&grid_map_xtr, Coord3::new(6, 4, 1), &mut grid_map_dst)
+ .unwrap();
+
+ assert_eq!(
+ grid_map_dst_expected.grid.keys().collect::>(),
+ grid_map_dst.grid.keys().collect::>(),
+ );
+
+ for key in grid_map_dst_expected.grid.keys() {
+ let tile_dst_expected = grid_map_dst_expected.grid.get(&key).unwrap();
+ let tile_dst = grid_map_dst.grid.get(&key).unwrap();
+ assert_eq!(tile_dst_expected.prefabs, tile_dst.prefabs);
+ }
+}
+
+#[test]
+fn keys_deduplicated() {
+ // make sure that if multiple tiles have the same key_suggestion
+ // they get assigned different keys
+
+ let path_src = std::path::Path::new("src/mapmanip/test-in/_tiny_test_map.dmm");
+ let dict_map_src = dmmtools::dmm::Map::from_file(&path_src).unwrap();
+ let grid_map_src = crate::mapmanip::core::to_grid_map(&dict_map_src);
+
+ let mut grid_map_out = crate::mapmanip::core::to_grid_map(&dict_map_src);
+ for tile in grid_map_out.grid.values_mut() {
+ tile.key_suggestion = dmm::Key::default();
+ }
+ let dict_map_out = crate::mapmanip::core::to_dict_map(&grid_map_out).unwrap();
+ let grid_map_out = crate::mapmanip::core::to_grid_map(&dict_map_out);
+
+ for key in grid_map_src.grid.keys() {
+ let tile_src = grid_map_src.grid.get(&key).unwrap();
+ let tile_out = grid_map_out.grid.get(&key).unwrap();
+ assert_eq!(tile_src.prefabs, tile_out.prefabs);
+ }
+
+ assert_eq!(dict_map_src.dictionary.len(), dict_map_out.dictionary.len())
+}
+
+#[test]
+fn mapmanip_configs_parse() {
+ let foo = vec![crate::mapmanip::MapManipulation::SubmapExtractInsert {
+ submap_size_x: 1,
+ submap_size_y: 2,
+ submap_size_z: 3,
+ submaps_dmm: "a".to_owned(),
+ marker_extract: "b".to_owned(),
+ marker_insert: "c".to_owned(),
+ submaps_can_repeat: true,
+ }];
+ dbg!(serde_json::to_string(&foo).unwrap());
+
+ let mapmanip_configs = walkdir::WalkDir::new("../../maps")
+ .into_iter()
+ .map(|d| d.unwrap().path().to_owned())
+ .filter(|p| p.extension().is_some())
+ .filter(|p| p.extension().unwrap() == "jsonc")
+ .collect_vec();
+ assert_ne!(mapmanip_configs.len(), 0);
+ for config in mapmanip_configs {
+ let _ = crate::mapmanip::mapmanip_config_parse(&config);
+ }
+}
+
+#[test]
+fn mapmanip_configs_execute() {
+ // this is only "unsafe" cause that function is `extern "C"`
+ // it does not do anything actually unsafe
+ unsafe { all_mapmanip_configs_execute_ffi() }
+}
diff --git a/rust/src/mapmanip/tools/extract_submap.rs b/rust/src/mapmanip/tools/extract_submap.rs
new file mode 100644
index 000000000000..30e7e9806384
--- /dev/null
+++ b/rust/src/mapmanip/tools/extract_submap.rs
@@ -0,0 +1,37 @@
+use crate::mapmanip::core::GridMap;
+use dmmtools::dmm;
+use dmmtools::dmm::Coord3;
+use eyre::ContextCompat;
+
+/// Returns part of map of `xtr_size` and at `xtr_coord` from `src_map`.
+pub fn extract_submap(
+ src_map: &GridMap,
+ xtr_coord: dmm::Coord3,
+ xtr_size: dmm::Coord3,
+) -> eyre::Result {
+ let mut dst_map = GridMap {
+ size: xtr_size,
+ grid: crate::mapmanip::core::TileGrid::new(xtr_size.x, xtr_size.y, xtr_size.z),
+ };
+
+ for x in 1..(xtr_size.x + 1) {
+ for y in 1..(xtr_size.y + 1) {
+ for z in 1..(xtr_size.z + 1) {
+ let src_x = xtr_coord.x + x - 1;
+ let src_y = xtr_coord.y + y - 1;
+ let src_z = xtr_coord.z + z - 1;
+
+ let tile = src_map
+ .grid
+ .get(&Coord3::new(src_x, src_y, src_z))
+ .wrap_err(format!(
+ "cannot extract submap; coords out of bounds; x: {src_x}; y: {src_y}; z: {src_z}"
+ ))?;
+
+ dst_map.grid.insert(&Coord3::new(x, y, z), tile.clone());
+ }
+ }
+ }
+
+ Ok(dst_map)
+}
diff --git a/rust/src/mapmanip/tools/insert_submap.rs b/rust/src/mapmanip/tools/insert_submap.rs
new file mode 100644
index 000000000000..e840f9920f33
--- /dev/null
+++ b/rust/src/mapmanip/tools/insert_submap.rs
@@ -0,0 +1,75 @@
+use crate::mapmanip::GridMap;
+use dmmtools::dmm;
+use dmmtools::dmm::Coord3;
+use eyre::ContextCompat;
+
+/// Takes `src_map` and puts it at `coord` in `dst_map`.
+/// Noop area and turf have special handling: `/area/template_noop` and `/turf/template_noop`.
+/// If a `src` tile has noop area, then it uses the mapped in `dst` area instead of replacing it.
+/// If a `src` tile has noop turf, then it uses the mapped in `dst` turf instead of replacing it,
+/// and additionally also merges `src` objects and mobs with the `dst` mapped in ones.
+pub fn insert_submap(
+ src_map: &GridMap,
+ coord: dmm::Coord3,
+ dst_map: &mut GridMap,
+) -> eyre::Result<()> {
+ for x in 1..(src_map.size.x + 1) {
+ for y in 1..(src_map.size.y + 1) {
+ for z in 1..(src_map.size.z + 1) {
+ let coord_src = Coord3::new(x, y, z);
+ let coord_dst = Coord3::new(coord.x + x - 1, coord.y + y - 1, coord.z + z - 1);
+
+ // get src tile
+ let mut tile_src = src_map
+ .grid
+ .get(&coord_src)
+ .wrap_err(format!(
+ "src submap coord out of bounds: {coord_src}; {}; {};",
+ src_map.size,
+ src_map.grid.len(),
+ ))?
+ .clone();
+
+ // remove area and turf from src tile
+ let tile_src_area = tile_src.remove_area().wrap_err("submap tile has no area")?;
+ let tile_src_turf = tile_src.remove_turf().wrap_err("submap tile has no turf")?;
+
+ let tile_src_area_is_noop = { tile_src_area.path == "/area/template_noop" };
+ let tile_src_turf_is_noop = { tile_src_turf.path == "/turf/template_noop" };
+
+ // get dst tile
+ let tile_dst = dst_map.grid.get_mut(&coord_dst).wrap_err(format!(
+ "cannot insert submap tile; coord out of bounds; x: {x}; y: {y};"
+ ))?;
+
+ // remove area and turf from dst tile
+ let tile_dst_area = tile_dst.remove_area().wrap_err("map tile has no area")?;
+ let tile_dst_turf = tile_dst.remove_turf().wrap_err("map tile has no turf")?;
+
+ // get new area
+ let new_area = if tile_src_area_is_noop {
+ tile_dst_area
+ } else {
+ tile_src_area
+ };
+
+ // get new turf, AND, append/replace other atoms into dst tile
+ let new_turf = if tile_src_turf_is_noop {
+ tile_dst.prefabs.append(&mut tile_src.prefabs);
+ tile_dst_turf
+ } else {
+ tile_dst.prefabs = tile_src.prefabs;
+ tile_src_turf
+ };
+
+ // push selected new turf and area to dst tile
+ // do note that in dmm file format
+ // turf and area have to be the two last elements in a prefab
+ tile_dst.prefabs.push(new_turf);
+ tile_dst.prefabs.push(new_area);
+ }
+ }
+ }
+
+ Ok(())
+}
diff --git a/rust/src/mapmanip/tools/mod.rs b/rust/src/mapmanip/tools/mod.rs
new file mode 100644
index 000000000000..c3688d31986b
--- /dev/null
+++ b/rust/src/mapmanip/tools/mod.rs
@@ -0,0 +1,5 @@
+mod extract_submap;
+pub use extract_submap::extract_submap;
+
+mod insert_submap;
+pub use insert_submap::insert_submap;
diff --git a/milla/src/api.rs b/rust/src/milla/api.rs
similarity index 96%
rename from milla/src/api.rs
rename to rust/src/milla/api.rs
index 53e63d4a17a9..b5393a58859a 100644
--- a/milla/src/api.rs
+++ b/rust/src/milla/api.rs
@@ -1,9 +1,9 @@
-use crate::constants::*;
-use crate::conversion;
use crate::logging;
-use crate::model::*;
-use crate::statics::*;
-use crate::tick;
+use crate::milla::constants::*;
+use crate::milla::conversion;
+use crate::milla::model::*;
+use crate::milla::statics::*;
+use crate::milla::tick;
use byondapi::global_call::call_global;
use byondapi::map::byond_xyz;
use byondapi::prelude::*;
@@ -14,7 +14,7 @@ use std::time::Instant;
/// BYOND API for ensuring the buffers are usable.
#[byondapi::bind]
-fn initialize(byond_z: ByondValue) {
+fn milla_initialize(byond_z: ByondValue) {
logging::setup_panic_handler();
let z = f32::try_from(byond_z)? as i32 - 1;
internal_initialize(z)?;
@@ -36,7 +36,7 @@ pub(crate) fn internal_initialize(z: i32) -> Result<(), eyre::Error> {
/// BYOND API for defining an environment that a tile can be exposed to.
#[byondapi::bind]
-fn create_environment(
+fn milla_create_environment(
oxygen: ByondValue,
carbon_dioxide: ByondValue,
nitrogen: ByondValue,
@@ -96,7 +96,7 @@ pub(crate) fn internal_create_environment(
/// BYOND API for setting the atmos details of a tile.
#[byondapi::bind]
-fn set_tile(
+fn milla_set_tile(
turf: ByondValue,
airtight_north: ByondValue,
airtight_east: ByondValue,
@@ -143,7 +143,7 @@ fn set_tile(
/// BYOND API for setting the directions a tile is airtight in.
/// Like set_tile, just with a smaller set of fields.
#[byondapi::bind]
-fn set_tile_airtight(
+fn milla_set_tile_airtight(
turf: ByondValue,
airtight_north: ByondValue,
airtight_east: ByondValue,
@@ -239,7 +239,7 @@ pub(crate) fn internal_set_tile(
};
}
}
- 3 => tile.mode = AtmosMode::NoDecay,
+ 3 => tile.mode = AtmosMode::NoDecay,
_ => return Err(eyre!("Invalid atmos_mode: {}", value)),
}
}
@@ -278,7 +278,7 @@ pub(crate) fn internal_set_tile(
/// BYOND API for fetching the atmos details of a tile.
#[byondapi::bind]
-fn get_tile(turf: ByondValue, list: ByondValue) {
+fn milla_get_tile(turf: ByondValue, list: ByondValue) {
logging::setup_panic_handler();
let (x, y, z) = byond_xyz(&turf)?.coordinates();
let tile = internal_get_tile(x as i32 - 1, y as i32 - 1, z as i32 - 1)?;
@@ -308,7 +308,7 @@ pub(crate) fn internal_get_tile(x: i32, y: i32, z: i32) -> Result {
/// * Turfs that just passed the threshold for showing plasma or sleeping gas.
/// * Turfs with strong airflow out.
#[byondapi::bind]
-fn get_interesting_tiles() {
+fn milla_get_interesting_tiles() {
logging::setup_panic_handler();
let interesting_tiles = INTERESTING_TILES.lock().unwrap();
let byond_interesting_tiles = interesting_tiles
@@ -320,7 +320,7 @@ fn get_interesting_tiles() {
/// BYOND API for getting a single random interesting tile.
#[byondapi::bind]
-fn get_random_interesting_tile() {
+fn milla_get_random_interesting_tile() {
logging::setup_panic_handler();
let interesting_tiles = INTERESTING_TILES.lock().unwrap();
let length = interesting_tiles.len() as f32;
@@ -336,7 +336,7 @@ fn get_random_interesting_tile() {
/// BYOND API for capping the superconductivity of a tile.
#[byondapi::bind]
-fn reduce_superconductivity(
+fn milla_reduce_superconductivity(
turf: ByondValue,
north: ByondValue,
east: ByondValue,
@@ -404,7 +404,7 @@ pub(crate) fn internal_reduce_superconductivity(
/// BYOND API for resetting the superconductivity of a tile.
#[byondapi::bind]
-fn reset_superconductivity(turf: ByondValue) {
+fn milla_reset_superconductivity(turf: ByondValue) {
let (x, y, z) = byond_xyz(&turf)?.coordinates();
internal_reset_superconductivity(x as i32 - 1, y as i32 - 1, z as i32 - 1)?;
Ok(Default::default())
@@ -436,7 +436,7 @@ pub(crate) fn internal_reset_superconductivity(x: i32, y: i32, z: i32) -> Result
/// BYOND API for starting an atmos tick.
#[byondapi::bind]
-fn spawn_tick_thread() {
+fn milla_spawn_tick_thread() {
logging::setup_panic_handler();
thread::spawn(|| -> Result<(), eyre::Error> {
let now = Instant::now();
@@ -454,7 +454,7 @@ fn spawn_tick_thread() {
/// BYOND API for asking how long the prior tick took.
#[byondapi::bind]
-fn get_tick_time() {
+fn milla_get_tick_time() {
logging::setup_panic_handler();
Ok(ByondValue::from(
TICK_TIME.load(std::sync::atomic::Ordering::Relaxed) as f32,
diff --git a/milla/src/constants.rs b/rust/src/milla/constants.rs
similarity index 100%
rename from milla/src/constants.rs
rename to rust/src/milla/constants.rs
diff --git a/milla/src/conversion.rs b/rust/src/milla/conversion.rs
similarity index 100%
rename from milla/src/conversion.rs
rename to rust/src/milla/conversion.rs
diff --git a/milla/src/lib.rs b/rust/src/milla/mod.rs
similarity index 97%
rename from milla/src/lib.rs
rename to rust/src/milla/mod.rs
index 7c2e81ff85d9..d0b90b51541f 100644
--- a/milla/src/lib.rs
+++ b/rust/src/milla/mod.rs
@@ -6,11 +6,9 @@
//! MILLA takes the majority of atmos out of BYOND and puts it here, in Rust code.
//! It stores its own model of the air distribution, and BYOND will call in to view and make
//! adjustments, as well as to trigger atmos ticks.
-
mod api;
mod constants;
mod conversion;
-mod logging;
mod model;
mod simulate;
mod statics;
diff --git a/milla/src/model.rs b/rust/src/milla/model.rs
similarity index 99%
rename from milla/src/model.rs
rename to rust/src/milla/model.rs
index 8f559783e27f..13044a6d879c 100644
--- a/milla/src/model.rs
+++ b/rust/src/milla/model.rs
@@ -1,4 +1,4 @@
-use crate::constants::*;
+use crate::milla::constants::*;
use atomic_float::AtomicF32;
use bitflags::bitflags;
use byondapi::map::{byond_locatexyz, ByondXYZ};
diff --git a/milla/src/simulate.rs b/rust/src/milla/simulate.rs
similarity index 99%
rename from milla/src/simulate.rs
rename to rust/src/milla/simulate.rs
index b8c88dc80aa6..b663b77f7081 100644
--- a/milla/src/simulate.rs
+++ b/rust/src/milla/simulate.rs
@@ -1,5 +1,5 @@
-use crate::constants::*;
-use crate::model::*;
+use crate::milla::constants::*;
+use crate::milla::model::*;
use byondapi::map::ByondXYZ;
use eyre::eyre;
use scc::Bag;
@@ -437,7 +437,7 @@ pub(crate) fn apply_tile_mode(
my_inactive_tile.thermal_energy *= 1.0 - SPACE_COOLING_FACTOR;
}
}
- AtmosMode::NoDecay => {} // No special interactions
+ AtmosMode::NoDecay => {} // No special interactions
}
Ok(())
}
diff --git a/milla/src/statics.rs b/rust/src/milla/statics.rs
similarity index 95%
rename from milla/src/statics.rs
rename to rust/src/milla/statics.rs
index 76a0305abfec..4ecdd702c1b8 100644
--- a/milla/src/statics.rs
+++ b/rust/src/milla/statics.rs
@@ -1,4 +1,4 @@
-use crate::model::*;
+use crate::milla::model::*;
use std::sync::{atomic::AtomicUsize, Mutex, OnceLock};
/// The buffers that contain the atmos model.
diff --git a/milla/src/tick.rs b/rust/src/milla/tick.rs
similarity index 99%
rename from milla/src/tick.rs
rename to rust/src/milla/tick.rs
index b8a6991102f7..bc9afafff1f8 100644
--- a/milla/src/tick.rs
+++ b/rust/src/milla/tick.rs
@@ -1,7 +1,7 @@
-use crate::constants::*;
-use crate::model::*;
-use crate::simulate;
-use crate::statics::*;
+use crate::milla::constants::*;
+use crate::milla::model::*;
+use crate::milla::simulate;
+use crate::milla::statics::*;
use scc::Bag;
use std::sync::RwLock;
use std::thread;
diff --git a/rustlibs.dll b/rustlibs.dll
new file mode 100644
index 000000000000..1aca788e780f
Binary files /dev/null and b/rustlibs.dll differ
diff --git a/sound/AI/welcome_cerebron.ogg b/sound/AI/welcome_cerebron.ogg
new file mode 100644
index 000000000000..1e928c74cfdf
Binary files /dev/null and b/sound/AI/welcome_cerebron.ogg differ
diff --git a/sound/AI/welcome_cyberiad.ogg b/sound/AI/welcome_cyberiad.ogg
new file mode 100644
index 000000000000..a54bb7984c7c
Binary files /dev/null and b/sound/AI/welcome_cyberiad.ogg differ
diff --git a/sound/AI/welcome_diagoras.ogg b/sound/AI/welcome_diagoras.ogg
new file mode 100644
index 000000000000..b86c2dd2e44a
Binary files /dev/null and b/sound/AI/welcome_diagoras.ogg differ
diff --git a/sound/AI/welcome_farragus.ogg b/sound/AI/welcome_farragus.ogg
new file mode 100644
index 000000000000..916790a21a94
Binary files /dev/null and b/sound/AI/welcome_farragus.ogg differ
diff --git a/sound/AI/welcome_kerberos.ogg b/sound/AI/welcome_kerberos.ogg
new file mode 100644
index 000000000000..0eccf8edc424
Binary files /dev/null and b/sound/AI/welcome_kerberos.ogg differ
diff --git a/sound/items/cardboard_tube.ogg b/sound/items/cardboard_tube.ogg
new file mode 100644
index 000000000000..e95981029148
Binary files /dev/null and b/sound/items/cardboard_tube.ogg differ
diff --git a/sound/surgery/cautery1.ogg b/sound/surgery/cautery1.ogg
new file mode 100644
index 000000000000..ac15a5812666
Binary files /dev/null and b/sound/surgery/cautery1.ogg differ
diff --git a/sound/surgery/cautery2.ogg b/sound/surgery/cautery2.ogg
new file mode 100644
index 000000000000..334c98f6cde4
Binary files /dev/null and b/sound/surgery/cautery2.ogg differ
diff --git a/sound/surgery/hemostat1.ogg b/sound/surgery/hemostat1.ogg
new file mode 100644
index 000000000000..d68c82620d2a
Binary files /dev/null and b/sound/surgery/hemostat1.ogg differ
diff --git a/sound/surgery/organ1.ogg b/sound/surgery/organ1.ogg
new file mode 100644
index 000000000000..d6cdd6271fe3
Binary files /dev/null and b/sound/surgery/organ1.ogg differ
diff --git a/sound/surgery/organ2.ogg b/sound/surgery/organ2.ogg
new file mode 100644
index 000000000000..9199c7d1a2db
Binary files /dev/null and b/sound/surgery/organ2.ogg differ
diff --git a/sound/surgery/retractor1.ogg b/sound/surgery/retractor1.ogg
new file mode 100644
index 000000000000..de7c31199e3c
Binary files /dev/null and b/sound/surgery/retractor1.ogg differ
diff --git a/sound/surgery/retractor2.ogg b/sound/surgery/retractor2.ogg
new file mode 100644
index 000000000000..620fafe035d8
Binary files /dev/null and b/sound/surgery/retractor2.ogg differ
diff --git a/sound/surgery/saw.ogg b/sound/surgery/saw.ogg
new file mode 100644
index 000000000000..8e7a47f0fa06
Binary files /dev/null and b/sound/surgery/saw.ogg differ
diff --git a/sound/surgery/scalpel1.ogg b/sound/surgery/scalpel1.ogg
new file mode 100644
index 000000000000..6c0fe5dad9fe
Binary files /dev/null and b/sound/surgery/scalpel1.ogg differ
diff --git a/sound/surgery/scalpel2.ogg b/sound/surgery/scalpel2.ogg
new file mode 100644
index 000000000000..497672239393
Binary files /dev/null and b/sound/surgery/scalpel2.ogg differ
diff --git a/tgui/package.json b/tgui/package.json
index 798232a65ad4..6c4db999354a 100644
--- a/tgui/package.json
+++ b/tgui/package.json
@@ -47,7 +47,7 @@
"style-loader": "^4.0.0",
"terser-webpack-plugin": "^5.3.10",
"typescript": "^5.5.3",
- "webpack": "^5.93.0",
+ "webpack": "^5.94.0",
"webpack-bundle-analyzer": "^4.10.2",
"webpack-cli": "^5.1.4"
}
diff --git a/tgui/packages/tgui-panel/package.json b/tgui/packages/tgui-panel/package.json
index 5dc920a2b430..ad35f7c6a035 100644
--- a/tgui/packages/tgui-panel/package.json
+++ b/tgui/packages/tgui-panel/package.json
@@ -4,7 +4,7 @@
"version": "4.5.1-paradise",
"dependencies": {
"common": "workspace:*",
- "dompurify": "2.5.0",
+ "dompurify": "2.5.4",
"inferno": "^8.2.3",
"tgui": "workspace:*",
"tgui-dev-server": "workspace:*",
diff --git a/tgui/packages/tgui-panel/styles/main.scss b/tgui/packages/tgui-panel/styles/main.scss
index 4c4213b28e56..d84c6ce3af28 100644
--- a/tgui/packages/tgui-panel/styles/main.scss
+++ b/tgui/packages/tgui-panel/styles/main.scss
@@ -57,4 +57,4 @@
@include meta.load-css('~tgui/styles/layouts/Window.scss');
// Goonchat styles
-@include meta.load-css('./tgchat/chat-dark.scss');
+@include meta.load-css('./tgchat/chat-default.scss');
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-default.scss
similarity index 61%
rename from tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
rename to tgui/packages/tgui-panel/styles/tgchat/chat-default.scss
index 110b24534b7b..2b755c700cf6 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-default.scss
@@ -1,8 +1,4 @@
-/**
- * Copyright (c) 2020 Aleksej Komarov
- * SPDX-License-Identifier: MIT
- */
-
+// MARK: GENERAL STUFF
em {
font-style: normal;
font-weight: bold;
@@ -23,168 +19,86 @@ img.icon {
vertical-align: bottom;
}
-.emoji16x16 {
- vertical-align: middle;
-}
-
a {
color: #397ea5;
}
-a.popt {
- text-decoration: none;
-}
-
-/* POPUPS */
-
-.popup {
- position: fixed;
- top: 50%;
- left: 50%;
- background: #ddd;
-}
-
-.popup .close {
- position: absolute;
- background: #aaa;
- top: 0;
- right: 0;
- color: #333;
- text-decoration: none;
- z-index: 2;
- padding: 0 10px;
- height: 30px;
- line-height: 30px;
-}
-
-.popup .close:hover {
- background: #999;
-}
-
-.popup .head {
- background: #999;
- color: #ddd;
- padding: 0 10px;
- height: 30px;
- line-height: 30px;
- text-transform: uppercase;
- font-size: 0.9em;
+em {
+ font-style: normal;
font-weight: bold;
- border-bottom: 2px solid green;
}
-.popup input {
- border: 1px solid #999;
- background: #fff;
- margin: 0;
- padding: 5px;
- outline: none;
- color: #333;
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ color: #a4bad6;
+ font-family: Georgia, Verdana, sans-serif;
}
-.popup input[type='text']:hover,
-.popup input[type='text']:active,
-.popup input[type='text']:focus {
- border-color: green;
+h1.alert,
+h2.alert {
+ color: #a4bad6;
}
-.popup input[type='submit'] {
- padding: 5px 10px;
- background: #999;
- color: #ddd;
- text-transform: uppercase;
- font-size: 0.9em;
- font-weight: bold;
+.emoji {
+ max-height: 16px;
+ max-width: 16px;
}
-.popup input[type='submit']:hover,
-.popup input[type='submit']:focus,
-.popup input[type='submit']:active {
- background: #aaa;
- cursor: pointer;
+.emoji16x16 {
+ vertical-align: middle;
}
-.changeFont {
- padding: 10px;
+.italic,
+.italics,
+.emote {
+ font-style: italic;
}
-.changeFont a {
- display: block;
- text-decoration: none;
- padding: 3px;
- color: #333;
+.bold {
+ font-weight: bold;
}
-.changeFont a:hover {
- background: #ccc;
+.bolditalics {
+ font-style: italic;
+ font-weight: bold;
}
-.highlightPopup {
- padding: 10px;
+.center {
text-align: center;
}
-.highlightPopup input[type='text'] {
- display: block;
- width: 215px;
- text-align: left;
- margin-top: 5px;
-}
-
-.highlightPopup input.highlightColor {
- background-color: #ffff00;
-}
-
-.highlightPopup input.highlightTermSubmit {
- margin-top: 5px;
-}
-
-/* ADMIN CONTEXT MENU */
-
-.contextMenu {
- background-color: #ddd;
- position: fixed;
- margin: 2px;
- width: 150px;
+.big {
+ font-size: 150%;
}
-.contextMenu a {
- display: block;
- padding: 2px 5px;
- text-decoration: none;
- color: #333;
+.reallybig {
+ font-size: 175%;
}
-.contextMenu a:hover {
- background-color: #ccc;
+.sans {
+ font-family: 'Comic Sans MS', cursive, sans-serif;
}
-/* ADMIN FILTER MESSAGES MENU */
-
-.filterMessages {
- padding: 5px;
+.wingdings {
+ font-family: Wingdings, Webdings;
}
-.filterMessages div {
- padding: 2px 0;
+.robot {
+ font-family: 'OCR-A', monospace;
+ font-size: 1.15em;
+ font-weight: bold;
}
-.icon-stack {
- height: 1em;
- line-height: 1em;
- width: 1em;
- vertical-align: middle;
- margin-top: -2px;
+.hidden {
+ display: none;
+ visibility: hidden;
}
-/*****************************************
-*
-* OUTPUT ACTUALLY RELATED TO MESSAGES
-*
-******************************************/
-
-/* MOTD */
-
+// MARK: MOTD
.motd {
color: #a4bad6;
font-family: Verdana, sans-serif;
@@ -208,38 +122,37 @@ a.popt {
color: #a4bad6;
}
-/* ADD HERE FOR ITALIC */
+// MARK: MEMO
+.memo {
+ color: #638500;
+ text-align: center;
+}
-.italic,
-.italics,
-.emote {
- font-style: italic;
+.memoedit {
+ text-align: center;
+ font-size: 75%;
}
-/* OUTPUT COLORS */
+// MARK: General colors
+.ooc {
+ font-weight: bold;
+}
-.highlight {
- background: yellow;
+.looc {
+ color: #6699cc;
+ font-weight: bold;
}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
- color: #a4bad6;
- font-family: Georgia, Verdana, sans-serif;
+.discordpm {
+ color: #6685f5;
}
-h1.alert,
-h2.alert {
- color: #a4bad6;
+.debug {
+ color: #6d2f83;
}
-em {
- font-style: normal;
- font-weight: bold;
+.deadsay {
+ color: #e2c1ff;
}
.darkmblue {
@@ -250,27 +163,27 @@ em {
font-weight: bold;
}
-.ooc {
+.name {
font-weight: bold;
}
-.looc {
- color: #6699cc;
+.yell {
font-weight: bold;
}
-.adminobserverooc {
- color: #0099cc;
+// MARK: Admin/Mentor
+.mentorhelp {
+ color: #0077bb;
font-weight: bold;
}
-.adminooc {
- color: #b82e00;
+.mentor_channel {
+ color: #775bff;
font-weight: bold;
}
-.adminobserver {
- color: #996600;
+.mentor_channel_admin {
+ color: #a35cff;
font-weight: bold;
}
@@ -279,50 +192,44 @@ em {
font-weight: bold;
}
-.adminsay {
- color: #9611d4;
- font-weight: bold;
-}
-
-.mentorhelp {
- color: #0077bb;
- font-weight: bold;
-}
-
.adminhelp {
color: #aa0000;
font-weight: bold;
}
-.playerreply {
- color: #8800bb;
+.adminticket {
+ color: #3daf21;
font-weight: bold;
}
-.pmsend {
- color: #6685f5;
-}
-
-.debug {
- color: #6d2f83;
+.adminticketalt {
+ color: #ccb847;
+ font-weight: bold;
}
-.name {
+.admin_channel {
+ color: #03fc9d;
font-weight: bold;
}
-.yell {
+.all_admin_ping {
+ color: #12a5f4;
font-weight: bold;
+ font-size: 120%;
+ text-align: center;
}
-.siliconsay {
- font-family: 'Courier New', Courier, monospace;
+.dev_channel {
+ color: #61b413;
+ font-weight: bold;
}
-.deadsay {
- color: #e2c1ff;
+.dev_channel_admin {
+ color: #9ef14f;
+ font-weight: bold;
}
+// MARK: Radio
.radio {
color: #20b142;
}
@@ -343,10 +250,6 @@ em {
color: #998599;
}
-.resteamradio {
- color: #18bc46;
-}
-
.airadio {
color: #ff5ed7;
}
@@ -383,51 +286,7 @@ em {
color: #b84f92;
}
-.admin_channel {
- color: #03fc9d;
- font-weight: bold;
-}
-
-.all_admin_ping {
- color: #12a5f4;
- font-weight: bold;
- font-size: 120%;
- text-align: center;
-}
-
-.mentor_channel {
- color: #775bff;
- font-weight: bold;
-}
-
-.mentor_channel_admin {
- color: #a35cff;
- font-weight: bold;
-}
-
-.dev_channel {
- color: #61b413;
- font-weight: bold;
-}
-
-.dev_channel_admin {
- color: #9ef14f;
- font-weight: bold;
-}
-
-.djradio {
- color: #996600;
-}
-
-.binaryradio {
- color: #1b00fb;
- font-family: 'Courier New', Courier, monospace;
-}
-
-.mommiradio {
- color: #6685f5;
-}
-
+// MARK: Alerts
.alert {
color: #d82020;
}
@@ -443,31 +302,6 @@ h2.alert {
font-weight: bold;
}
-.emote {
- font-style: italic;
-}
-
-.selecteddna {
- color: #a4bad6;
- background-color: #001b1b;
-}
-
-.attack {
- color: #ff0000;
-}
-
-.moderate {
- color: #cc0000;
-}
-
-.disarm {
- color: #990000;
-}
-
-.passive {
- color: #660000;
-}
-
.warning {
color: #c51e1e;
font-style: italic;
@@ -484,16 +318,28 @@ h2.alert {
font-weight: bold;
}
+.biggerdanger {
+ color: #ff0000;
+ font-weight: bold;
+ font-size: 150%;
+}
+
.userdanger {
color: #c51e1e;
font-weight: bold;
font-size: 120%;
}
-.biggerdanger {
+.attack {
color: #ff0000;
- font-weight: bold;
- font-size: 150%;
+}
+
+.disarm {
+ color: #990000;
+}
+
+.moderate {
+ color: #cc0000;
}
.notice {
@@ -510,23 +356,46 @@ h2.alert {
font-style: italic;
}
-.green {
- color: #03bb39;
+// MARK: Announcements
+.announcement h1,
+.announcement h2 {
+ color: #a4bad6;
+ margin: 8pt 0;
+ line-height: 1.2;
}
-.pr_announce {
- color: #c51e1e;
- font-weight: bold;
+.announcement p {
+ color: #d82020;
+ line-height: 1.3;
}
-.boldannounceic {
- color: #c51e1e;
- font-weight: bold;
+.announcement.minor h1 {
+ font-size: 180%;
}
-.boldannounceooc {
- color: #c51e1e;
- font-weight: bold;
+.announcement.minor h2 {
+ font-size: 170%;
+}
+
+.announcement.sec h1 {
+ color: #f00;
+ font-size: 180%;
+ font-family: Verdana, sans-serif;
+}
+
+.boldannounceic {
+ color: #c51e1e;
+ font-weight: bold;
+}
+
+.boldannounceooc {
+ color: #c51e1e;
+ font-weight: bold;
+}
+
+.pr_announce {
+ color: #c51e1e;
+ font-weight: bold;
}
.greenannounce {
@@ -534,6 +403,7 @@ h2.alert {
font-weight: bold;
}
+// MARK: Antagonist
.alien {
color: #c433c4;
}
@@ -588,126 +458,40 @@ h2.alert {
font-style: italic;
}
-.medal {
- font-weight: bold;
-}
-
-/* /vg/ */
.blob {
- color: #006221;
- font-weight: bold;
+ color: #ee4000;
font-style: italic;
}
-.confirm {
- color: #00af3b;
-}
-
-.rose {
- color: #ff5050;
-}
-
-.sans {
- font-family: 'Comic Sans MS', cursive, sans-serif;
-}
-
-.wingdings {
- font-family: Wingdings, Webdings;
+.revennotice {
+ color: #6685f5;
}
-.robot {
- font-family: 'OCR-A', monospace;
- font-size: 1.15em;
+.revenbignotice {
+ color: #6685f5;
font-weight: bold;
+ font-size: 120%;
}
-.ancient {
- color: #008b8b;
- font-style: italic;
-}
-
-.newscaster {
- color: #cc0000;
-}
-
-.mod {
- color: #735638;
- font-weight: bold;
+.revenminor {
+ color: #823abb;
}
-.modooc {
- color: #184880;
- font-weight: bold;
+.revenwarning {
+ color: #760fbb;
+ font-style: italic;
}
-.adminmod {
- color: #f0aa14;
+.revendanger {
+ color: #760fbb;
font-weight: bold;
-}
-
-.tajaran {
- color: #803b56;
-}
-
-.skrell {
- color: #00ced1;
-}
-
-.solcom {
- color: #8282fb;
-}
-
-.com_srus {
- color: #7c4848;
-}
-
-.soghun {
- color: #228b22;
+ font-size: 120%;
}
.changeling {
color: #00b4de;
}
-.vox {
- color: #aa00aa;
-}
-
-.diona {
- color: #804000;
- font-weight: bold;
-}
-
-.trinary {
- color: #727272;
-}
-
-.kidan {
- color: #c64c05;
-}
-
-.slime {
- color: #0077aa;
-}
-
-.drask {
- color: #a3d4eb;
- font-family: 'Arial Black';
-}
-
-.moth {
- color: #869b29;
- font-family: 'Copperplate';
-}
-
-.clown {
- color: #ff0000;
-}
-
-.vulpkanin {
- color: #b97a57;
-}
-
.abductor {
color: #800080;
font-style: italic;
@@ -720,14 +504,6 @@ h2.alert {
font-style: italic;
}
-.rough {
- font-family: 'Trebuchet MS', cursive, sans-serif;
-}
-
-.say_quote {
- font-family: Georgia, Verdana, sans-serif;
-}
-
.cult {
color: #800080;
font-weight: bold;
@@ -762,6 +538,12 @@ h2.alert {
font-size: 200%;
}
+.his_grace {
+ color: #15d512;
+ font-family: 'Courier New', cursive, sans-serif;
+ font-style: italic;
+}
+
.zombie {
color: #7c4848;
}
@@ -772,234 +554,151 @@ h2.alert {
font-size: 120%;
}
-.interface {
- color: #9031c4;
-}
-
-.big {
- font-size: 150%;
-}
-
-.reallybig {
+// MARK: MEGAFAUNA
+.colossus {
+ color: #7f282a;
font-size: 175%;
}
-.greentext {
- color: #00ff00;
- font-size: 150%;
-}
-
-.redtext {
- color: #ff0000;
- font-size: 150%;
-}
-
-.bold {
+.hierophant {
+ color: #660099;
font-weight: bold;
-}
-
-.his_grace {
- color: #15d512;
- font-family: 'Courier New', cursive, sans-serif;
font-style: italic;
}
-.center {
- text-align: center;
-}
-
-.red {
- color: #ff0000;
-}
-
-.purple {
- color: #9031c4;
-}
-
-.skeleton {
- color: #c8c8c8;
- font-weight: bold;
+.hierophant_warning {
+ color: #660099;
font-style: italic;
}
-.gutter {
- color: #7092be;
- font-family: 'Trebuchet MS', cursive, sans-serif;
-}
-
-.orange {
- color: #ffa500;
+// MARK: Languages
+.tajaran {
+ color: #803b56;
}
-.orangei {
- color: #ffa500;
- font-style: italic;
+.skrell {
+ color: #00ced1;
}
-.orangeb {
- color: #ffa500;
- font-weight: bold;
+.solcom {
+ color: #8282fb;
}
-.resonate {
- color: #298f85;
+.com_srus {
+ color: #7c4848;
}
-.healthscan_oxy {
- color: #5cc9ff;
+.zombie {
+ color: #ff0000;
}
-.revennotice {
- color: #6685f5;
+.soghun {
+ color: #228b22;
}
-.revenboldnotice {
- color: #6685f5;
- font-weight: bold;
+.vox {
+ color: #aa00aa;
}
-.revenbignotice {
- color: #6685f5;
+.diona {
+ color: #804000;
font-weight: bold;
- font-size: 120%;
-}
-
-.revenminor {
- color: #823abb;
}
-.revenwarning {
- color: #760fbb;
- font-style: italic;
+.trinary {
+ color: #727272;
}
-.revendanger {
- color: #760fbb;
- font-weight: bold;
- font-size: 120%;
+.kidan {
+ color: #c64c05;
}
-.specialnotice {
- color: #4a6f82;
- font-weight: bold;
- font-size: 120%;
+.slime {
+ color: #0077aa;
}
-/* /vg/ */
-.good {
- color: green;
+.drask {
+ color: #a3d4eb;
+ font-family: 'Arial Black';
}
-.average {
- color: #ff8000;
+.moth {
+ color: #869b29;
+ font-family: 'Copperplate';
}
-.bad {
+.clown {
color: #ff0000;
}
-/* /vg/ Saycode Rewrite */
-.italics,
-.talkinto {
- font-style: italic;
+.vulpkanin {
+ color: #b97a57;
}
-.whisper {
- font-style: italic;
- color: #cccccc;
+.gutter {
+ color: #7092be;
+ font-family: 'Trebuchet MS', cursive, sans-serif;
}
-/* Recruiting stuff */
-.recruit {
- color: #5c00e6;
- font-weight: bold;
- font-style: italic;
+.tradeband {
+ font-family: Georgia, Verdana, sans-serif;
}
-.memo {
- color: #638500;
- text-align: center;
+// MARK: Other colors
+.rose {
+ color: #ff5050;
}
-.memoedit {
- text-align: center;
- font-size: 75%;
+.interface {
+ color: #9031c4;
}
-.connectionClosed,
-.fatalError {
- background: red;
- color: white;
- padding: 5px;
+.greentext {
+ color: #00ff00;
+ font-size: 150%;
}
-.connectionClosed.restored {
- background: green;
+.redtext {
+ color: #ff0000;
+ font-size: 150%;
}
-.internal.boldnshit {
- color: #6685f5;
- font-weight: bold;
+.red {
+ color: #ff0000;
}
-.rebooting {
- background: #2979af;
- color: white;
- padding: 5px;
+.green {
+ color: #03bb39;
}
-.rebooting a {
- color: white !important;
- text-decoration-color: white !important;
+.purple {
+ color: #9031c4;
}
-/* HELPER CLASSES */
-.text-normal {
- font-weight: normal;
- font-style: normal;
+.orange {
+ color: #ffa500;
}
-.hidden {
- display: none;
- visibility: hidden;
+.resonate {
+ color: #298f85;
}
-/* MEGAFAUNA */
-.colossus {
- color: #7f282a;
- font-size: 175%;
+.healthscan_oxy {
+ color: #5cc9ff;
}
-.hierophant {
- color: #660099;
+.specialnotice {
+ color: #4a6f82;
font-weight: bold;
- font-style: italic;
+ font-size: 120%;
}
-.hierophant_warning {
- color: #660099;
+.whisper {
font-style: italic;
+ color: #cccccc;
}
-/* EMOJI STUFF */
-.emoji {
- max-height: 16px;
- max-width: 16px;
-}
-
-/* ADMIN TICKETS */
-
-.adminticket {
- color: #3daf21;
- font-weight: bold;
-}
-
-.adminticketalt {
- color: #ccb847;
- font-weight: bold;
-}
-
-/* Syndicate codewords */
+// MARK: Syndicate codewords
span.body .codephrases {
color: #5555ff;
}
@@ -1008,95 +707,66 @@ span.body .coderesponses {
color: #ff3333;
}
-.announcement h1,
-.announcement h2 {
- color: #a4bad6;
- margin: 8pt 0;
- line-height: 1.2;
+// MARK: Gases
+.oxygen {
+ color: #449dff;
}
-.announcement p {
- color: #d82020;
- line-height: 1.3;
+.nitrogen {
+ color: #f94541;
}
-.announcement.minor h1 {
- font-size: 180%;
+.carbon_dioxide {
+ color: #cccccc;
}
-.announcement.minor h2 {
- font-size: 170%;
+.plasma {
+ color: #eb6b00;
}
-.announcement.sec h1 {
- color: #f00;
- font-size: 180%;
- font-family: Verdana, sans-serif;
+.sleeping_agent {
+ color: #f28b89;
}
-.bolditalics {
- font-style: italic;
- font-weight: bold;
+.agent_b {
+ color: teal;
}
+// MARK: Boxed messages
.boxed_message {
- background: #1b1c1e;
- border: 1px solid #a3b9d9;
- margin: 0.5em;
+ background: hsl(220, 10%, 10%);
+ border: 1px solid hsla(220, 40%, 75%, 0.25);
+ border-width: 1em * calc(1px / 12px) 1em * calc(5px / 12px);
+ margin: 0.5em 0.25em;
padding: 0.5em 0.75em;
+ border-radius: 0.5em;
text-align: center;
}
-.boxed_message.left_align_text {
- text-align: left;
-}
-
.boxed_message.red_border {
- background: #1e1b1b;
- border-color: #aa0000;
+ background: hsl(0, 20%, 10%);
+ border-color: hsla(0, 100%, 50%, 0.5);
}
.boxed_message.green_border {
- background: #1b1e1c;
- border-color: #00ff00;
+ background: hsl(140, 20%, 10%);
+ border-color: hsla(120, 100%, 50%, 0.5);
}
.boxed_message.purple_border {
- background: #1d1c1f;
- border-color: #8000ff;
+ background: hsl(260, 25%, 12.5%);
+ border-color: hsla(260, 100%, 75%, 0.5);
}
.boxed_message.notice_border {
- background: #1b1c1e;
- border-color: #6685f5;
+ background: hsl(220, 20%, 10%);
+ border-color: hsla(225, 90%, 65%, 0.5);
}
.boxed_message.thick_border {
- border-width: thick;
+ border-width: 0.5em;
}
-/* GASES */
-
-.oxygen {
- color: #449dff;
-}
-
-.nitrogen {
- color: #f94541;
-}
-
-.carbon_dioxide {
- color: #cccccc;
-}
-
-.plasma {
- color: #eb6b00;
-}
-
-.sleeping_agent {
- color: #f28b89;
-}
-
-.agent_b {
- color: teal;
+.boxed_message.left_align_text {
+ text-align: left;
}
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
index 7e366a5636ab..9fe1abdec63a 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
@@ -1,208 +1,25 @@
-/**
- * Copyright (c) 2020 Aleksej Komarov
- * SPDX-License-Identifier: MIT
- */
-
-html,
-body {
- padding: 0;
- margin: 0;
- height: 100%;
- color: #000000;
-}
-
-body {
- background: #fff;
- font-family: Verdana, sans-serif;
- font-size: 13px;
- line-height: 1.2;
- overflow-x: hidden;
- overflow-y: scroll;
- word-wrap: break-word;
-}
-
-em {
- font-style: normal;
- font-weight: bold;
-}
-
-img {
- margin: 0;
- padding: 0;
- line-height: 1;
- -ms-interpolation-mode: nearest-neighbor; // TODO: Remove with 516
- image-rendering: pixelated;
-}
-
-img.icon {
- height: 1em;
- min-height: 16px;
- width: auto;
- vertical-align: bottom;
-}
-
+// MARK: GENERAL STUFF
a {
color: #0000ff;
}
-a.popt {
- text-decoration: none;
-}
-
-/* POPUPS */
-
-.popup {
- position: fixed;
- top: 50%;
- left: 50%;
- background: #ddd;
-}
-
-.popup .close {
- position: absolute;
- background: #aaa;
- top: 0;
- right: 0;
- color: #333;
- text-decoration: none;
- z-index: 2;
- padding: 0 10px;
- height: 30px;
- line-height: 30px;
-}
-
-.popup .close:hover {
- background: #999;
-}
-
-.popup .head {
- background: #999;
- color: #ddd;
- padding: 0 10px;
- height: 30px;
- line-height: 30px;
- text-transform: uppercase;
- font-size: 0.9em;
- font-weight: bold;
- border-bottom: 2px solid green;
-}
-
-.popup input {
- border: 1px solid #999;
- background: #fff;
- margin: 0;
- padding: 5px;
- outline: none;
- color: #333;
-}
-
-.popup input[type='text']:hover,
-.popup input[type='text']:active,
-.popup input[type='text']:focus {
- border-color: green;
-}
-
-.popup input[type='submit'] {
- padding: 5px 10px;
- background: #999;
- color: #ddd;
- text-transform: uppercase;
- font-size: 0.9em;
- font-weight: bold;
-}
-
-.popup input[type='submit']:hover,
-.popup input[type='submit']:focus,
-.popup input[type='submit']:active {
- background: #aaa;
- cursor: pointer;
-}
-
-.changeFont {
- padding: 10px;
-}
-
-.changeFont a {
- display: block;
- text-decoration: none;
- padding: 3px;
- color: #333;
-}
-
-.changeFont a:hover {
- background: #ccc;
-}
-
-.highlightPopup {
- padding: 10px;
- text-align: center;
-}
-
-.highlightPopup input[type='text'] {
- display: block;
- width: 215px;
- text-align: left;
- margin-top: 5px;
-}
-
-.highlightPopup input.highlightColor {
- background-color: #ffff00;
-}
-
-.highlightPopup input.highlightTermSubmit {
- margin-top: 5px;
-}
-
-/* ADMIN CONTEXT MENU */
-
-.contextMenu {
- background-color: #ddd;
- position: fixed;
- margin: 2px;
- width: 150px;
-}
-
-.contextMenu a {
- display: block;
- padding: 2px 5px;
- text-decoration: none;
- color: #333;
-}
-
-.contextMenu a:hover {
- background-color: #ccc;
-}
-
-/* ADMIN FILTER MESSAGES MENU */
-
-.filterMessages {
- padding: 5px;
-}
-
-.filterMessages div {
- padding: 2px 0;
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ color: #0000ff;
}
-.icon-stack {
- height: 1em;
- line-height: 1em;
- width: 1em;
- vertical-align: middle;
- margin-top: -2px;
+h1.alert,
+h2.alert {
+ color: #000000;
}
-/*****************************************
-*
-* OUTPUT ACTUALLY RELATED TO MESSAGES
-*
-******************************************/
-
-/* MOTD */
-
+// MARK: MOTD
.motd {
color: #638500;
- font-family: Verdana, sans-serif;
- white-space: normal;
}
.motd h1,
@@ -212,7 +29,6 @@ a.popt {
.motd h5,
.motd h6 {
color: #638500;
- text-decoration: underline;
}
.motd a,
@@ -222,121 +38,69 @@ a.popt {
color: #638500;
}
-/* ADD HERE FOR ITALIC */
-
-.italic,
-.italics,
-.emote {
- font-style: italic;
-}
-
-/* OUTPUT COLORS */
-
-.highlight {
- background: yellow;
+// MARK: General colors
+.looc {
+ color: #6699cc;
}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
+.discordpm {
color: #0000ff;
- font-family: Georgia, Verdana, sans-serif;
}
-h1.alert,
-h2.alert {
- color: #000000;
+.debug {
+ color: #6d2f83;
}
-em {
- font-style: normal;
- font-weight: bold;
+.deadsay {
+ color: #5c00e6;
}
.darkmblue {
color: #0000ff;
}
-.prefix {
- font-weight: bold;
-}
-
-.ooc {
- font-weight: bold;
-}
-
-.looc {
- color: #6699cc;
- font-weight: bold;
-}
-
-.adminobserverooc {
- color: #0099cc;
- font-weight: bold;
-}
-
-.adminooc {
- color: #b82e00;
- font-weight: bold;
-}
-
-.adminobserver {
- color: #996600;
- font-weight: bold;
-}
-
-.admin {
- color: #386aff;
- font-weight: bold;
+// MARK: Admin/Mentor
+.mentorhelp {
+ color: #0077bb;
}
-.adminsay {
- color: #9611d4;
- font-weight: bold;
+.mentor_channel {
+ color: #775bff;
}
-.mentorhelp {
- color: #0077bb;
- font-weight: bold;
+.mentor_channel_admin {
+ color: #a35cff;
}
.adminhelp {
color: #aa0000;
- font-weight: bold;
-}
-
-.playerreply {
- color: #8800bb;
- font-weight: bold;
}
-.pmsend {
- color: #0000ff;
+.adminticket {
+ color: #3e7336;
}
-.debug {
- color: #6d2f83;
+.adminticketalt {
+ color: #014c8a;
}
-.name {
- font-weight: bold;
+.admin_channel {
+ color: #9a04d1;
}
-.yell {
- font-weight: bold;
+.all_admin_ping {
+ color: #12a5f4;
}
-.siliconsay {
- font-family: 'Courier New', Courier, monospace;
+.dev_channel {
+ color: #126719;
}
-.deadsay {
- color: #5c00e6;
+.dev_channel_admin {
+ color: #26a419;
}
+// MARK: Radio
.radio {
color: #408010;
}
@@ -357,10 +121,6 @@ em {
color: #686868;
}
-.resteamradio {
- color: #18bc46;
-}
-
.airadio {
color: #ff00ff;
}
@@ -397,51 +157,7 @@ em {
color: #e3027a;
}
-.admin_channel {
- color: #9a04d1;
- font-weight: bold;
-}
-
-.all_admin_ping {
- color: #12a5f4;
- font-weight: bold;
- font-size: 120%;
- text-align: center;
-}
-
-.mentor_channel {
- color: #775bff;
- font-weight: bold;
-}
-
-.mentor_channel_admin {
- color: #a35cff;
- font-weight: bold;
-}
-
-.dev_channel {
- color: #126719;
- font-weight: bold;
-}
-
-.dev_channel_admin {
- color: #26a419;
- font-weight: bold;
-}
-
-.djradio {
- color: #663300;
-}
-
-.binaryradio {
- color: #0b0050;
- font-family: 'Courier New', Courier, monospace;
-}
-
-.mommiradio {
- color: navy;
-}
-
+// MARK: Alerts
.alert {
color: #ff0000;
}
@@ -453,61 +169,22 @@ h2.alert {
.ghostalert {
color: #5c00e6;
- font-style: italic;
- font-weight: bold;
-}
-
-.emote {
- font-style: italic;
-}
-
-.selecteddna {
- color: #ffffff;
- background-color: #001b1b;
-}
-
-.attack {
- color: #ff0000;
-}
-
-.moderate {
- color: #cc0000;
-}
-
-.disarm {
- color: #990000;
-}
-
-.passive {
- color: #660000;
}
.warning {
color: #ff0000;
- font-style: italic;
}
.boldwarning {
color: #ff0000;
- font-style: italic;
- font-weight: bold;
}
.danger {
color: #ff0000;
- font-weight: bold;
}
.userdanger {
color: #ff0000;
- font-weight: bold;
- font-size: 120%;
-}
-
-.biggerdanger {
- color: #ff0000;
- font-weight: bold;
- font-size: 150%;
}
.notice {
@@ -516,51 +193,39 @@ h2.alert {
.boldnotice {
color: #000099;
- font-weight: bold;
}
-.suicide {
- color: #ff5050;
- font-style: italic;
-}
-
-.green {
- color: #03bb39;
+// MARK: Announcements
+.announcement h1,
+.announcement h2 {
+ color: #000;
}
-.pr_announce {
- color: #228b22;
- font-weight: bold;
+.announcement.sec h1 {
+ color: #f00;
}
.boldannounceic {
color: #ff0000;
- font-weight: bold;
}
.boldannounceooc {
color: #ff0000;
- font-weight: bold;
+}
+
+.pr_announce {
+ color: #228b22;
}
.greenannounce {
color: #00ff00;
- font-weight: bold;
}
+// MARK: Antagonist
.alien {
color: #543354;
}
-.noticealien {
- color: #00c000;
-}
-
-.alertalien {
- color: #00c000;
- font-weight: bold;
-}
-
.terrorspider {
color: #320e32;
}
@@ -569,454 +234,67 @@ h2.alert {
color: #6a2148;
}
-.chaosverygood {
- color: #19e0c0;
- font-weight: bold;
- font-size: 120%;
-}
-
-.chaosgood {
- color: #19e0c0;
- font-weight: bold;
-}
-
-.chaosneutral {
- color: #479ac0;
- font-weight: bold;
-}
-
-.chaosbad {
- color: #9047c0;
- font-weight: bold;
-}
-
-.chaosverybad {
- color: #9047c0;
- font-weight: bold;
- font-size: 120%;
-}
-
-.sinister {
- color: #800080;
- font-weight: bold;
- font-style: italic;
-}
-/* /vg/ */
-.blob {
- color: #006221;
- font-weight: bold;
- font-style: italic;
-}
-
-.confirm {
- color: #00af3b;
-}
-
-.rose {
- color: #ff5050;
-}
-
-.sans {
- font-family: 'Comic Sans MS', cursive, sans-serif;
-}
-
-.wingdings {
- font-family: Wingdings, Webdings;
-}
-
-.robot {
- font-family: 'OCR-A', monospace;
- font-size: 1.15em;
- font-weight: bold;
-}
-
-.ancient {
- color: #008b8b;
- font-style: italic;
-}
-
-.newscaster {
- color: #800000;
-}
-
-.mod {
- color: #735638;
- font-weight: bold;
-}
-
-.modooc {
- color: #184880;
- font-weight: bold;
-}
-
-.adminmod {
- color: #402a14;
- font-weight: bold;
-}
-
-.tajaran {
- color: #803b56;
-}
-
-.skrell {
- color: #00ced1;
-}
-
-.solcom {
- color: #22228b;
-}
-
-.com_srus {
- color: #7c4848;
+.revennotice {
+ color: #1d2953;
}
-.soghun {
- color: #228b22;
+.revenbignotice {
+ color: #1d2953;
}
.changeling {
color: #800080;
}
-.vox {
- color: #aa00aa;
-}
-
-.diona {
- color: #804000;
- font-weight: bold;
-}
-
-.trinary {
- color: #727272;
-}
-
-.kidan {
- color: #664205;
-}
-
-.slime {
- color: #0077aa;
-}
-
-.drask {
- color: #a3d4eb;
- font-family: 'Arial Black';
-}
-
-.moth {
- color: #869b29;
- font-family: 'Copperplate';
-}
-
-.clown {
- color: #ff0000;
-}
-
-.vulpkanin {
- color: #b97a57;
-}
-
-.abductor {
- color: #800080;
- font-style: italic;
-}
-
-.mind_control {
- color: #a00d6f;
- font-size: 3;
- font-weight: bold;
- font-style: italic;
-}
-
-.rough {
- font-family: 'Trebuchet MS', cursive, sans-serif;
-}
-
-.say_quote {
- font-family: Georgia, Verdana, sans-serif;
-}
-
-.cult {
- color: #800080;
- font-weight: bold;
- font-style: italic;
-}
-
.cultspeech {
color: #7f0000;
- font-style: italic;
}
.cultitalic {
color: #960000;
- font-style: italic;
}
.cultlarge {
color: #960000;
- font-weight: bold;
- font-size: 120%;
}
.narsie {
color: #960000;
- font-weight: bold;
- font-size: 300%;
}
.narsiesmall {
color: #960000;
- font-weight: bold;
- font-size: 200%;
}
-.zombie {
- color: #7c4848;
-}
-
-.zombielarge {
- color: #7c4848;
- font-weight: bold;
- font-size: 120%;
+// MARK: Other colors
+.rose {
+ color: #ff5050;
}
.interface {
color: #330033;
}
-.big {
- font-size: 150%;
-}
-
-.reallybig {
- font-size: 175%;
-}
-
-.greentext {
- color: #00ff00;
- font-size: 150%;
-}
-
-.redtext {
- color: #ff0000;
- font-size: 150%;
-}
-
-.bold {
- font-weight: bold;
-}
-
-.his_grace {
- color: #15d512;
- font-family: 'Courier New', cursive, sans-serif;
- font-style: italic;
-}
-
-.center {
- text-align: center;
-}
-
-.red {
- color: #ff0000;
-}
-
.purple {
color: #5e2d79;
}
-.skeleton {
- color: #585858;
- font-weight: bold;
- font-style: italic;
-}
-
-.gutter {
- color: #7092be;
- font-family: 'Trebuchet MS', cursive, sans-serif;
-}
-
.orange {
color: #ffa500;
}
-.orangei {
- color: #ffa500;
- font-style: italic;
-}
-
-.orangeb {
- color: #ffa500;
- font-weight: bold;
-}
-
-.resonate {
- color: #298f85;
-}
-
.healthscan_oxy {
color: #0074bd;
}
-.revennotice {
- color: #1d2953;
-}
-
-.revenboldnotice {
- color: #1d2953;
- font-weight: bold;
-}
-
-.revenbignotice {
- color: #1d2953;
- font-weight: bold;
- font-size: 120%;
-}
-
-.revenminor {
- color: #823abb;
-}
-
-.revenwarning {
- color: #760fbb;
- font-style: italic;
-}
-
-.revendanger {
- color: #760fbb;
- font-weight: bold;
- font-size: 120%;
-}
-
-.specialnoticebold {
- color: #36525e;
- font-weight: bold;
- font-size: 120%;
-}
-
.specialnotice {
color: #36525e;
- font-size: 120%;
-}
-
-.medal {
- font-weight: bold;
-}
-
-/* /vg/ */
-.good {
- color: green;
-}
-
-.average {
- color: #ff8000;
-}
-
-.bad {
- color: #ff0000;
-}
-
-/* /vg/ Saycode Rewrite */
-.italics,
-.talkinto {
- font-style: italic;
}
.whisper {
- font-style: italic;
color: #333333;
}
-/* Recruiting stuff */
-.recruit {
- color: #5c00e6;
- font-weight: bold;
- font-style: italic;
-}
-
-.memo {
- color: #638500;
- text-align: center;
-}
-
-.memoedit {
- text-align: center;
- font-size: 75%;
-}
-
-.connectionClosed,
-.fatalError {
- background: red;
- color: white;
- padding: 5px;
-}
-
-.connectionClosed.restored {
- background: green;
-}
-
-.internal.boldnshit {
- color: blue;
- font-weight: bold;
-}
-
-.rebooting {
- background: #2979af;
- color: white;
- padding: 5px;
-}
-
-.rebooting a {
- color: white !important;
- text-decoration-color: white !important;
-}
-
-/* HELPER CLASSES */
-.text-normal {
- font-weight: normal;
- font-style: normal;
-}
-
-.hidden {
- display: none;
- visibility: hidden;
-}
-
-/* MEGAFAUNA */
-.colossus {
- color: #7f282a;
- font-size: 175%;
-}
-
-.hierophant {
- color: #660099;
- font-weight: bold;
- font-style: italic;
-}
-
-.hierophant_warning {
- color: #660099;
- font-style: italic;
-}
-
-/* EMOJI STUFF */
-.emoji {
- max-height: 16px;
- max-width: 16px;
-}
-
-/* ADMIN TICKETS */
-
-.adminticket {
- color: #3e7336;
- font-weight: bold;
-}
-
-.adminticketalt {
- color: #014c8a;
- font-weight: bold;
-}
-
/* Syndicate codewords */
span.body .codephrases {
color: #0000ff;
@@ -1026,95 +304,53 @@ span.body .coderesponses {
color: #ff0000;
}
-.announcement h1,
-.announcement h2 {
- color: #000;
- margin: 8pt 0;
- line-height: 1.2;
+// MARK: GASES
+.oxygen {
+ color: #006adb;
}
-.announcement p {
- color: #d82020;
- line-height: 1.3;
+.nitrogen {
+ color: #d00a06;
}
-.announcement.minor h1 {
- font-size: 180%;
+.carbon_dioxide {
+ color: #1f1f1f;
}
-.announcement.minor h2 {
- font-size: 170%;
+.plasma {
+ color: #853c00;
}
-.announcement.sec h1 {
- color: #f00;
- font-size: 180%;
- font-family: Verdana, sans-serif;
+.sleeping_agent {
+ color: #e82f2c;
}
-.bolditalics {
- font-style: italic;
- font-weight: bold;
+.agent_b {
+ color: #004d4d;
}
+// MARK: Boxed messages
.boxed_message {
- background: #f7fcff;
- border: 1px solid #111a26;
- margin: 0.5em;
- padding: 0.5em 0.75em;
- text-align: center;
-}
-
-.boxed_message.left_align_text {
- text-align: left;
+ background: hsl(220, 100%, 97.5%);
+ border-color: hsla(220, 75%, 25%, 0.5);
}
.boxed_message.red_border {
- background: #fff7f7;
- border-color: #aa0000;
+ background: hsl(0, 100%, 97.5%);
+ border-color: hsla(0, 100%, 50%, 0.5);
}
.boxed_message.green_border {
- background: #f7fff7;
- border-color: #00ff00;
+ background: hsl(140, 100%, 97.5%);
+ border-color: hsl(120, 100%, 33%, 0.5);
}
.boxed_message.purple_border {
- background: #fdf7ff;
- border-color: #aa00ff;
+ background: hsl(260, 100%, 97.5%);
+ border-color: hsla(260, 100%, 50%, 0.5);
}
.boxed_message.notice_border {
- background: #f7fdff;
- border-color: #0000bf;
-}
-
-.boxed_message.thick_border {
- border-width: thick;
-}
-
-/* GASES */
-
-.oxygen {
- color: #006adb;
-}
-
-.nitrogen {
- color: #d00a06;
-}
-
-.carbon_dioxide {
- color: #1f1f1f;
-}
-
-.plasma {
- color: #853c00;
-}
-
-.sleeping_agent {
- color: #e82f2c;
-}
-
-.agent_b {
- color: #004d4d;
+ background: hsl(220, 100%, 97.5%);
+ border-color: hsla(225, 100%, 50%, 0.5);
}
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-ntos.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-ntos.scss
index b5fdb106e59a..7841c962d5b2 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-ntos.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-ntos.scss
@@ -1,35 +1,19 @@
.boxed_message {
- background: #1c242e;
- border: 1px solid #a3b9d9;
- margin: 0.5em;
- padding: 0.5em 0.75em;
- text-align: center;
-}
-
-.boxed_message.left_align_text {
- text-align: left;
+ background: hsl(220, 25%, 15%);
}
.boxed_message.red_border {
- background: #2e1c1c;
- border-color: #aa0000;
+ background: hsl(0, 25%, 15%);
}
.boxed_message.green_border {
- background: #1c2e22;
- border-color: #00ff00;
+ background: hsl(140, 25%, 15%);
}
.boxed_message.purple_border {
- background: #221c2e;
- border-color: #8000ff;
+ background: hsl(260, 25%, 15%);
}
.boxed_message.notice_border {
- background: #1f2633;
- border-color: #6685f5;
-}
-
-.boxed_message.thick_border {
- border-width: thick;
+ background: hsl(220, 35%, 15%);
}
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-paradise.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-paradise.scss
index a33d3ef60ecb..45cac6f6e86e 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-paradise.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-paradise.scss
@@ -7,37 +7,26 @@
}
.boxed_message {
- background: rgba(0, 0, 0, 0.25);
- border: 1px solid #a3b9d9;
- margin: 0.5em;
- padding: 0.5em 0.75em;
- text-align: center;
-}
-
-.boxed_message.left_align_text {
- text-align: left;
+ background: hsla(0, 0%, 0%, 0.25);
+ border-color: hsla(20, 50%, 75%, 0.25);
}
.boxed_message.red_border {
- background: rgba(0, 0, 0, 0.25);
- border-color: #aa0000;
+ background: hsla(0, 75%, 5%, 0.25);
+ border-color: hsla(0, 100%, 50%, 0.5);
}
.boxed_message.green_border {
- background: rgba(0, 0, 0, 0.25);
- border-color: #00ff00;
+ background: hsla(140, 75%, 5%, 0.25);
+ border-color: hsla(120, 100%, 50%, 0.5);
}
.boxed_message.purple_border {
- background: rgba(0, 0, 0, 0.25);
- border-color: #8000ff;
+ background: hsla(260, 75%, 5%, 0.25);
+ border-color: hsla(260, 100%, 65%, 0.5);
}
.boxed_message.notice_border {
- background: rgba(0, 0, 0, 0.25);
- border-color: #6685f5;
-}
-
-.boxed_message.thick_border {
- border-width: thick;
+ background: hsla(220, 75%, 5%, 0.25);
+ border-color: hsla(225, 90%, 65%, 0.5);
}
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-syndicate.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-syndicate.scss
index 9fdb11962038..e01b8154196f 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-syndicate.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-syndicate.scss
@@ -7,37 +7,21 @@
}
.boxed_message {
- background: rgba(20, 20, 35, 0.25);
- border: 1px solid #a3b9d9;
- margin: 0.5em;
- padding: 0.5em 0.75em;
- text-align: center;
-}
-
-.boxed_message.left_align_text {
- text-align: left;
+ background: hsl(0, 70%, 12.5%);
}
.boxed_message.red_border {
- background: rgba(0, 0, 0, 0.2);
- border-color: #ff0000;
+ background: hsl(0, 100%, 12.5%);
}
.boxed_message.green_border {
- background: rgba(0, 75, 0, 0.25);
- border-color: #00ff00;
+ background: hsl(40, 100%, 7.5%);
}
.boxed_message.purple_border {
- background: rgba(25, 0, 50, 0.25);
- border-color: #8000ff;
+ background: hsl(300, 100%, 7.5%);
}
.boxed_message.notice_border {
- background: rgba(0, 0, 75, 0.25);
- border-color: #6685f5;
-}
-
-.boxed_message.thick_border {
- border-width: thick;
+ background: hsl(325, 100%, 7.5%);
}
diff --git a/tgui/packages/tgui/components/Image.tsx b/tgui/packages/tgui/components/Image.tsx
index 33e3b063f696..6bf245878ea4 100644
--- a/tgui/packages/tgui/components/Image.tsx
+++ b/tgui/packages/tgui/components/Image.tsx
@@ -44,11 +44,11 @@ export class Image extends Component {
render() {
const { fixBlur = true, fixErrors = false, objectFit = 'fill', src, ...rest } = this.props;
- /* Remove -ms-interpolation-mode with Byond 516. -webkit-optimize-contrast is better than pixelated */
+ /* Remove -ms-interpolation-mode with Byond 516 */
const computedProps = computeBoxProps({
style: {
'-ms-interpolation-mode': `${fixBlur ? 'nearest-neighbor' : 'auto'}`,
- 'image-rendering': `${fixBlur ? '-webkit-optimize-contrast' : 'auto'}`,
+ 'image-rendering': `${fixBlur ? 'pixelated' : 'auto'}`,
'object-fit': `${objectFit}`,
},
...rest,
diff --git a/tgui/packages/tgui/interfaces/AgentCard.js b/tgui/packages/tgui/interfaces/AgentCard.js
index 4ec402bc89a5..4d85c3ff26d2 100644
--- a/tgui/packages/tgui/interfaces/AgentCard.js
+++ b/tgui/packages/tgui/interfaces/AgentCard.js
@@ -215,21 +215,22 @@ export const AgentCardInfo = (props, context) => {
export const AgentCardAppearances = (props, context) => {
const { act, data } = useBackend(context);
const [selectedAppearance, setSelectedAppearance] = useSharedState(context, 'selectedAppearance', '');
- const { appearances } = data;
+ const { icon, appearances } = data;
return (
- {Object.entries(appearances).map(([name, image]) => (
+ {appearances.map((appearance) => (
{
- setSelectedAppearance(name);
- act('change_appearance', { new_appearance: name });
+ setSelectedAppearance(appearance);
+ act('change_appearance', { new_appearance: appearance });
}}
/>
))}
diff --git a/tgui/packages/tgui/interfaces/BluespaceTap.js b/tgui/packages/tgui/interfaces/BluespaceTap.js
index a0433fd65d88..c96c663b23b2 100644
--- a/tgui/packages/tgui/interfaces/BluespaceTap.js
+++ b/tgui/packages/tgui/interfaces/BluespaceTap.js
@@ -1,30 +1,68 @@
import { useBackend } from '../backend';
-import { Button, Collapsible, Stack, LabeledList, NoticeBox, Section, Slider, Box } from '../components';
+import {
+ Button,
+ Collapsible,
+ Stack,
+ LabeledList,
+ NoticeBox,
+ Section,
+ Slider,
+ Box,
+ NumberInput,
+ Dimmer,
+ Flex,
+ Icon,
+ Blink,
+} from '../components';
import { Window } from '../layouts';
import { formatPower } from '../format';
+export const Incursion = (props, context) => {
+ const { data } = useBackend(context);
+ const { portaling } = data;
+ if (portaling) {
+ return (
+
+
+
+ );
+ }
+};
+
export const BluespaceTap = (props, context) => {
const { act, data } = useBackend(context);
const product = data.product || [];
const {
- desiredLevel,
- inputLevel,
+ desiredMiningPower,
+ miningPower,
points,
totalPoints,
powerUse,
availablePower,
- maxLevel,
emagged,
- nextLevelPower,
autoShutown,
stabilizers,
stabilizerPower,
+ stabilizerPriority,
} = data;
- const barColor = (desiredLevel > inputLevel && 'bad') || 'good';
+ const barColor = (desiredMiningPower > miningPower && 'bad') || 'good';
return (
+
@@ -34,6 +72,7 @@ export const BluespaceTap = (props, context) => {
color={!!autoShutown && !emagged ? 'green' : 'red'}
disabled={!!emagged}
tooltip="Turn auto shutdown on or off"
+ tooltipPosition="top"
onClick={() => act('auto_shutdown')}
/>
@@ -147,17 +195,17 @@ export const BluespaceTap = (props, context) => {
export const Alerts = (props, context) => {
const { act, data } = useBackend(context);
const product = data.product || [];
- const { inputLevel, emagged, safeLevels, autoShutown, stabilizers, overhead } = data;
+ const { miningPower, stabilizerPower, emagged, safeLevels, autoShutown, stabilizers, overhead } = data;
return (
<>
{!autoShutown && !emagged && Auto shutdown disabled}
{emagged ? (
All safeties disabled
- ) : inputLevel <= safeLevels ? (
+ ) : miningPower <= 15000000 ? (
''
) : !stabilizers ? (
Stabilizers disabled, Instability likely
- ) : inputLevel - overhead > safeLevels ? (
+ ) : miningPower > stabilizerPower + 15000000 ? (
Stabilizers overwhelmed, Instability likely
) : (
High Power, engaging stabilizers
diff --git a/tgui/packages/tgui/interfaces/FloorPainter.js b/tgui/packages/tgui/interfaces/FloorPainter.js
index 6b44333a919c..f370e384b84b 100644
--- a/tgui/packages/tgui/interfaces/FloorPainter.js
+++ b/tgui/packages/tgui/interfaces/FloorPainter.js
@@ -1,27 +1,37 @@
import { useBackend, useLocalState } from '../backend';
-import { Button, LabeledList, Section, Table, Dropdown, Flex, Icon, Box } from '../components';
+import { Button, DmIcon, LabeledList, Section, Table, Dropdown, Flex, Icon, Box } from '../components';
import { Window } from '../layouts';
const SelectableTile = (props, context) => {
const { act, data } = useBackend(context);
- const { image, isSelected, onSelect } = props;
+ const { icon_state, direction, isSelected, onSelect } = props;
+
return (
-
);
};
+const Dir = {
+ NORTH: 1,
+ SOUTH: 2,
+ EAST: 4,
+ WEST: 8,
+};
+
export const FloorPainter = (props, context) => {
const { act, data } = useBackend(context);
- const { availableStyles, selectedStyle, selectedDir, directionsPreview, allStylesPreview } = data;
+ const { availableStyles, selectedStyle, selectedDir } = data;
return (
@@ -50,13 +60,13 @@ export const FloorPainter = (props, context) => {
{availableStyles.map((style) => (
-
+ act('select_style', { style: style })}
/>
@@ -68,9 +78,9 @@ export const FloorPainter = (props, context) => {