diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a200c6302c79d..c66e5c20b99ca 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -24,6 +24,7 @@ _build_dependencies.sh @AffectedArc07 # Executables that need to be security-cleared dreamchecker.exe @AffectedArc07 rustlibs.dll @AffectedArc07 +rustlibs_prod.dll @AffectedArc07 rust_g.dll @AffectedArc07 ### S34NW diff --git a/.github/workflows/build_rust.yml b/.github/workflows/build_rust.yml index 1292c93dcb5b4..6039d640df8e0 100644 --- a/.github/workflows/build_rust.yml +++ b/.github/workflows/build_rust.yml @@ -82,6 +82,10 @@ jobs: 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 + # Build the para-specific version + RUSTFLAGS='-C target-cpu=raptorlake' cargo build --release --target=i686-pc-windows-gnu + cp target/i686-pc-windows-gnu/release/rustlibs.dll ../rustlibs_prod.dll + git commit -a -m "Build Rust library" --allow-empty git push origin diff --git a/.github/workflows/render_nanomaps.yml b/.github/workflows/render_nanomaps.yml index b3c5fe188bc6e..1dd4b192fb944 100644 --- a/.github/workflows/render_nanomaps.yml +++ b/.github/workflows/render_nanomaps.yml @@ -6,7 +6,7 @@ name: 'Render Nanomaps' on: schedule: - - cron: "0 0 * * *" + - cron: '0 0 * * *' workflow_dispatch: jobs: @@ -14,36 +14,37 @@ jobs: name: 'Generate NanoMaps' runs-on: ubuntu-22.04 steps: - - id: create_token - uses: actions/create-github-app-token@v1 - with: - app-id: ${{ secrets.APP_ID }} - private-key: ${{ secrets.PRIVATE_KEY }} + - id: create_token + uses: actions/create-github-app-token@v1 + with: + app-id: ${{ secrets.APP_ID }} + private-key: ${{ secrets.PRIVATE_KEY }} - - run: echo "GH_TOKEN=${{ steps.create_token.outputs.token }}" >> "$GITHUB_ENV" + - run: echo "GH_TOKEN=${{ steps.create_token.outputs.token }}" >> "$GITHUB_ENV" - - name: 'Update Branch' - uses: actions/checkout@v4 - with: - token: ${{ steps.create_token.outputs.token }} + - name: 'Update Branch' + uses: actions/checkout@v4 + with: + token: ${{ steps.create_token.outputs.token }} - - name: Branch - run: | - git branch -f nanomap-render - git checkout nanomap-render - git reset --hard origin/master + - name: Branch + run: | + git branch -f nanomap-render + git checkout nanomap-render + git reset --hard origin/master - - name: 'Generate Maps' - run: './tools/github-actions/nanomap-renderer-invoker.sh' + - name: 'Generate Maps' + run: './tools/github-actions/nanomap-renderer-invoker.sh' - - name: 'Commit Maps and open PR' - run: | - git config --local user.email "action@github.com" - git config --local user.name "NanoMap Generation" - git pull origin master - git commit -m "NanoMap Auto-Update (`date`)" -a || true - git push -f -u origin nanomap-render - result=$(gh pr create -t "Automatic NanoMap Update" -b "This pull request updates the server NanoMaps. Please review the diff images before merging." -l "NanoMaps,:scroll: CL не требуется" -H "nanomap-render" -B "master") - if echo "$result" | grep -q "No commits between master and nanomap-render" - echo "No NanoMaps update required, skipping." - exit 78 + - name: 'Commit Maps and open PR' + run: | + git config --local user.email "action@github.com" + git config --local user.name "NanoMap Generation" + git pull origin master + git commit -m "NanoMap Auto-Update (`date`)" -a || true + git push -f -u origin nanomap-render + result=$(gh pr create -t "Automatic NanoMap Update" -b "This pull request updates the server NanoMaps. Please review the diff images before merging." -l "NanoMaps" -H "nanomap-render" -B "master" 2>&1) || true + echo "$result" + if echo "$result" | grep -q "No commits between master and nanomap-render"; then + echo "No NanoMaps update required, skipping." + fi diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql index 231681d8c3127..7346f59ea6e5d 100644 --- a/SQL/paradise_schema.sql +++ b/SQL/paradise_schema.sql @@ -280,6 +280,7 @@ CREATE TABLE `player` ( `default_slot` smallint(4) DEFAULT '1', `toggles` int(11) DEFAULT NULL, `toggles_2` int(11) DEFAULT NULL, + `toggles_3` int(11) DEFAULT NULL, `sound` mediumint(8) DEFAULT '31', `light` MEDIUMINT(3) NOT NULL DEFAULT '7', `glowlevel` TINYINT(1) NOT NULL DEFAULT '1', @@ -301,6 +302,7 @@ CREATE TABLE `player` ( `server_region` VARCHAR(32) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci', `muted_adminsounds_ckeys` MEDIUMTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci', `viewrange` VARCHAR(5) NOT NULL DEFAULT '19x15' COLLATE 'utf8mb4_general_ci', + `map_vote_pref_json` MEDIUMTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci', PRIMARY KEY (`id`), UNIQUE KEY `ckey` (`ckey`), KEY `lastseen` (`lastseen`), diff --git a/SQL/updates/60-61.sql b/SQL/updates/60-61.sql new file mode 100644 index 0000000000000..17dec8b4623d5 --- /dev/null +++ b/SQL/updates/60-61.sql @@ -0,0 +1,6 @@ +# Updates the DB from 60 to 61 ~Qwertytoforty +# Makes a table for map picks + +# Adds the table for it. +ALTER TABLE `player` + ADD COLUMN `map_vote_pref_json` MEDIUMTEXT NULL DEFAULT NULL AFTER `viewrange`; \ No newline at end of file diff --git a/SQL/updates/61-62.sql b/SQL/updates/61-62.sql new file mode 100644 index 0000000000000..b298a807c188e --- /dev/null +++ b/SQL/updates/61-62.sql @@ -0,0 +1,4 @@ +# Updating the SQL from version 61 to version 12. -AffectedArc07 +# Adds a new bitflag column for toggles + +ALTER TABLE `player` ADD COLUMN `toggles_3` INT NULL DEFAULT NULL AFTER `toggles_2`; diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_1.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_1.dmm deleted file mode 100644 index b3a1d6baffe3b..0000000000000 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_1.dmm +++ /dev/null @@ -1,46 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/simulated/wall/clockwork, -/area/lavaland/surface/outdoors/unexplored/danger) -"b" = ( -/turf/simulated/floor/clockwork/lavaland_air, -/area/lavaland/surface/outdoors/unexplored/danger) -"c" = ( -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) - -(1,1,1) = {" -c -a -b -a -c -"} -(2,1,1) = {" -c -c -b -c -c -"} -(3,1,1) = {" -c -c -b -c -c -"} -(4,1,1) = {" -c -c -b -c -c -"} -(5,1,1) = {" -c -a -b -a -c -"} diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_2.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_2.dmm deleted file mode 100644 index 60b50b4d18992..0000000000000 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_2.dmm +++ /dev/null @@ -1,46 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/simulated/wall/cult, -/area/lavaland/surface/outdoors/unexplored/danger) -"b" = ( -/turf/simulated/floor/engine/cult/lavaland_air, -/area/lavaland/surface/outdoors/unexplored/danger) -"c" = ( -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) - -(1,1,1) = {" -c -a -b -a -c -"} -(2,1,1) = {" -c -c -b -c -c -"} -(3,1,1) = {" -c -c -b -c -c -"} -(4,1,1) = {" -c -c -b -c -c -"} -(5,1,1) = {" -c -a -b -a -c -"} diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_3.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_3.dmm deleted file mode 100644 index 2d3360cc58007..0000000000000 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_3.dmm +++ /dev/null @@ -1,73 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/simulated/wall/cult, -/area/lavaland/surface/outdoors/unexplored/danger) -"b" = ( -/obj/structure/stone_tile/surrounding, -/obj/structure/stone_tile/center, -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"c" = ( -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"g" = ( -/obj/structure/stone_tile/slab/cracked, -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"h" = ( -/obj/structure/stone_tile/slab, -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"m" = ( -/obj/structure/stone_tile/block, -/obj/structure/stone_tile/block/cracked{ - dir = 1 - }, -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"o" = ( -/obj/structure/stone_tile/block{ - dir = 1 - }, -/obj/structure/stone_tile/burnt, -/obj/structure/stone_tile/surrounding_tile{ - dir = 8 - }, -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) - -(1,1,1) = {" -c -a -h -a -c -"} -(2,1,1) = {" -c -c -m -c -c -"} -(3,1,1) = {" -c -c -b -c -c -"} -(4,1,1) = {" -c -c -o -c -c -"} -(5,1,1) = {" -c -a -g -a -c -"} diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_4.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_4.dmm deleted file mode 100644 index 272dfcd1246bd..0000000000000 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_4.dmm +++ /dev/null @@ -1,49 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/simulated/wall/indestructible/hierophant, -/area/lavaland/surface/outdoors/unexplored/danger) -"b" = ( -/turf/simulated/floor/indestructible/hierophant, -/area/lavaland/surface/outdoors/unexplored/danger) -"c" = ( -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"o" = ( -/turf/simulated/floor/indestructible/hierophant/two, -/area/lavaland/surface/outdoors/unexplored/danger) - -(1,1,1) = {" -c -a -b -a -c -"} -(2,1,1) = {" -c -c -b -c -c -"} -(3,1,1) = {" -c -c -o -c -c -"} -(4,1,1) = {" -c -c -b -c -c -"} -(5,1,1) = {" -c -a -b -a -c -"} diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_5.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_5.dmm deleted file mode 100644 index 954adedd9c4bb..0000000000000 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_5.dmm +++ /dev/null @@ -1,50 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/simulated/wall/mineral/wood/nonmetal, -/area/lavaland/surface/outdoors/unexplored/danger) -"b" = ( -/turf/simulated/floor/wood/lavaland_air, -/area/lavaland/surface/outdoors/unexplored/danger) -"c" = ( -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"v" = ( -/obj/effect/landmark/damageturf, -/turf/simulated/floor/wood/lavaland_air, -/area/lavaland/surface/outdoors/unexplored/danger) - -(1,1,1) = {" -c -a -v -a -c -"} -(2,1,1) = {" -c -c -b -c -c -"} -(3,1,1) = {" -c -c -b -c -c -"} -(4,1,1) = {" -c -c -v -c -c -"} -(5,1,1) = {" -c -a -b -a -c -"} diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_6.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_6.dmm deleted file mode 100644 index 2cfe9bd744641..0000000000000 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_6.dmm +++ /dev/null @@ -1,49 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/obj/structure/lattice/catwalk/mining, -/obj/structure/marker_beacon/dock_marker/collision, -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"b" = ( -/obj/structure/lattice/catwalk/mining, -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"c" = ( -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) - -(1,1,1) = {" -c -a -b -a -c -"} -(2,1,1) = {" -c -c -b -c -c -"} -(3,1,1) = {" -c -c -b -c -c -"} -(4,1,1) = {" -c -c -b -c -c -"} -(5,1,1) = {" -c -a -b -a -c -"} diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_1.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_1.dmm deleted file mode 100644 index dca66633eba89..0000000000000 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_1.dmm +++ /dev/null @@ -1,46 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/simulated/wall/clockwork, -/area/lavaland/surface/outdoors/unexplored/danger) -"b" = ( -/turf/simulated/floor/clockwork/lavaland_air, -/area/lavaland/surface/outdoors/unexplored/danger) -"c" = ( -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) - -(1,1,1) = {" -c -c -c -c -c -"} -(2,1,1) = {" -a -c -c -c -a -"} -(3,1,1) = {" -b -b -b -b -b -"} -(4,1,1) = {" -a -c -c -c -a -"} -(5,1,1) = {" -c -c -c -c -c -"} diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_2.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_2.dmm deleted file mode 100644 index 02fd1e0a69f90..0000000000000 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_2.dmm +++ /dev/null @@ -1,46 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/simulated/wall/cult, -/area/lavaland/surface/outdoors/unexplored/danger) -"b" = ( -/turf/simulated/floor/engine/cult/lavaland_air, -/area/lavaland/surface/outdoors/unexplored/danger) -"c" = ( -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) - -(1,1,1) = {" -c -c -c -c -c -"} -(2,1,1) = {" -a -c -c -c -a -"} -(3,1,1) = {" -b -b -b -b -b -"} -(4,1,1) = {" -a -c -c -c -a -"} -(5,1,1) = {" -c -c -c -c -c -"} diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_3.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_3.dmm deleted file mode 100644 index 8fbfe6ba32e62..0000000000000 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_3.dmm +++ /dev/null @@ -1,83 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/simulated/wall/cult, -/area/lavaland/surface/outdoors/unexplored/danger) -"b" = ( -/obj/structure/stone_tile/slab, -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"c" = ( -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"w" = ( -/obj/structure/stone_tile/center/cracked, -/obj/structure/stone_tile/surrounding/cracked, -/obj/structure/stone_tile/slab/cracked{ - dir = 10 - }, -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"I" = ( -/obj/structure/stone_tile, -/obj/structure/stone_tile{ - dir = 4 - }, -/obj/structure/stone_tile{ - dir = 8 - }, -/obj/structure/stone_tile/cracked{ - dir = 1 - }, -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"M" = ( -/obj/structure/stone_tile/slab/cracked{ - dir = 5 - }, -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"R" = ( -/obj/structure/stone_tile/block/cracked{ - dir = 8 - }, -/obj/structure/stone_tile/block{ - dir = 4 - }, -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) - -(1,1,1) = {" -c -c -c -c -c -"} -(2,1,1) = {" -a -c -c -c -a -"} -(3,1,1) = {" -b -I -w -R -M -"} -(4,1,1) = {" -a -c -c -c -a -"} -(5,1,1) = {" -c -c -c -c -c -"} diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_4.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_4.dmm deleted file mode 100644 index 7c187f4aeecc1..0000000000000 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_4.dmm +++ /dev/null @@ -1,49 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/simulated/floor/indestructible/hierophant/two, -/area/lavaland/surface/outdoors/unexplored/danger) -"b" = ( -/turf/simulated/floor/indestructible/hierophant, -/area/lavaland/surface/outdoors/unexplored/danger) -"c" = ( -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"y" = ( -/turf/simulated/wall/indestructible/hierophant, -/area/lavaland/surface/outdoors/unexplored/danger) - -(1,1,1) = {" -c -c -c -c -c -"} -(2,1,1) = {" -y -c -c -c -y -"} -(3,1,1) = {" -a -a -b -a -a -"} -(4,1,1) = {" -y -c -c -c -y -"} -(5,1,1) = {" -c -c -c -c -c -"} diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_5.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_5.dmm deleted file mode 100644 index 588567999bff4..0000000000000 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_5.dmm +++ /dev/null @@ -1,50 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/simulated/floor/wood/lavaland_air, -/area/lavaland/surface/outdoors/unexplored/danger) -"b" = ( -/obj/effect/landmark/damageturf, -/turf/simulated/floor/wood/lavaland_air, -/area/lavaland/surface/outdoors/unexplored/danger) -"c" = ( -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"y" = ( -/turf/simulated/wall/mineral/wood, -/area/lavaland/surface/outdoors/unexplored/danger) - -(1,1,1) = {" -c -c -c -c -c -"} -(2,1,1) = {" -y -c -c -c -y -"} -(3,1,1) = {" -b -a -b -a -b -"} -(4,1,1) = {" -y -c -c -c -y -"} -(5,1,1) = {" -c -c -c -c -c -"} diff --git a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_6.dmm b/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_6.dmm deleted file mode 100644 index ae47effe5fc8c..0000000000000 --- a/_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_6.dmm +++ /dev/null @@ -1,49 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/obj/structure/lattice/catwalk/mining, -/obj/structure/marker_beacon/dock_marker, -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"b" = ( -/obj/structure/lattice/catwalk/mining, -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) -"c" = ( -/turf/template_noop, -/area/lavaland/surface/outdoors/unexplored/danger) - -(1,1,1) = {" -c -c -c -c -c -"} -(2,1,1) = {" -b -c -c -c -b -"} -(3,1,1) = {" -b -a -b -a -b -"} -(4,1,1) = {" -b -c -c -c -b -"} -(5,1,1) = {" -c -c -c -c -c -"} diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm index 3ff7e1339bef0..2ee5cb133710c 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm @@ -169,7 +169,7 @@ /turf/simulated/floor/wood, /area/ruin/powered/snow_cabin) "aL" = ( -/obj/mecha/working/ripley/mining, +/obj/mecha/working/ripley/mining/old, /turf/simulated/floor/wood, /area/ruin/powered/snow_cabin) "aM" = ( 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 83aa2d85df09a..0d7ed5db1878d 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm @@ -1,12 +1,12 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ab" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/ruin/unpowered/althland_excavation) "ac" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "ad" = ( @@ -19,7 +19,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/railing/corner, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/stripes/corner, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/pod/light/lavaland_air{ @@ -90,7 +90,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "an" = ( @@ -211,7 +211,7 @@ /area/lavaland/surface/outdoors) "aE" = ( /obj/structure/mecha_wreckage/ripley/firefighter, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "aG" = ( @@ -238,7 +238,7 @@ /area/lavaland/surface/outdoors) "aK" = ( /obj/structure/sign/explosives, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/ruin/unpowered/althland_excavation) "aL" = ( @@ -254,7 +254,7 @@ /area/lavaland/surface/outdoors) "aN" = ( /obj/structure/railing, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, @@ -267,7 +267,7 @@ "aR" = ( /obj/structure/railing, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/pod/light/lavaland_air{ @@ -293,7 +293,7 @@ /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "aZ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, @@ -420,7 +420,7 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -449,7 +449,7 @@ "bJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "bK" = ( @@ -558,7 +558,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -595,7 +595,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/human, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "eC" = ( @@ -609,7 +609,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "eX" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "fc" = ( @@ -627,7 +627,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/human, /obj/machinery/atmospherics/portable/scrubber, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "gg" = ( @@ -642,7 +642,7 @@ /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "gF" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/sheet/metal, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, @@ -672,7 +672,7 @@ /obj/structure/grille/broken, /obj/item/shard, /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -710,7 +710,7 @@ /area/lavaland/surface/outdoors) "jL" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/sheet/metal, /turf/simulated/floor/pod/light/lavaland_air{ oxygen = 0; @@ -719,7 +719,7 @@ /area/ruin/unpowered/althland_excavation) "jS" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/sheet/metal, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) @@ -762,7 +762,7 @@ /area/ruin/unpowered/althland_excavation) "mh" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -779,8 +779,8 @@ /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "nw" = ( -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/ruin/unpowered/althland_excavation) "nU" = ( @@ -804,7 +804,7 @@ /obj/structure/urinal{ pixel_y = 32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "pE" = ( @@ -817,7 +817,7 @@ /area/ruin/unpowered/althland_excavation) "pI" = ( /obj/item/stack/sheet/metal, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "qa" = ( @@ -862,7 +862,7 @@ /area/ruin/unpowered/althland_excavation) "si" = ( /obj/structure/sign/explosives/alt, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/ruin/unpowered/althland_excavation) "sj" = ( @@ -871,7 +871,7 @@ "sA" = ( /obj/structure/railing, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -889,14 +889,14 @@ "ub" = ( /obj/structure/railing, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "ui" = ( /obj/item/storage/toolbox/syndicate, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "uA" = ( @@ -908,7 +908,7 @@ "uG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -933,7 +933,7 @@ /obj/structure/railing, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -941,7 +941,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/drinks/oilcan, -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /turf/simulated/floor/pod/light/lavaland_air{ oxygen = 0; nitrogen = 0 @@ -964,7 +964,7 @@ /area/lavaland/surface/outdoors) "xf" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/pod/light/lavaland_air{ oxygen = 0; @@ -988,7 +988,7 @@ /area/lavaland/surface/outdoors) "yb" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "yc" = ( @@ -1001,7 +1001,7 @@ /area/lavaland/surface/outdoors) "yn" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/pod/light/lavaland_air{ oxygen = 0; @@ -1055,7 +1055,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -1110,7 +1110,7 @@ "DS" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "Ec" = ( @@ -1133,7 +1133,7 @@ "Et" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/door_assembly/door_assembly_ext, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) @@ -1186,7 +1186,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -1204,7 +1204,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/human, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -1230,13 +1230,13 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "JG" = ( /obj/structure/girder/reinforced, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "KU" = ( @@ -1264,7 +1264,7 @@ /area/ruin/unpowered/althland_excavation) "LK" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/sheet/metal, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/pod/light/lavaland_air{ @@ -1281,14 +1281,14 @@ /obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "Nv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/pod/light/lavaland_air{ oxygen = 0; nitrogen = 0 @@ -1321,7 +1321,7 @@ /obj/structure/toilet{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "PC" = ( @@ -1359,7 +1359,7 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -1393,7 +1393,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/human, /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "RW" = ( @@ -1414,19 +1414,19 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "TN" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/ruin/unpowered/althland_excavation) "TP" = ( /obj/structure/railing/corner{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -1435,7 +1435,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -1503,7 +1503,7 @@ /area/ruin/unpowered/althland_excavation) "Xl" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/pod/light/lavaland_air{ oxygen = 0; nitrogen = 0 @@ -1513,11 +1513,11 @@ /obj/structure/noticeboard{ pixel_y = 28 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_excavation) "XS" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/lavaland/surface/outdoors) "Ya" = ( 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 9c204680046b6..e766b75b41868 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -39,7 +39,7 @@ pixel_y = -9; pixel_x = -6 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/disposalpipe/segment/corner{ dir = 1 }, @@ -63,7 +63,7 @@ /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "be" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/lavaland/surface/outdoors) "bL" = ( @@ -128,7 +128,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dq" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /obj/effect/mapping_helpers/no_lava, /turf/simulated/wall/r_wall, /area/lavaland/surface/outdoors) @@ -157,7 +157,7 @@ "fc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "fd" = ( @@ -217,12 +217,12 @@ "fY" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) "gb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/disposalpipe/segment{ dir = 4; invisibility = 101 @@ -242,7 +242,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "gF" = ( @@ -252,7 +252,7 @@ /area/ruin/unpowered/althland_processing) "hc" = ( /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/ruin/unpowered/althland_processing) "hj" = ( @@ -277,11 +277,11 @@ /obj/machinery/atmospherics/binary/pump{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) "hI" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/lavaland/surface/outdoors) "hP" = ( @@ -339,7 +339,7 @@ /obj/machinery/light_construct/small{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) "kn" = ( @@ -443,14 +443,14 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "pQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -464,7 +464,7 @@ "qn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /obj/structure/disposalpipe/segment{ dir = 4; @@ -483,7 +483,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) @@ -497,8 +497,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) @@ -518,7 +518,7 @@ /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "sg" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -529,7 +529,7 @@ /obj/item/stack/sheet/metal{ amount = 5 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -546,7 +546,7 @@ "to" = ( /obj/structure/marker_beacon/dock_marker, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -554,7 +554,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) @@ -589,21 +589,21 @@ /area/ruin/unpowered/althland_processing) "ub" = ( /obj/item/clothing/under/rank/cargo/miner, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) "uf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) "ui" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/ruin/unpowered/althland_processing) "um" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/ruin/unpowered/althland_processing) "uC" = ( @@ -617,7 +617,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/item/rack_parts, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) "vf" = ( @@ -627,8 +627,8 @@ pixel_x = 33 }, /obj/machinery/atmospherics/portable/canister/air, -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) "vl" = ( @@ -652,7 +652,7 @@ "vM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, @@ -667,7 +667,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/economy/vending/chinese, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) @@ -694,7 +694,7 @@ /obj/machinery/light_construct/small{ dir = 8 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /mob/living/simple_animal/hostile/asteroid/hivelord/legion, /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) @@ -709,7 +709,7 @@ "zE" = ( /obj/effect/decal/cleanable/dirt, /obj/item/pickaxe, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/disposalpipe/segment{ dir = 4; invisibility = 101 @@ -723,13 +723,13 @@ /obj/machinery/light_construct/small{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /mob/living/simple_animal/hostile/asteroid/hivelord/legion, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "zO" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, @@ -751,7 +751,7 @@ /area/ruin/unpowered/althland_processing) "Az" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/door_assembly/door_assembly_mhatch, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) @@ -766,14 +766,14 @@ /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "AH" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "AL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -788,20 +788,20 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "BM" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "BV" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "BX" = ( @@ -812,7 +812,7 @@ pixel_y = 31 }, /obj/item/clothing/under/rank/cargo/miner, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) "CF" = ( @@ -863,8 +863,8 @@ "DM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) @@ -890,14 +890,14 @@ /obj/structure/disposalpipe/segment/corner{ dir = 2 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "Fa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "Fd" = ( @@ -939,7 +939,7 @@ /area/ruin/unpowered/althland_processing) "Ge" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/disposalpipe/segment{ dir = 4; invisibility = 101 @@ -957,7 +957,7 @@ "Gt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) @@ -1014,7 +1014,7 @@ /area/ruin/unpowered/althland_processing) "In" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "Io" = ( @@ -1059,8 +1059,8 @@ "KJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/portable/scrubber, /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) @@ -1069,7 +1069,7 @@ dir = 4; invisibility = 101 }, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/ruin/unpowered/althland_processing) "KT" = ( @@ -1105,11 +1105,11 @@ /obj/machinery/light_construct/small{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) "LA" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) @@ -1146,7 +1146,7 @@ /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) "MY" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -1167,8 +1167,8 @@ "OJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "OW" = ( @@ -1179,7 +1179,7 @@ /area/ruin/unpowered/althland_processing) "Pn" = ( /obj/structure/disposalpipe/segment, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "Po" = ( @@ -1229,7 +1229,7 @@ /obj/item/stack/sheet/metal{ amount = 5 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "RX" = ( @@ -1247,16 +1247,16 @@ pixel_y = 31 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) "Tn" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /obj/effect/mapping_helpers/no_lava, /turf/simulated/wall/r_wall, /area/lavaland/surface/outdoors) "TN" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, @@ -1269,14 +1269,14 @@ /area/ruin/unpowered/althland_processing) "Uq" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "UP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/disposalpipe/segment{ dir = 4; invisibility = 101 @@ -1295,7 +1295,7 @@ "VA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -1321,7 +1321,7 @@ /obj/structure/closet/crate, /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/workboots/mining, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/mounted/frame/apc_frame{ pixel_x = -3; pixel_y = 28 @@ -1337,7 +1337,7 @@ /obj/item/shard, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/glass, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, @@ -1373,7 +1373,7 @@ /obj/effect/decal/remains/human, /obj/item/clothing/under/rank/cargo/miner, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/lavaland_air, /area/lavaland/surface/outdoors) @@ -1381,7 +1381,7 @@ /obj/item/shard, /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) @@ -1390,8 +1390,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/light_construct/small, -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) @@ -1428,7 +1428,7 @@ /area/ruin/unpowered/althland_processing) "YK" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/lavaland_air, /area/ruin/unpowered/althland_processing) "YN" = ( @@ -1443,8 +1443,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "Zr" = ( @@ -1474,7 +1474,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/althland_processing) "ZN" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm index efea997765434..a235533119b5b 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm @@ -9,7 +9,7 @@ /turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "d" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/powered/envy) "e" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm index 89e6e5f92d594..48d956fc429cf 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm @@ -9,9 +9,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "d" = ( -/obj/mecha/working/ripley/mining{ - ruin_mecha = 1 - }, +/obj/mecha/working/ripley/mining/old, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "e" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_shuttlecrash.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_shuttlecrash.dmm index 7914ee1fcda74..1827a23d78ffe 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_shuttlecrash.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_shuttlecrash.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "bm" = ( -/obj/effect/landmark/burnturf, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "titanium_blue" }, @@ -42,8 +42,8 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/unpowered/misc_lavaruin) "en" = ( -/obj/effect/landmark/burnturf, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/dirt/maybe, /obj/item/reagent_containers/hypospray/autoinjector{ name = "emergency autoinjector"; icon_state = "autoinjector0" @@ -56,7 +56,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/ruin/unpowered/misc_lavaruin) "eG" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/glass, /obj/item/stack/rods, /obj/item/airlock_electronics, @@ -70,7 +70,7 @@ }, /area/ruin/unpowered/misc_lavaruin) "ge" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/blood, /obj/item/cigbutt, /turf/simulated/floor/plasteel/lavaland_air{ @@ -84,7 +84,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/unpowered/misc_lavaruin) "hb" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/ruin/unpowered/misc_lavaruin) "hK" = ( @@ -113,7 +113,7 @@ }, /area/ruin/unpowered/misc_lavaruin) "kv" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/flashlight/flare, /turf/simulated/floor/plating, /area/ruin/unpowered/misc_lavaruin) @@ -129,7 +129,7 @@ /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "mN" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface{ icon_state = "basalt_dug" @@ -143,7 +143,7 @@ /turf/simulated/floor/mineral/titanium, /area/ruin/unpowered/misc_lavaruin) "oD" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/storage/briefcase{ pixel_x = 3; pixel_y = -5 @@ -181,14 +181,14 @@ dir = 8 }, /mob/living/simple_animal/hostile/asteroid/hivelord/legion, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "titanium_blue" }, /area/ruin/unpowered/misc_lavaruin) "sa" = ( -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/molten_object, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/misc_lavaruin) @@ -217,7 +217,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "titanium_blue" }, @@ -237,14 +237,14 @@ /turf/simulated/floor/mineral/titanium/blue, /area/ruin/unpowered/misc_lavaruin) "uQ" = ( -/obj/effect/landmark/burnturf, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "titanium" }, /area/ruin/unpowered/misc_lavaruin) "vA" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/window/reinforced{ dir = 1 }, @@ -274,7 +274,7 @@ dir = 8 }, /obj/effect/mob_spawn/human/corpse/skeleton, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "titanium_blue" }, @@ -336,7 +336,7 @@ }, /area/lavaland/surface/outdoors) "Ax" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/closet/crate/can, /obj/item/paper/crumpled, /turf/simulated/floor/mineral/titanium/blue, @@ -369,8 +369,8 @@ /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "Ca" = ( -/obj/effect/landmark/burnturf, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "Dt" = ( @@ -396,7 +396,7 @@ /turf/simulated/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) "FN" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "FO" = ( @@ -416,7 +416,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "HJ" = ( @@ -434,7 +434,7 @@ }, /area/lavaland/surface/outdoors) "IL" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/window/reinforced, /obj/item/c_tube, /obj/item/flashlight, @@ -442,7 +442,7 @@ /area/ruin/unpowered/misc_lavaruin) "IQ" = ( /obj/item/stack/sheet/metal, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/decal/cleanable/ash, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/misc_lavaruin) @@ -484,15 +484,15 @@ /turf/simulated/floor/plating, /area/ruin/unpowered/misc_lavaruin) "Mf" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "titanium" }, /area/ruin/unpowered/misc_lavaruin) "My" = ( /obj/machinery/door/airlock/public, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/oil/maybe, /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/ruin/unpowered/misc_lavaruin) @@ -504,7 +504,7 @@ /turf/simulated/floor/plating, /area/ruin/unpowered/misc_lavaruin) "MS" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "titanium_blue" }, @@ -521,12 +521,12 @@ /turf/simulated/wall/mineral/titanium/nodiagonal, /area/ruin/unpowered/misc_lavaruin) "Oq" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/ruin/unpowered/misc_lavaruin) "Oz" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/largecrate, /obj/structure/window/reinforced, /turf/simulated/floor/plating, @@ -563,11 +563,11 @@ /area/lavaland/surface/outdoors) "RP" = ( /obj/machinery/door/airlock/public, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/misc_lavaruin) "Sd" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/decal/cleanable/ash, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/misc_lavaruin) @@ -584,7 +584,7 @@ }, /area/lavaland/surface/outdoors) "Tb" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/ash, /obj/item/storage/box/survival, /obj/structure/window/reinforced{ @@ -631,15 +631,15 @@ }, /area/ruin/unpowered/misc_lavaruin) "Uz" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "titanium_blue" }, /area/ruin/unpowered/misc_lavaruin) "UV" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/stack/rods, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating/lavaland_air, /area/ruin/unpowered/misc_lavaruin) "Vs" = ( @@ -680,7 +680,7 @@ }, /area/lavaland/surface/outdoors) "Yg" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/unpowered/misc_lavaruin) "Yi" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm index fc8f789a5413d..b7833525cf872 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm @@ -86,7 +86,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 8 }, -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/ruin/space/abandoned_engi_sat) "dk" = ( @@ -192,7 +192,7 @@ d2 = 4 }, /obj/machinery/power/apc/off_station/empty_charge/directional/south, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/abandoned_engi_sat) "fA" = ( @@ -228,7 +228,7 @@ }, /area/ruin/space/abandoned_engi_sat) "gL" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel, /area/ruin/space/abandoned_engi_sat) "hy" = ( @@ -238,7 +238,7 @@ pixel_x = 25 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/ruin/space/abandoned_engi_sat) "hB" = ( @@ -257,7 +257,7 @@ mode = 0; pixel_y = 32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/abandoned_engi_sat) "iO" = ( @@ -271,7 +271,7 @@ /turf/simulated/floor/plating, /area/ruin/space/abandoned_engi_sat) "iV" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/ruin/space/abandoned_engi_sat) "jk" = ( @@ -288,7 +288,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/abandoned_engi_sat) "jG" = ( @@ -307,7 +307,7 @@ mode = 0; pixel_y = 32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/abandoned_engi_sat) "jS" = ( @@ -321,7 +321,7 @@ /turf/simulated/floor/plasteel, /area/ruin/space/abandoned_engi_sat) "kd" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/ruin/space/abandoned_engi_sat) "kg" = ( @@ -329,13 +329,13 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/ruin/space/abandoned_engi_sat) "kt" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/ruin/space/abandoned_engi_sat) "kw" = ( @@ -370,7 +370,7 @@ /area/ruin/space/abandoned_engi_sat) "kT" = ( /obj/structure/mirror, -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/ruin/space/abandoned_engi_sat) "kZ" = ( @@ -500,7 +500,7 @@ /turf/simulated/floor/plating, /area/ruin/space/abandoned_engi_sat) "nn" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/ruin/space/abandoned_engi_sat) "nH" = ( @@ -526,7 +526,7 @@ /turf/simulated/floor/plasteel, /area/ruin/space/abandoned_engi_sat) "oL" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/space/abandoned_engi_sat) "oW" = ( @@ -561,7 +561,7 @@ /area/ruin/space/abandoned_engi_sat) "pM" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -571,7 +571,7 @@ /turf/simulated/floor/wood/airless, /area/ruin/space/abandoned_engi_sat) "qu" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/ruin/space/abandoned_engi_sat) "rn" = ( @@ -655,7 +655,7 @@ /area/ruin/space/abandoned_engi_sat) "to" = ( /obj/effect/turf_decal/stripes/line, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -804,7 +804,7 @@ /area/ruin/space/abandoned_engi_sat) "yE" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/abandoned_engi_sat) "yJ" = ( @@ -925,7 +925,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 4 }, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/ruin/space/abandoned_engi_sat) "Dj" = ( @@ -943,7 +943,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel, /area/ruin/space/abandoned_engi_sat) "DO" = ( @@ -979,7 +979,7 @@ }, /area/ruin/space/abandoned_engi_sat) "EU" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/ruin/space/abandoned_engi_sat) "Fm" = ( @@ -1083,7 +1083,7 @@ /area/ruin/space/abandoned_engi_sat) "Iz" = ( /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/ruin/space/abandoned_engi_sat) "IC" = ( @@ -1107,7 +1107,7 @@ }, /area/ruin/space/abandoned_engi_sat) "IM" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/ruin/space/abandoned_engi_sat) "Jo" = ( @@ -1171,7 +1171,7 @@ /turf/simulated/floor/plating, /area/ruin/space/abandoned_engi_sat) "NM" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plasteel{ icon_state = "delivery" }, @@ -1309,7 +1309,7 @@ }, /area/ruin/space/abandoned_engi_sat) "Ro" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light_switch{ dir = 1; pixel_y = -24; @@ -1491,7 +1491,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/ruin/space/abandoned_engi_sat) "ZA" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm index 98f108eed4316..9089c4f18f227 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm @@ -253,7 +253,7 @@ /turf/simulated/wall/r_wall, /area/ruin/space/tcommsat) "ot" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/ruin/space/tcommsat) "oZ" = ( @@ -693,7 +693,7 @@ /turf/simulated/floor/plasteel, /area/ruin/space/tcommsat) "Sp" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/tcommsat) "St" = ( @@ -845,7 +845,7 @@ /turf/simulated/wall/r_wall, /area/ruin/space/tcommsat) "YZ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/door_assembly/door_assembly_hatch, /turf/simulated/floor/plating/airless, /area/ruin/space/tcommsat) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm b/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm index e6788fd772a38..33830863b59d5 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm @@ -129,7 +129,7 @@ /turf/simulated/floor/plating, /area/ruin/space/powered/casino/maints) "dd" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/ruin/space/powered/casino/maints) "dg" = ( @@ -173,7 +173,7 @@ /turf/simulated/floor/plating, /area/ruin/space/powered/casino/kitchen) "eu" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/rack, /turf/simulated/floor/plating, /area/ruin/space/powered/casino/security) @@ -464,7 +464,7 @@ /turf/space, /area/space) "ky" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/machinery/economy/vending/coffee, /turf/simulated/floor/plating, /area/ruin/space/powered/casino/maints) @@ -558,7 +558,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/powered/casino/arrivals) "mW" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/ruin/space/powered/casino/kitchen) "no" = ( @@ -699,7 +699,7 @@ }, /area/ruin/space/powered/casino/arrivals) "qK" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -811,7 +811,7 @@ /area/ruin/space/powered/casino/docked_ships) "vf" = ( /obj/structure/grille/broken, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/ruin/space/powered/casino/maints) "vh" = ( @@ -1010,7 +1010,7 @@ /turf/simulated/floor/mineral/silver, /area/ruin/space/powered/casino/hall) "yV" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/wall/mineral/iron, /area/ruin/space/powered/casino/security) "zg" = ( @@ -1059,7 +1059,7 @@ /turf/simulated/floor/wood, /area/ruin/space/powered/casino/kitchen) "AM" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/light/small{ dir = 4 }, @@ -1103,7 +1103,7 @@ /area/ruin/space/powered/casino/kitchen) "Cp" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/powered/casino/security) "Cr" = ( @@ -1124,7 +1124,7 @@ /turf/simulated/floor/mineral/silver, /area/ruin/space/powered/casino/hall) "CH" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/largecrate, /turf/simulated/floor/plating, /area/ruin/space/powered/casino/maints) @@ -1167,7 +1167,7 @@ /turf/simulated/floor/plating, /area/ruin/space/powered/casino/floor) "DJ" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /mob/living/simple_animal/hostile/pirate, /turf/simulated/floor/plating, /area/ruin/space/powered/casino/maints) @@ -1225,7 +1225,7 @@ /area/ruin/space/powered/casino/arrivals) "EZ" = ( /obj/machinery/door/airlock/maintenance, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/ruin/space/powered/casino/maints) "Fk" = ( @@ -1271,7 +1271,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/powered/casino/teleporter) "GP" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/ruin/space/powered/casino/maints) "GX" = ( @@ -1406,7 +1406,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/powered/casino/security) "KV" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/ruin/space/powered/casino/engine) "LI" = ( @@ -1456,7 +1456,7 @@ /turf/simulated/floor/carpet/black, /area/ruin/space/powered/casino/floor) "Oc" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/closet/crate/can, /turf/simulated/floor/plating, /area/ruin/space/powered/casino/security) @@ -1491,7 +1491,7 @@ /turf/simulated/floor/plating, /area/ruin/space/powered/casino/floor) "OU" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -1692,7 +1692,7 @@ /turf/space, /area/space) "TO" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/powered/casino/maints) "TV" = ( @@ -1815,7 +1815,7 @@ /turf/simulated/floor/plating, /area/ruin/space/powered/casino/arrivals) "VI" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -1835,7 +1835,7 @@ /turf/simulated/floor/wood, /area/ruin/space/powered/casino/kitchen) "VW" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/ruin/space/powered/casino/security) "We" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm index 639b40f053828..882d158d4aedb 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm @@ -3,7 +3,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "aU" = ( @@ -16,7 +16,7 @@ /area/ruin/space/powered) "bM" = ( /obj/effect/spawner/window/shuttle, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "cz" = ( @@ -25,8 +25,8 @@ /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "cB" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/burnturf, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/clown_mime_ruin) "cD" = ( @@ -52,7 +52,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/clown_mime_ruin) "ex" = ( @@ -65,7 +65,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/clown_mime_ruin) "fo" = ( @@ -95,7 +95,7 @@ /turf/simulated/floor/mineral/titanium, /area/ruin/space/clown_mime_ruin) "hk" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/clothing/head/helmet/space/eva/clown, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) @@ -107,7 +107,7 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/clown_mime_ruin) "hz" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/titanium, /area/ruin/space/clown_mime_ruin) "hC" = ( @@ -147,14 +147,14 @@ /area/ruin/space/clown_mime_ruin) "ik" = ( /obj/item/stack/sheet/wood, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "in" = ( /obj/effect/mob_spawn/human/corpse/clown, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/clown_mime_ruin) "iK" = ( @@ -186,7 +186,7 @@ /area/ruin/space/clown_mime_ruin) "lS" = ( /obj/machinery/light, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/titanium, /area/ruin/space/clown_mime_ruin) "me" = ( @@ -198,7 +198,7 @@ "mp" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/mob_spawn/human/corpse/mime, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "mG" = ( @@ -226,7 +226,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/clown_mime_ruin) "nL" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/clown_mime_ruin) "nN" = ( @@ -246,19 +246,19 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "on" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/burnturf, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "pj" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/sheet/wood, /obj/machinery/light{ dir = 1 @@ -314,21 +314,21 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "qV" = ( /obj/machinery/atmospherics/unary/tank/toxins{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "qW" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "rg" = ( @@ -344,7 +344,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "rR" = ( @@ -367,7 +367,7 @@ dir = 1 }, /obj/effect/mob_spawn/human/corpse/mime, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "sZ" = ( @@ -395,12 +395,12 @@ /turf/simulated/wall/mineral/plastitanium/interior, /area/ruin/space/powered) "ub" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "uE" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/mob_spawn/human/corpse/mime{ name = "Mime Pilot" }, @@ -408,7 +408,7 @@ /area/ruin/space/powered) "vu" = ( /obj/effect/decal/cleanable/blood/gibs/robot, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/titanium, /area/ruin/space/clown_mime_ruin) "vz" = ( @@ -418,15 +418,15 @@ /obj/effect/mob_spawn/human/corpse/clown{ name = "Clown Pilot" }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/titanium, /area/ruin/space/clown_mime_ruin) "wb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "wp" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "wL" = ( @@ -464,9 +464,9 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "xm" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mob_spawn/human/corpse/clown, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "xB" = ( @@ -487,12 +487,12 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/clown_mime_ruin) "zy" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/gun/energy/clown, /turf/simulated/floor/mineral/titanium, /area/ruin/space/clown_mime_ruin) "zz" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/largecrate, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) @@ -540,14 +540,14 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/clown_mime_ruin) "Bb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "BE" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "BW" = ( @@ -558,7 +558,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/tranquillite, /area/ruin/space/powered) "Ca" = ( @@ -568,7 +568,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/powered) "Cs" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/titanium, /area/ruin/space/clown_mime_ruin) "Dj" = ( @@ -600,7 +600,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "EQ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -619,7 +619,7 @@ /turf/simulated/wall/mineral/titanium/interior, /area/ruin/space/clown_mime_ruin) "Fq" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -629,8 +629,8 @@ /area/ruin/space/clown_mime_ruin) "FW" = ( /obj/effect/mob_spawn/human/corpse/mime, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/burnturf, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/titanium, /area/ruin/space/clown_mime_ruin) "Gq" = ( @@ -641,20 +641,20 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/clown_mime_ruin) "Gx" = ( -/obj/effect/landmark/damageturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "GS" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "Ht" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/burnturf, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/titanium, /area/ruin/space/clown_mime_ruin) "HP" = ( @@ -674,7 +674,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "IU" = ( @@ -682,7 +682,7 @@ /turf/simulated/floor/mineral/bananium, /area/ruin/space/powered) "Ke" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -702,9 +702,9 @@ /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "LC" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/mob_spawn/human/corpse/clown/officer, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/titanium, /area/ruin/space/clown_mime_ruin) "LF" = ( @@ -721,12 +721,12 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/clown_mime_ruin) "MI" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/clown_mime_ruin) "MP" = ( /obj/machinery/atmospherics/pipe/manifold/visible, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "NL" = ( @@ -739,15 +739,15 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/titanium, /area/ruin/space/clown_mime_ruin) "Oz" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/tranquillite, /area/ruin/space/powered) "OK" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/titanium, /area/ruin/space/clown_mime_ruin) "Pt" = ( @@ -775,12 +775,12 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "TC" = ( -/obj/effect/landmark/damageturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/stack/sheet/wood, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) @@ -788,7 +788,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "UC" = ( @@ -802,7 +802,7 @@ /area/ruin/space/powered) "Vh" = ( /obj/effect/turf_decal/stripes/line, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "Vo" = ( @@ -812,18 +812,18 @@ /turf/simulated/floor/mineral/bananium, /area/ruin/space/powered) "Vq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "VH" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/clothing/head/helmet/space/eva/mime, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "VL" = ( /obj/effect/mob_spawn/human/corpse/mime, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "Wh" = ( @@ -835,8 +835,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/landmark/burnturf, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/titanium, /area/ruin/space/clown_mime_ruin) "Xi" = ( @@ -850,13 +850,13 @@ /area/ruin/space/powered) "Xu" = ( /obj/effect/mob_spawn/human/corpse/mime, -/obj/effect/landmark/damageturf, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "Yq" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -867,8 +867,8 @@ "YN" = ( /obj/effect/decal/cleanable/blood/slime, /obj/effect/mob_spawn/human/corpse/clown, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm b/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm index 60b4f345c70b4..51a2ea0e644cf 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm @@ -95,7 +95,7 @@ /turf/space, /area/template_noop) "D" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/space) "E" = ( @@ -158,7 +158,7 @@ /turf/simulated/wall, /area/space) "U" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless, /area/space) "V" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm b/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm index fd3877912acce..38491260f6765 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm @@ -11,7 +11,7 @@ /turf/space, /area/template_noop) "d" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/space, /area/template_noop) "e" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm index 848637b6e12ef..5f3147451b9cb 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm @@ -982,7 +982,7 @@ }, /area/ruin/space/deepstorage) "dR" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/catwalk, /area/ruin/space/deepstorage) "dT" = ( @@ -1017,7 +1017,7 @@ }, /area/ruin/space/deepstorage) "eh" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/deepstorage) "em" = ( @@ -1359,7 +1359,7 @@ "gS" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/shard, /turf/simulated/floor/plating, /area/ruin/space/deepstorage) @@ -1392,7 +1392,7 @@ pixel_y = 4; pixel_x = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/catwalk, /area/ruin/space/deepstorage) "hj" = ( @@ -2654,7 +2654,7 @@ /area/ruin/space/deepstorage) "pj" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "vault" @@ -2775,7 +2775,7 @@ "qm" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -4046,7 +4046,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -4475,7 +4475,7 @@ /area/ruin/space/deepstorage) "Br" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "black" @@ -4499,8 +4499,8 @@ /turf/simulated/floor/engine, /area/ruin/space/deepstorage) "By" = ( -/obj/effect/landmark/damageturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/deepstorage) "BB" = ( @@ -4702,7 +4702,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /turf/simulated/floor/mineral/titanium, /area/ruin/space/deepstorage) "CD" = ( @@ -4711,7 +4711,7 @@ /turf/simulated/floor/plasteel, /area/ruin/space/deepstorage) "CG" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "vault" @@ -5816,7 +5816,7 @@ }, /area/ruin/space/deepstorage) "Lf" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/molten_object/large, /obj/effect/decal/cleanable/molten_object{ pixel_y = 6; @@ -5829,7 +5829,7 @@ /obj/structure/sign/greencross{ pixel_y = 32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/deepstorage) "Li" = ( @@ -6024,7 +6024,7 @@ /turf/simulated/floor/chasm/space_ruin, /area/ruin/space/powered) "MU" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/catwalk, /area/ruin/space/deepstorage) "MV" = ( @@ -6040,7 +6040,7 @@ /obj/effect/decal/cleanable/blood/splatter{ color = "red" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -6196,7 +6196,7 @@ /area/ruin/space/deepstorage) "Oi" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/sheet/metal, /turf/simulated/floor/plating, /area/ruin/space/deepstorage) @@ -7372,7 +7372,7 @@ }, /area/ruin/space/deepstorage) "Wz" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/holosign/barrier/engineering, /turf/simulated/floor/plasteel{ dir = 10; diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm index a2980f93f610e..91e23038a8858 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm @@ -268,7 +268,7 @@ /turf/simulated/floor/plasteel, /area/ruin/space/unpowered) "Pq" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/space/unpowered) "Qx" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm b/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm new file mode 100644 index 0000000000000..43d323e0727f3 --- /dev/null +++ b/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm @@ -0,0 +1,1307 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"cn" = ( +/obj/structure/closet/crate, +/obj/item/mop/advanced, +/obj/item/soap/syndie, +/obj/item/reagent_containers/spray/cleaner/advanced, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"dC" = ( +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/space/powered) +"dN" = ( +/obj/effect/mapping_helpers/turfs/damage, +/obj/machinery/disco, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"ei" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "caution" + }, +/area/ruin/space/powered) +"eI" = ( +/obj/effect/turf_decal/delivery/white/partial, +/obj/machinery/light/small, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"fp" = ( +/obj/effect/turf_decal/delivery/partial, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/ruin/space/powered) +"fL" = ( +/obj/structure/bed, +/obj/item/bedsheet/black, +/turf/simulated/floor/wood, +/area/ruin/space/powered) +"fY" = ( +/obj/effect/spawner/window/plastitanium, +/turf/simulated/floor/plating, +/area/ruin/space/powered) +"gd" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "caution" + }, +/area/ruin/space/powered) +"hM" = ( +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plasteel, +/area/ruin/space/powered) +"iq" = ( +/obj/structure/fans/tiny, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"iP" = ( +/obj/machinery/door/airlock/medical, +/turf/simulated/floor/plasteel, +/area/ruin/space/powered) +"jM" = ( +/obj/machinery/door/poddoor/multi_tile/impassable/three_tile_hor{ + id_tag = "freighterblastdoor1" + }, +/obj/structure/fans/tiny, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"jQ" = ( +/turf/simulated/floor/wood, +/area/ruin/space/powered) +"jY" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/ruin/space/powered) +"kK" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "caution" + }, +/area/ruin/space/powered) +"ls" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/ruin/space/powered) +"lw" = ( +/obj/structure/table, +/obj/item/clipboard, +/obj/item/pen/fancy, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"lx" = ( +/turf/simulated/floor/pod/dark, +/area/ruin/space/powered) +"lT" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/spawner/random/blood/maybe, +/turf/simulated/floor/plasteel, +/area/ruin/space/powered) +"mk" = ( +/obj/effect/turf_decal/delivery/white/partial{ + dir = 4 + }, +/obj/effect/turf_decal/delivery/white/partial{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"mA" = ( +/obj/structure/table/reinforced, +/obj/item/tank/internals/oxygen, +/obj/structure/window/reinforced/survival_pod{ + dir = 4 + }, +/turf/simulated/floor/pod/dark, +/area/ruin/space/powered) +"mG" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"ni" = ( +/obj/structure/table, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/fire{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_containers/glass/bottle/oculine{ + pixel_x = -9; + pixel_y = 9 + }, +/obj/item/reagent_containers/glass/bottle/oculine{ + pixel_x = -9 + }, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkblue" + }, +/area/ruin/space/powered) +"nq" = ( +/obj/structure/closet/crate, +/obj/item/banhammer, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"nD" = ( +/obj/structure/bookcase/random, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "caution" + }, +/area/ruin/space/powered) +"ov" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/space/powered) +"oy" = ( +/turf/simulated/floor/plasteel{ + icon_state = "yellowsiding" + }, +/area/ruin/space/powered) +"rK" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/ruin/space/powered) +"rV" = ( +/obj/structure/closet/crate/secure/loot, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"st" = ( +/obj/structure/railing, +/turf/simulated/floor/plasteel, +/area/ruin/space/powered) +"sy" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy/cigarettes/cigpack_random, +/obj/item/lighter/zippo/engraved{ + pixel_x = -5; + pixel_y = 7 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/space/powered) +"sB" = ( +/obj/machinery/kitchen_machine/oven, +/obj/effect/mapping_helpers/turfs/damage, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/ruin/space/powered) +"sZ" = ( +/obj/structure/table, +/obj/item/stamp/granted{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/stamp/denied{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/item/toy/figure/crew/cargotech{ + pixel_x = 8; + pixel_y = 9 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"tV" = ( +/obj/effect/turf_decal/delivery/white/partial, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"uk" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/ruin/space/powered) +"vc" = ( +/obj/effect/turf_decal/delivery/partial, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/ruin/space/powered) +"vN" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/space, +/area/ruin/space/powered) +"wa" = ( +/obj/structure/safe, +/obj/item/id_decal/gold, +/obj/item/stack/spacecash/c200, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "caution" + }, +/area/ruin/space/powered) +"wu" = ( +/obj/effect/turf_decal/delivery/white/partial{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"wL" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/item/flag/species/nian, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "caution" + }, +/area/ruin/space/powered) +"xB" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/pod/dark, +/area/ruin/space/powered) +"xF" = ( +/turf/simulated/floor/plasteel/stairs{ + dir = 4 + }, +/area/ruin/space/powered) +"xJ" = ( +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/ruin/space/powered) +"zd" = ( +/obj/structure/chair/office/dark{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"zu" = ( +/obj/effect/turf_decal/delivery/white/partial{ + dir = 1 + }, +/obj/effect/turf_decal/delivery/white/partial, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"zL" = ( +/obj/structure/dresser, +/turf/simulated/floor/wood, +/area/ruin/space/powered) +"zV" = ( +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkblue" + }, +/area/ruin/space/powered) +"Aa" = ( +/obj/structure/rack, +/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill, +/obj/item/mecha_parts/mecha_equipment/mining_scanner, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"As" = ( +/obj/structure/table/wood, +/obj/item/book/manual/random, +/obj/effect/spawner/random/book{ + pixel_x = -7 + }, +/obj/effect/mapping_helpers/turfs/damage, +/obj/machinery/light/small, +/turf/simulated/floor/wood, +/area/ruin/space/powered) +"AU" = ( +/obj/effect/turf_decal/delivery/white/partial, +/obj/effect/turf_decal/delivery/white/partial{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"Br" = ( +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/space/powered) +"BE" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/turf/simulated/floor/pod/dark, +/area/ruin/space/powered) +"BN" = ( +/obj/structure/mineral_door/wood, +/turf/simulated/floor/wood, +/area/ruin/space/powered) +"Cb" = ( +/obj/effect/turf_decal/delivery/partial{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "caution" + }, +/area/ruin/space/powered) +"Cj" = ( +/obj/effect/turf_decal/delivery/white/partial{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"Dn" = ( +/obj/effect/turf_decal/delivery/partial{ + dir = 1 + }, +/obj/structure/railing/cap, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/space/powered) +"EW" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"EZ" = ( +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "caution" + }, +/area/ruin/space/powered) +"Fl" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/ruin/space/powered) +"Fm" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/folder, +/obj/item/pen/multi/fountain, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/space/powered) +"Fw" = ( +/obj/machinery/door_control{ + name = "exterior warehouse blastdoors"; + id = "freighterblastdoor1" + }, +/turf/simulated/wall/mineral/plastitanium, +/area/ruin/space/powered) +"Ga" = ( +/obj/machinery/light/small, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"GP" = ( +/obj/structure/table/wood, +/obj/machinery/computer/library{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "caution" + }, +/area/ruin/space/powered) +"HX" = ( +/obj/item/reagent_containers/drinks/bottle/vodka, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ + pixel_x = 10 + }, +/obj/item/reagent_containers/drinks/drinkingglass/shotglass{ + pixel_x = -8; + pixel_y = 7 + }, +/obj/structure/table/glass/reinforced/plastitanium, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/ruin/space/powered) +"Ij" = ( +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"Ix" = ( +/obj/structure/bed, +/obj/item/bedsheet/black, +/obj/item/toy/plushie/nianplushie, +/turf/simulated/floor/wood, +/area/ruin/space/powered) +"Je" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/space/powered) +"Jw" = ( +/obj/structure/rack, +/obj/item/stack/sheet/metal/fifty{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stack/sheet/plasmarglass/fifty, +/obj/item/stack/sheet/mineral/uranium/fifty, +/obj/item/stack/sheet/plastitaniumglass{ + amount = 20; + pixel_x = -2; + pixel_y = 2 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"JC" = ( +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/obj/structure/window/reinforced/survival_pod{ + dir = 4 + }, +/turf/simulated/floor/plating/airless, +/area/ruin/space/powered) +"JW" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/under/new_soviet/sovietofficer, +/obj/item/salvage/ruin/soviet, +/obj/item/clothing/suit/sovietcoat, +/turf/simulated/floor/wood, +/area/ruin/space/powered) +"Kh" = ( +/turf/space, +/area/template_noop) +"Ki" = ( +/obj/structure/table, +/obj/machinery/kitchen_machine/microwave{ + pixel_y = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/ruin/space/powered) +"Kv" = ( +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/obj/structure/window/reinforced/survival_pod{ + dir = 4 + }, +/obj/structure/window/reinforced/survival_pod{ + dir = 4 + }, +/turf/simulated/floor/plating/airless, +/area/ruin/space/powered) +"KC" = ( +/obj/structure/sign/vacuum, +/turf/simulated/wall/mineral/plastitanium, +/area/ruin/space/powered) +"La" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/space/powered) +"LW" = ( +/turf/simulated/wall/mineral/plastitanium, +/area/ruin/space/powered) +"LX" = ( +/turf/simulated/floor/plasteel, +/area/ruin/space/powered) +"Md" = ( +/turf/simulated/floor/plasteel{ + icon_state = "yellowsiding"; + dir = 6 + }, +/area/ruin/space/powered) +"Mm" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plasteel/stairs, +/area/ruin/space/powered) +"Mu" = ( +/obj/machinery/light, +/mob/living/simple_animal/hostile/soviet_nian, +/turf/simulated/floor/plasteel, +/area/ruin/space/powered) +"MX" = ( +/obj/effect/spawner/random/blood/maybe, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkblue" + }, +/area/ruin/space/powered) +"MY" = ( +/obj/effect/turf_decal/delivery/white/partial{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"Nl" = ( +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"NP" = ( +/obj/item/mecha_parts/mecha_equipment/weapon/energy/mining_grenade, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"Ob" = ( +/obj/effect/turf_decal/delivery/partial{ + dir = 1 + }, +/obj/structure/railing/cap{ + pixel_x = -21 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/space/powered) +"Oc" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"Ok" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = 6 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"Pb" = ( +/obj/structure/rack, +/obj/item/clothing/head/kitty, +/obj/item/mecha_modkit/voice/honk{ + pixel_y = 10; + pixel_x = 3 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"Pf" = ( +/obj/machinery/computer/nonfunctional{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/space/powered) +"Pn" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/machinery/light/small, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"PE" = ( +/obj/structure/bookcase/random, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "caution" + }, +/area/ruin/space/powered) +"Qe" = ( +/obj/effect/turf_decal/delivery/white/partial{ + dir = 8 + }, +/obj/effect/turf_decal/delivery/white/partial{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"QM" = ( +/obj/structure/railing, +/obj/item/flag/ussp, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "caution" + }, +/area/ruin/space/powered) +"Sp" = ( +/obj/structure/largecrate, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"SL" = ( +/obj/structure/railing, +/mob/living/simple_animal/hostile/soviet_nian, +/turf/simulated/floor/plasteel, +/area/ruin/space/powered) +"Tf" = ( +/obj/machinery/economy/vending/snack/free, +/turf/simulated/floor/plasteel, +/area/ruin/space/powered) +"TW" = ( +/obj/effect/turf_decal/delivery/white/partial{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"UZ" = ( +/mob/living/simple_animal/hostile/soviet_nian, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"WF" = ( +/obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, +/turf/simulated/floor/pod/dark, +/area/ruin/space/powered) +"WR" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/spawner/random/blood/maybe, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/space/powered) +"XB" = ( +/obj/structure/table, +/obj/item/paper/fluff/ruins/nian_freighter/manifest, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/powered) +"Zc" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plasteel/stairs, +/area/ruin/space/powered) +"Zt" = ( +/obj/machinery/sleeper{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkblue" + }, +/area/ruin/space/powered) + +(1,1,1) = {" +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +vN +vN +vN +Kh +Kh +Kh +Kh +Kh +Kh +Kh +"} +(2,1,1) = {" +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +JC +JC +JC +Kh +Kh +Kh +Kh +Kh +Kh +Kh +"} +(3,1,1) = {" +Kh +Kh +Kh +Kh +Kh +Kh +Kh +LW +LW +LW +LW +LW +Kh +Kh +Kh +Kh +Kh +Kh +"} +(4,1,1) = {" +Kh +Kh +Kh +Kh +Kh +Kh +Kh +LW +lx +xB +lx +WF +Kh +Kh +Kh +Kh +Kh +Kh +"} +(5,1,1) = {" +Kh +Kh +Kh +Kh +Kh +Kh +LW +LW +BE +lx +mA +KC +LW +Kh +Kh +Kh +Kh +Kh +"} +(6,1,1) = {" +Kh +Kh +Kh +Kh +Kh +LW +LW +LW +KC +WF +LW +LW +LW +LW +Kh +Kh +Kh +Kh +"} +(7,1,1) = {" +Kh +Kh +Kh +Kh +Kh +LW +Oc +Ij +TW +TW +TW +Nl +Ga +LW +Kh +Kh +Kh +Kh +"} +(8,1,1) = {" +Kh +Kh +Kh +Kh +Kh +jM +Nl +MY +Pb +Nl +Jw +tV +Ij +LW +Kh +Kh +Kh +Kh +"} +(9,1,1) = {" +Kh +Kh +Kh +Kh +Kh +iq +Nl +MY +Nl +UZ +rV +tV +Ij +LW +Kh +Kh +Kh +Kh +"} +(10,1,1) = {" +Kh +Kh +Kh +Kh +Kh +iq +Ij +TW +mk +wu +Qe +TW +Nl +fY +Kh +Kh +Kh +Kh +"} +(11,1,1) = {" +Kh +Kh +Kh +Kh +Kh +Fw +Cj +Aa +NP +zu +dN +cn +tV +fY +Kh +Kh +Kh +Kh +"} +(12,1,1) = {" +Kh +Kh +Kh +Kh +Kh +LW +MY +Nl +Sp +zu +Nl +Nl +tV +fY +Kh +Kh +Kh +Kh +"} +(13,1,1) = {" +Kh +Kh +Kh +Kh +Kh +LW +MY +nq +Nl +AU +mG +Nl +eI +LW +Kh +Kh +Kh +Kh +"} +(14,1,1) = {" +Kh +Kh +Kh +vN +vN +LW +Nl +wu +wu +Nl +wu +wu +Nl +LW +vN +vN +Kh +Kh +"} +(15,1,1) = {" +Kh +Kh +Kh +JC +JC +LW +sZ +zd +Ij +Nl +Nl +Nl +Nl +LW +Kv +JC +Kh +Kh +"} +(16,1,1) = {" +Kh +Kh +LW +LW +LW +LW +lw +XB +Nl +Nl +EW +Ok +Pn +LW +LW +LW +LW +Kh +"} +(17,1,1) = {" +Kh +Kh +LW +Zt +ni +LW +LW +LW +La +Je +LW +LW +LW +dC +uk +zL +LW +Kh +"} +(18,1,1) = {" +Kh +Kh +LW +MX +zV +iP +xJ +xJ +Br +La +oy +jY +LX +BN +jQ +Ix +fY +Kh +"} +(19,1,1) = {" +Kh +Kh +LW +LW +LW +dC +xJ +xJ +La +La +oy +jY +Mu +LW +LW +LW +LW +Kh +"} +(20,1,1) = {" +Kh +Kh +Kh +Kh +fY +Ki +xJ +ls +La +La +Md +jY +hM +BN +jQ +As +LW +Kh +"} +(21,1,1) = {" +Kh +Kh +Kh +Kh +fY +sB +xJ +HX +La +Ob +Zc +fp +LX +LW +JW +fL +fY +Kh +"} +(22,1,1) = {" +Kh +Kh +Kh +Kh +fY +rK +xJ +Fl +La +Dn +Mm +vc +Tf +LW +LW +LW +LW +Kh +"} +(23,1,1) = {" +Kh +Kh +Kh +Kh +LW +LW +LW +LW +La +Je +LW +LW +LW +LW +LW +Kh +Kh +Kh +"} +(24,1,1) = {" +Kh +Kh +Kh +Kh +LW +EZ +ei +gd +Cb +Cb +gd +ei +PE +LW +Kh +Kh +Kh +Kh +"} +(25,1,1) = {" +Kh +Kh +Kh +Kh +LW +kK +st +Br +xF +xF +La +lT +GP +LW +Kh +Kh +Kh +Kh +"} +(26,1,1) = {" +Kh +Kh +Kh +Kh +LW +wa +SL +La +ov +WR +La +jY +nD +LW +Kh +Kh +Kh +Kh +"} +(27,1,1) = {" +Kh +Kh +Kh +Kh +LW +LW +QM +sy +Pf +Pf +Fm +wL +LW +LW +Kh +Kh +Kh +Kh +"} +(28,1,1) = {" +Kh +Kh +Kh +Kh +Kh +LW +LW +fY +fY +fY +fY +LW +LW +Kh +Kh +Kh +Kh +Kh +"} +(29,1,1) = {" +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +"} +(30,1,1) = {" +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +Kh +"} diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm index efa050e7517e0..6369571d51a83 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm @@ -1,22 +1,42 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"at" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, -/turf/simulated/floor/wood, -/area/ruin/space/syndicate_listening_station) "aW" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/trunk{ dir = 4 }, -/turf/simulated/wall/r_wall, +/obj/machinery/disposal, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/syndicate_listening_station) +"bk" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/syndicate_listening_station) +"bn" = ( +/obj/machinery/atmospherics/portable/canister/air, +/obj/machinery/atmospherics/unary/portables_connector, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/cobweb/left/rare, +/obj/structure/sign/vacuum/external{ + pixel_x = -30 + }, +/turf/simulated/floor/plating, /area/ruin/space/syndicate_listening_station) "bU" = ( /obj/machinery/light/small, -/obj/item/storage/toolbox/syndicate, -/obj/structure/closet/syndicate, /obj/effect/decal/cleanable/dirt, +/obj/item/storage/toolbox/syndicate, +/obj/structure/table, /turf/simulated/floor/plating, /area/ruin/space/syndicate_listening_station) +"ca" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/syndicate_listening_station) "cB" = ( /turf/simulated/mineral/random/high_chance, /area/ruin/space/syndicate_listening_station/asteroid) @@ -24,33 +44,60 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/ruin/space/syndicate_listening_station) -"eg" = ( -/obj/machinery/door/airlock/hatch/syndicate{ - name = "Cabin" +"dS" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, +/turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) -"hp" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, -/obj/effect/decal/cleanable/dirt, +"gD" = ( +/obj/structure/closet/syndicate, +/obj/item/tank/internals/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/clothing/suit/space/syndicate/black/red, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/head/helmet/space/syndicate/black/red, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) +"gP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/shelf, +/obj/item/storage/box/lights/tubes, +/obj/item/paper/solar, +/obj/item/storage/box/lights/bulbs, +/obj/item/extinguisher, +/obj/item/reagent_containers/glass/bucket, +/turf/simulated/floor/plating, +/area/ruin/space/syndicate_listening_station) "hr" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating/airless{ + icon_state = "asteroidplating" + }, /area/ruin/space/syndicate_listening_station/asteroid) +"hQ" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/structure/mirror{ + pixel_x = 28 + }, +/turf/simulated/floor/mineral/silver, +/area/ruin/space/syndicate_listening_station) +"il" = ( +/obj/machinery/light, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/syndicate_listening_station) "iB" = ( -/obj/item/taperecorder, -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, +/obj/structure/table/glass/reinforced/plastitanium, +/obj/item/paper/syndicate/listening_post, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "iL" = ( @@ -62,66 +109,71 @@ }, /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" +"kx" = ( +/obj/machinery/newscaster{ + pixel_y = 28; + name = "north bump" }, -/obj/structure/cable{ +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/syndicate_listening_station) +"kE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/fans/tiny, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/ruin/space/syndicate_listening_station) "kJ" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/space/syndicate_listening_station) +"le" = ( +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/syndicate_listening_station) +"mn" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/mineral/silver, /area/ruin/space/syndicate_listening_station) "mC" = ( +/obj/structure/cable/yellow, /obj/machinery/power/solar, -/obj/structure/cable, /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, /area/ruin/space/syndicate_listening_station/asteroid) -"nC" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/table, -/obj/item/storage/box/donkpockets{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/donkpockets{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/dark, -/area/ruin/space/syndicate_listening_station) "oE" = ( -/obj/machinery/atmospherics/portable/scrubber, /obj/effect/decal/cleanable/dirt, +/obj/machinery/floodlight, /turf/simulated/floor/plating, /area/ruin/space/syndicate_listening_station) "pV" = ( -/obj/machinery/power/solar, -/obj/structure/cable{ +/obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" }, +/obj/machinery/power/solar, /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, /area/ruin/space/syndicate_listening_station/asteroid) +"qC" = ( +/obj/item/flag/syndi, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/syndicate_listening_station) +"qW" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating/airless, +/area/ruin/space/syndicate_listening_station/asteroid) "rK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -129,106 +181,154 @@ /turf/simulated/mineral/ancient, /area/ruin/space/syndicate_listening_station/asteroid) "rS" = ( -/obj/structure/cable{ +/obj/structure/falsewall/rock_ancient, +/obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/falsewall/rock_ancient, /turf/simulated/floor/plating/airless, /area/ruin/space/syndicate_listening_station/asteroid) +"se" = ( +/obj/effect/spawner/airlock/w_to_e, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/space/syndicate_listening_station) "sf" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating/airless{ + icon_state = "asteroidplating" }, -/turf/simulated/floor/plating/airless, /area/ruin/space/syndicate_listening_station/asteroid) "sq" = ( -/obj/structure/cable{ +/obj/structure/falsewall/rock_ancient, +/obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/falsewall/rock_ancient, /turf/simulated/floor/plating/airless, /area/ruin/space/syndicate_listening_station/asteroid) "tk" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating/airless{ + icon_state = "asteroidplating" + }, /area/ruin/space/syndicate_listening_station/asteroid) "tF" = ( -/obj/machinery/power/smes/upgraded{ - charge = 5e+006; - input_level = 20000; - output_level = 100000 - }, +/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ + d1 = 1; d2 = 2; - icon_state = "0-2" + icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/ruin/space/syndicate_listening_station) "tG" = ( -/obj/structure/table, -/obj/item/paper{ - info = "Mission Details: You have been assigned to a newly constructed listening post constructed within an asteroid in Nanotrasen space to monitor their plasma mining operations. Accurate intel is crucial to the success of our operatives onboard, do not fail us."; - name = "mission briefing" +/obj/item/paper/monitorkey, +/obj/structure/table/glass/reinforced/plastitanium, +/obj/item/salvage/loot/syndicate{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/salvage/loot/syndicate{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/radio/intercom/pirate{ + pixel_y = -32; + name = "syndicate radio intercom" + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/syndicate_listening_station) +"tV" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 }, /obj/effect/decal/cleanable/dirt, -/obj/item/paper/monitorkey, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "un" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) -"uv" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +"uM" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = 32 }, -/obj/structure/table, -/obj/machinery/kitchen_machine/microwave/upgraded, -/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/syndicate_listening_station) +"vc" = ( +/obj/machinery/economy/vending/snack/free, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "vd" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, +/obj/structure/mopbucket{ + dir = 8 + }, +/obj/item/mop, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "vP" = ( -/obj/structure/cable, -/obj/machinery/power/solar_control/autostart{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, /turf/simulated/floor/plating, /area/ruin/space/syndicate_listening_station) "wj" = ( /obj/machinery/door/airlock/hatch/syndicate{ name = "Telecommunications" }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/syndicate_listening_station) +"wr" = ( +/obj/machinery/door/airlock/hatch/syndicate{ + name = "Cabin" + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/syndicate_listening_station) +"wF" = ( +/obj/machinery/atmospherics/pipe/simple/visible, /obj/effect/decal/cleanable/dirt, +/obj/structure/sign/vacuum/external{ + pixel_x = 30 + }, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) +"xh" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating/airless, +/area/ruin/space/syndicate_listening_station/asteroid) +"xK" = ( +/obj/structure/bed, +/obj/item/bedsheet/syndie, +/turf/simulated/floor/wood, +/area/ruin/space/syndicate_listening_station) "yn" = ( /turf/simulated/mineral/ancient, /area/ruin/space/syndicate_listening_station/asteroid) @@ -238,31 +338,23 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /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" - }, -/obj/structure/fans/tiny, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/ruin/space/syndicate_listening_station) -"zs" = ( -/obj/machinery/shower{ - pixel_y = 20 +"Aa" = ( +/obj/machinery/ai_status_display{ + pixel_y = 32 }, -/obj/item/soap/syndie, -/turf/simulated/floor/mineral/silver, +/obj/machinery/photocopier, +/turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "Ab" = ( -/obj/structure/closet/syndicate, +/obj/machinery/status_display/supply_display{ + pixel_y = 32 + }, +/obj/structure/shelf, +/obj/item/storage/box/tapes, +/obj/item/taperecorder, /obj/item/clothing/glasses/regular, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/regular, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "AT" = ( @@ -281,127 +373,117 @@ /obj/machinery/tcomms/relay/ruskie{ network_id = "SYNDIE-LPOST-RELAY" }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "BD" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/turf/simulated/floor/plating/airless{ + icon_state = "asteroidplating" }, -/turf/simulated/floor/plating/airless, /area/ruin/space/syndicate_listening_station/asteroid) +"BG" = ( +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/wood, +/area/ruin/space/syndicate_listening_station) "Cw" = ( /obj/structure/filingcabinet, -/obj/item/paper{ - info = "A good start to the operation: intercepted Nanotrasen military communications. A convoy is scheduled to transfer nuclear warheads to a new military base. This is as good a chance as any to get our hands on some heavy weaponry, I suggest we take it."; - name = "april report" - }, -/obj/item/paper{ - info = "Nothing of real interest to report this month. I have intercepted faint transmissions from what appears to be some sort of pirate radio station. They do not appear to be relevant to my assignment."; - name = "may report" - }, -/obj/item/paper{ - info = "Nanotrasen communications have been noticably less frequent recently. The pirate radio station I found last month has been transmitting pro-Nanotrasen propaganda. I will continue to monitor it."; - name = "june report" - }, -/obj/item/paper{ - info = "Nothing of interest to report."; - name = "july report" - }, -/obj/item/paper{ - info = "Nothing of interest to report."; - name = "august report" - }, -/obj/item/paper{ - info = "Nothing of interest to report."; - name = "september report" - }, -/obj/item/paper{ - info = "Nothing of interest to report."; - name = "october report" - }, -/obj/item/paper{ - info = "1 x Stechtkin pistol - $600
1 x silencer - $200
shipping charge - $4360
total - $5160"; - name = "receipt" - }, -/obj/item/tape, -/obj/item/tape, -/obj/item/tape, -/obj/item/tape, -/obj/item/tape, -/obj/item/tape, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 + }, +/obj/item/paper/listening_post_report_1, +/obj/item/paper/listening_post_report_2, +/obj/item/paper/listening_post_report_3, +/obj/item/paper/listening_post_report_4, +/obj/item/paper/listening_post_report_5, +/obj/item/paper/listening_post_report_6, +/obj/item/paper/listening_post_report_7, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) -"CF" = ( -/obj/machinery/light{ - dir = 4 +"CC" = ( +/obj/machinery/light/small{ + dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/economy/vending/cigarette/free, -/turf/simulated/floor/plasteel/dark, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plating, /area/ruin/space/syndicate_listening_station) "CG" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, +/obj/structure/shelf, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/vending_refill/cigarette, +/obj/item/vending_refill/snack, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "CI" = ( -/obj/structure/cable{ - d1 = 4; +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d1 = 1; d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/light/small{ - dir = 1 + icon_state = "1-8" }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/ruin/space/syndicate_listening_station) "DT" = ( /obj/machinery/light{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "Ej" = ( -/obj/structure/cable{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/syndicate, /turf/simulated/floor/plating, /area/ruin/space/syndicate_listening_station) "Em" = ( -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/power/terminal, -/obj/effect/spawner/random_spawners/cobweb_right_rare, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/solar_control/autostart, /turf/simulated/floor/plating, /area/ruin/space/syndicate_listening_station) -"FW" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, +"Fx" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/dresser, +/turf/simulated/floor/wood, +/area/ruin/space/syndicate_listening_station) +"Ge" = ( +/obj/machinery/atmospherics/portable/canister/air, +/obj/machinery/atmospherics/unary/portables_connector, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "Go" = ( +/obj/structure/chair/office/dark, /mob/living/simple_animal/hostile/syndicate{ - desc = "A weary looking Syndicate operative."; - environment_smash = 0 + name = "Syndicate Communications Officer" }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "Gy" = ( @@ -409,27 +491,21 @@ /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/syndicate_listening_station/asteroid) "GQ" = ( -/obj/structure/cable{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/portable/canister/air, -/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plating, /area/ruin/space/syndicate_listening_station) -"Hg" = ( -/obj/structure/closet/syndicate, -/obj/item/clothing/suit/space/syndicate/black/red, -/obj/item/clothing/head/helmet/space/syndicate/black/red, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/tank/internals/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel/dark, -/area/ruin/space/syndicate_listening_station) "HZ" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" @@ -440,22 +516,50 @@ /obj/structure/spawner/mining/basilisk, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/syndicate_listening_station/asteroid) -"Km" = ( -/obj/machinery/light/small{ - dir = 1 +"Il" = ( +/obj/machinery/power/apc/syndicate/directional/north, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" }, -/obj/structure/dresser, -/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/syndicate_listening_station) +"Im" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/syndicate_listening_station) +"Ir" = ( +/obj/structure/table/glass/reinforced/plastitanium, +/obj/item/ashtray/glass, +/obj/item/kitchen/utensil/spork{ + pixel_x = 8; + pixel_y = 14 + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/syndicate_listening_station) +"KM" = ( +/obj/machinery/shower{ + pixel_y = 20 + }, +/obj/item/soap/syndie, +/obj/item/bikehorn/rubberducky, +/obj/structure/curtain/open/shower/security, +/turf/simulated/floor/mineral/silver, +/area/ruin/space/syndicate_listening_station) +"Lj" = ( /turf/simulated/floor/wood, /area/ruin/space/syndicate_listening_station) "Mv" = ( -/obj/item/bedsheet/syndie, -/obj/structure/bed/pod, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, +/obj/structure/extinguisher_cabinet{ + name = "north bump"; + pixel_y = 30 + }, +/turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "MF" = ( -/obj/structure/cable, +/obj/structure/cable/yellow, /obj/machinery/power/tracker, /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" @@ -465,37 +569,41 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "Nd" = ( /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" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +"Or" = ( +/obj/machinery/economy/vending/cigarette/free, +/turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) "OO" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plating/airless{ + icon_state = "asteroidplating" + }, /area/ruin/space/syndicate_listening_station/asteroid) "PH" = ( -/obj/item/gps/ruin{ - gpstag = "Encrypted Signal" +/obj/machinery/kitchen_machine/microwave/upgraded{ + pixel_y = 5 + }, +/obj/structure/table/glass/reinforced/plastitanium, +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/wall/r_wall, +/turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) -"PP" = ( -/obj/machinery/light/small, -/turf/simulated/floor/mineral/silver, +"Qp" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/shoes/slippers, +/obj/item/clothing/under/misc/pj/red, +/obj/item/clothing/suit/jacket/bomber/syndicate, +/turf/simulated/floor/wood, /area/ruin/space/syndicate_listening_station) "RN" = ( /obj/machinery/door/airlock/silver{ @@ -504,44 +612,52 @@ /turf/simulated/floor/mineral/silver, /area/ruin/space/syndicate_listening_station) "Sq" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/table/glass/reinforced/plastitanium, +/obj/item/food/soup/chicken_noodle_soup, /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" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +"SR" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/portable/scrubber, /turf/simulated/floor/plating, /area/ruin/space/syndicate_listening_station) -"TZ" = ( -/obj/structure/table, -/obj/item/paper{ - info = "Nothing of interest to report."; - name = "november report" - }, -/obj/item/tape, -/obj/item/radio/intercom{ - freerange = 1; - pixel_y = -24; - name = "intercom" +"TF" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/turf/simulated/floor/plating/airless, +/area/ruin/space/syndicate_listening_station/asteroid) +"TZ" = ( +/obj/structure/table/glass/reinforced/plastitanium, /obj/item/paper_bin, /obj/item/pen/multi/syndicate, -/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/pirate{ + pixel_y = -32; + name = "syndicate radio intercom" + }, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) +"Uy" = ( +/obj/item/gps/ruin{ + gpstag = "Encrypted Signal" + }, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/space/syndicate_listening_station) +"UC" = ( +/obj/effect/spawner/random/cobweb/right/rare, +/obj/machinery/power/smes/upgraded{ + charge = 5e+006; + input_level = 20000; + output_level = 100000 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/ruin/space/syndicate_listening_station) "UM" = ( /obj/machinery/door/airlock/hatch/syndicate{ name = "Engineering" @@ -554,56 +670,64 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) +"UT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/syndicate, +/turf/simulated/floor/plating, +/area/ruin/space/syndicate_listening_station) "Vn" = ( /obj/machinery/computer/message_monitor{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/pirate{ + pixel_y = -32; + name = "syndicate radio intercom" + }, /turf/simulated/floor/plasteel/dark, /area/ruin/space/syndicate_listening_station) +"Wc" = ( +/obj/effect/spawner/airlock/e_to_w, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/space/syndicate_listening_station) +"Wf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/space/syndicate_listening_station) "WN" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/turf/simulated/floor/plating/airless{ + icon_state = "asteroidplating" }, -/turf/simulated/floor/plating/airless, /area/ruin/space/syndicate_listening_station/asteroid) "Xm" = ( /obj/structure/toilet{ - dir = 8 + pixel_y = 8 }, /turf/simulated/floor/mineral/silver, /area/ruin/space/syndicate_listening_station) "Xz" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 }, -/obj/structure/cable{ - d1 = 2; +/obj/structure/cable/yellow{ + d1 = 4; d2 = 8; - icon_state = "2-8" + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/ruin/space/syndicate_listening_station) -"Ya" = ( -/obj/machinery/power/apc/syndicate/directional/east, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/economy/vending/snack/free, -/turf/simulated/floor/plasteel/dark, -/area/ruin/space/syndicate_listening_station) "Zw" = ( /turf/template_noop, /area/template_noop) @@ -652,7 +776,7 @@ Zw "} (2,1,1) = {" Zw -Zw +yn Zw Zw Zw @@ -695,9 +819,9 @@ Zw (3,1,1) = {" Zw yn -Zw -Zw -Zw +yn +yn +yn Zw Zw Zw @@ -736,6 +860,7 @@ Zw "} (4,1,1) = {" Zw +Zw yn yn yn @@ -747,10 +872,9 @@ Zw Zw Zw Zw -Zw -yn yn yn +AT pV sf mC @@ -781,9 +905,9 @@ Zw Zw yn yn +cB +cB yn -yn -Zw Zw Zw Zw @@ -825,7 +949,7 @@ yn yn cB cB -yn +cB Zw Zw Zw @@ -863,19 +987,19 @@ Zw (7,1,1) = {" Zw Zw +Zw +yn +yn +yn yn yn -cB -cB -cB -Zw -Zw Zw Zw yn yn yn yn +yn sq yn yn @@ -906,18 +1030,18 @@ Zw Zw Zw Zw -yn -yn -yn -yn +Zw yn Zw Zw yn +Zw yn yn yn -OO +yn +yn +qW HZ yn yn @@ -949,16 +1073,16 @@ Zw Zw Zw Zw -yn Zw Zw -yn +Zw +Zw Zw yn yn -OO +qW rS -tk +TF HZ yn yn @@ -995,10 +1119,10 @@ Zw Zw Zw Zw -Zw yn yn -hr +yn +xh yn yn yn @@ -1036,12 +1160,12 @@ Zw Zw Zw Zw -Zw +yn yn yn kJ kE -kJ +Wc yn cB cB @@ -1078,7 +1202,7 @@ Zw Zw Zw Zw -Zw +yn yn yn kJ @@ -1122,14 +1246,14 @@ Zw Zw yn yn -yn kJ -TS +kJ +kE +kJ +kJ kJ kJ kJ -yn -yn kJ kJ kJ @@ -1164,14 +1288,14 @@ Zw Zw yn yn -yn kJ +bn Xz -Bt +du vP kJ -yn -yn +Qp +BG kJ CG vd @@ -1206,17 +1330,17 @@ Zw Zw yn yn -yn kJ -GQ +gP +kE du bU kJ -yn -yn -kJ -Km -at +Fx +Lj +wr +le +le kJ kJ kJ @@ -1248,17 +1372,17 @@ Zw Zw yn yn -yn kJ +Em GQ du oE kJ -yn -yn +xK +Lj kJ -Mv -vd +Il +le kJ Cw DT @@ -1288,22 +1412,22 @@ Zw Zw Zw Zw -Zw yn yn kJ +CC CI du -du +SR kJ kJ kJ +Uy +bk +le kJ -kJ -eg -kJ -un -un +Aa +le TZ kJ yn @@ -1330,21 +1454,21 @@ Zw Zw Zw Zw -Zw yn yn kJ -Em +UC +tF tF Bt UM yv -nC -uv -FW -un +yv +yv +dS +le wj -un +le Go Vn kJ @@ -1372,7 +1496,7 @@ Zw Zw Zw Zw -Zw +yn yn yn kJ @@ -1380,14 +1504,14 @@ kJ kJ kJ kJ -un -un -Sq -un -un +uM +le +Im +Im +le kJ -un -un +kx +le tG kJ yn @@ -1414,19 +1538,19 @@ Zw Zw Zw Zw -Zw -Zw yn yn +yn +kJ +KM +Nd kJ -zs -PP PH -un -un +le +le Sq -un -un +Ir +il kJ Ab MO @@ -1457,18 +1581,18 @@ Zw Zw Zw Zw -Zw yn yn kJ -Xm +mn Nd RN -un -un -Sq -un -un +le +le +le +ca +ca +le kJ kJ kJ @@ -1499,18 +1623,18 @@ Zw Zw Zw Zw -Zw yn yn kJ +Xm +hQ kJ -kJ -kJ -un -Hg -Ya -CF -hp +Mv +le +le +le +le +le kJ yn yn @@ -1541,17 +1665,17 @@ Zw Zw Zw Zw -Zw -Zw -yn -yn yn yn kJ -Ow kJ kJ kJ +qC +un +le +vc +Or aW kJ yn @@ -1577,8 +1701,6 @@ Zw (24,1,1) = {" Zw Zw -Zw -Zw yn yn yn @@ -1590,12 +1712,14 @@ yn yn yn kJ -du +Ge +wF +tV +gD +kJ +kJ +Wf kJ -yn -yn -rK -yn yn yn yn @@ -1620,8 +1744,6 @@ Zw Zw Zw Zw -Zw -Zw yn yn Zw @@ -1632,9 +1754,11 @@ yn yn yn kJ -zb kJ -yn +kJ +du +se +kJ yn rK cB @@ -1660,8 +1784,6 @@ Zw "} (26,1,1) = {" Zw -Zw -Zw yn Zw yn @@ -1670,12 +1792,14 @@ yn Zw Zw Zw +Zw yn yn yn -AT -AT -AT +yn +kJ +UT +kJ yn yn rK @@ -1705,19 +1829,19 @@ Zw Zw Zw Zw -Zw -Zw yn yn Zw Zw Zw Zw +Zw yn yn -AT -AT yn +kJ +du +kJ yn yn iL @@ -1755,11 +1879,11 @@ Zw Zw Zw Zw -Zw yn yn -Gy -yn +AT +AT +AT yn yn Zw @@ -1797,12 +1921,12 @@ Zw Zw Zw Zw -Zw -Zw yn -Zw -Zw -Zw +yn +AT +AT +yn +yn yn Zw yn @@ -1840,10 +1964,10 @@ Zw Zw Zw Zw -Zw -Zw -Zw -Zw +yn +yn +Gy +yn Zw Zw Zw @@ -1883,7 +2007,7 @@ Zw Zw Zw Zw -Zw +yn Zw Zw Zw @@ -2162,129 +2286,3 @@ Zw Zw Zw "} -(38,1,1) = {" -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -"} -(39,1,1) = {" -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -"} -(40,1,1) = {" -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -"} diff --git a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm index 90f335a1ffe10..29e60f6f29a96 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm @@ -54,7 +54,7 @@ /obj/machinery/door/airlock/silver{ locked = 1 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/ruin/unpowered/BMPship/Delta) "an" = ( @@ -149,7 +149,7 @@ /turf/simulated/wall/mineral/titanium, /area/ruin/unpowered/BMPship/Fore) "aE" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/unpowered/BMPship/Delta) "aF" = ( @@ -174,7 +174,7 @@ /area/ruin/powered) "aL" = ( /obj/item/multitool, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/powered) "aM" = ( @@ -237,7 +237,7 @@ /turf/simulated/wall/mineral/titanium, /area/ruin/unpowered/BMPship/Fore) "aW" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/ruin/unpowered/BMPship/Delta) "aX" = ( @@ -259,7 +259,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/powered) "be" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/powered) "bf" = ( @@ -1610,7 +1610,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/unpowered/BMPship/Midship) "fo" = ( @@ -1693,7 +1693,7 @@ /turf/simulated/floor/engine, /area/ruin/unpowered/BMPship/Aft) "fA" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/unpowered/BMPship/Fore) "fB" = ( @@ -1725,7 +1725,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/ruin/unpowered/BMPship/Fore) "fF" = ( @@ -1734,7 +1734,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/unpowered/BMPship/Fore) "fG" = ( @@ -1795,12 +1795,12 @@ /area/ruin/unpowered/BMPship/Aft) "fN" = ( /obj/item/shard, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/unpowered/BMPship/Fore) "fO" = ( /obj/structure/chair/stool, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/unpowered/BMPship/Fore) "fP" = ( @@ -1854,12 +1854,12 @@ /area/ruin/powered) "fY" = ( /obj/structure/computerframe, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/ruin/unpowered/BMPship/Fore) "fZ" = ( /obj/structure/computerframe, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/unpowered/BMPship/Fore) "ga" = ( @@ -1869,7 +1869,7 @@ }, /area/ruin/unpowered/BMPship/Midship) "gb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/unpowered/BMPship/Midship) "gc" = ( @@ -1965,7 +1965,7 @@ /area/ruin/unpowered/BMPship/Fore) "gq" = ( /obj/structure/cable, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/unpowered/BMPship/Fore) "gr" = ( @@ -1993,7 +1993,7 @@ /area/ruin/powered) "gw" = ( /obj/effect/gibspawner/robot, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/powered) "gx" = ( @@ -2012,7 +2012,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/powered) "gz" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/ruin/powered) "gA" = ( @@ -2312,7 +2312,7 @@ /turf/simulated/floor/plating, /area/ruin/unpowered/BMPship/Aft) "hE" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /mob/living/simple_animal/hostile/pirate, /turf/simulated/floor/plating, /area/ruin/unpowered/BMPship/Midship) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm index 18e9463656998..2c74b43e9fbb6 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aq" = ( -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -32,7 +32,7 @@ /turf/template_noop, /area/template_noop) "bT" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating/damaged/airless, /area/ruin/space/mech_transport) "bU" = ( @@ -116,7 +116,7 @@ /area/ruin/space/mech_transport) "hu" = ( /obj/effect/decal/remains/human, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/damaged/airless, /area/ruin/space/mech_transport) "hJ" = ( @@ -141,7 +141,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/mech_transport) "jd" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/wall/mineral/plastitanium, /area/ruin/space/mech_transport) "jG" = ( @@ -187,7 +187,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/ruin/space/mech_transport) @@ -195,7 +195,7 @@ /obj/effect/turf_decal/delivery/partial{ dir = 4 }, -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/plasteel/dark, /area/ruin/space/mech_transport) "pt" = ( @@ -205,7 +205,7 @@ /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/mech_transport) "px" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/mech_transport) "pJ" = ( @@ -224,15 +224,15 @@ pixel_y = 0; pixel_x = 32 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/light/tube{ status = 2 }, /turf/simulated/floor/plasteel/dark, /area/ruin/space/mech_transport) "qJ" = ( -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/decal/cleanable/molten_object/large, /turf/simulated/floor/plating/airless, /area/ruin/space/mech_transport) @@ -294,7 +294,7 @@ /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/mech_transport) "uu" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/mech_transport) "uU" = ( @@ -332,11 +332,11 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/mech_transport) "wz" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/wall/mineral/plastitanium, /area/ruin/space/mech_transport) "wF" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/shreds{ pixel_y = -10 }, @@ -399,7 +399,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/mech_transport) "Af" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/generic, /obj/machinery/door_control{ id = "mechtransport_bay_shutter"; @@ -439,7 +439,7 @@ /turf/simulated/floor/plating/damaged/airless, /area/ruin/space/mech_transport) "EC" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/blood/gibs/robot/up, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating/airless, @@ -482,7 +482,7 @@ /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/mech_transport) "HK" = ( -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/plasteel/dark, /area/ruin/space/mech_transport) "HT" = ( @@ -516,11 +516,11 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/mech_transport) "Kz" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel/dark, /area/ruin/space/mech_transport) "Lq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/dark, /area/ruin/space/mech_transport) "LZ" = ( @@ -544,7 +544,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/mech_transport) "MI" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/mech_transport) "MK" = ( @@ -587,7 +587,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/mech_transport) "NR" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/ruin/space/mech_transport) @@ -602,7 +602,7 @@ /obj/effect/turf_decal/delivery/partial{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/ruin/space/mech_transport) @@ -648,8 +648,8 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/mech_transport) "Sw" = ( -/obj/effect/landmark/burnturf, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/mech_transport) "Tf" = ( @@ -674,7 +674,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/mech_transport) "UF" = ( -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plating/airless, /area/ruin/space/mech_transport) "UK" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm index 4c3d28f03fbc4..0c41a0a6529b2 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm @@ -34,7 +34,7 @@ }, /area/ruin/space/moonbase19) "af" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/ruin/space/moonbase19) "ag" = ( @@ -286,7 +286,7 @@ /turf/simulated/wall, /area/ruin/space/moonbase19) "aM" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/space/moonbase19) "aN" = ( @@ -790,7 +790,7 @@ }, /area/ruin/space/moonbase19) "cp" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "cq" = ( @@ -802,7 +802,7 @@ }, /area/ruin/space/moonbase19) "cr" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/moonbase19) "cs" = ( @@ -899,7 +899,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "cF" = ( @@ -1361,7 +1361,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 8 @@ -1837,14 +1837,14 @@ "fX" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/moonbase19) "fY" = ( /obj/item/stack/sheet/mineral/titanium, /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/molten_object/large, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/moonbase19) "gb" = ( @@ -2053,7 +2053,7 @@ /area/ruin/space/moonbase19) "gC" = ( /obj/effect/decal/cleanable/greenglow, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/clothing/mask/facehugger{ icon_state = "facehugger_impregnated"; item_state = "facehugger_impregnated"; @@ -2150,7 +2150,7 @@ /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) "gW" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock"; name = "Escape Pod Hatch" @@ -3111,7 +3111,7 @@ }, /area/ruin/space/moonbase19) "jC" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /mob/living/simple_animal/hostile/alien, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) @@ -3319,7 +3319,7 @@ /area/ruin/space/moonbase19) "kg" = ( /obj/item/kirbyplants, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "caution" @@ -4181,7 +4181,7 @@ /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) "ny" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/space/nearstation) "nz" = ( @@ -5110,7 +5110,7 @@ /area/ruin/space/moonbase19) "rk" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/delivery/partial{ dir = 4 }, @@ -5524,7 +5524,7 @@ /turf/simulated/floor/engine, /area/ruin/space/moonbase19) "sF" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/indestructible/riveted, /area/ruin/space/moonbase19) "sK" = ( @@ -5653,7 +5653,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) "to" = ( @@ -6134,7 +6134,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "dark" @@ -6385,7 +6385,7 @@ }, /area/ruin/space/moonbase19) "xi" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/stairs{ dir = 8 }, @@ -6738,7 +6738,7 @@ /area/ruin/space/moonbase19) "yE" = ( /obj/item/stack/sheet/metal, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/delivery/partial{ dir = 8 }, @@ -6907,8 +6907,8 @@ }, /area/ruin/space/moonbase19) "zn" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/ruin/space/moonbase19) "zr" = ( @@ -7403,7 +7403,7 @@ name = "Acid-Proof disposal pipe" }, /obj/structure/alien/resin/wall, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "Bu" = ( @@ -8545,7 +8545,7 @@ /obj/item/shard{ icon_state = "medium" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" @@ -8580,7 +8580,7 @@ /area/ruin/space/moonbase19) "GD" = ( /obj/structure/holosign/barrier/engineering, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -9027,7 +9027,7 @@ /area/ruin/space/moonbase19) "IN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/ruin/space/moonbase19) "IO" = ( @@ -9554,7 +9554,7 @@ /area/ruin/space/moonbase19) "Lb" = ( /obj/structure/rack, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "Ld" = ( @@ -10585,7 +10585,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "PP" = ( @@ -10639,7 +10639,7 @@ /obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, /obj/item/stack/rods, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -10665,14 +10665,14 @@ /obj/structure/railing/cap{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" }, /area/ruin/space/moonbase19) "Qf" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 4 @@ -10878,7 +10878,7 @@ /turf/simulated/floor/catwalk, /area/ruin/space/moonbase19) "QP" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/stairs, /area/ruin/space/moonbase19) "QQ" = ( @@ -11227,7 +11227,7 @@ /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "Sz" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -12723,7 +12723,7 @@ /area/ruin/space/moonbase19) "Za" = ( /obj/structure/holosign/barrier/engineering, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/moonbase19) "Zb" = ( @@ -12761,7 +12761,7 @@ "Zh" = ( /obj/effect/decal/cleanable/molten_object/large, /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/door/poddoor/preopen{ id_tag = "awayscilock1" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index 98f13edcf8534..5a1bdfc7eb31a 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -23,7 +23,7 @@ /turf/simulated/floor/plating/airless, /area/space/nearstation) "af" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/space/nearstation) "ah" = ( @@ -50,12 +50,12 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/ancientstation/hivebot) "al" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/comm) "am" = ( /obj/structure/sign/poster/official/nanotrasen_logo, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/comm) "an" = ( @@ -122,7 +122,7 @@ /turf/simulated/wall, /area/ruin/ancientstation/hivebot) "az" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation) "aA" = ( @@ -192,7 +192,7 @@ /area/ruin/ancientstation) "aK" = ( /obj/structure/sign/poster/contraband/random, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation) "aL" = ( @@ -343,7 +343,7 @@ /turf/simulated/floor/plasteel/airless, /area/ruin/ancientstation/betanorth) "bf" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/betanorth) "bg" = ( @@ -439,7 +439,7 @@ /area/ruin/ancientstation/comm) "bs" = ( /obj/structure/sign/poster/official/cleanliness, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation) "bt" = ( @@ -454,7 +454,7 @@ /turf/simulated/floor/plating/airless, /area/space/nearstation) "bu" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/thetacorridor) "bv" = ( @@ -496,7 +496,7 @@ /area/ruin/ancientstation) "bD" = ( /obj/structure/sign/greencross, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation) "bE" = ( @@ -551,7 +551,7 @@ /area/ruin/ancientstation) "bL" = ( /obj/structure/sign/science, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation) "bM" = ( @@ -573,11 +573,11 @@ /area/ruin/ancientstation/thetacorridor) "bP" = ( /obj/structure/sign/poster/official/science, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/thetacorridor) "bQ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/hivebot) "bR" = ( @@ -835,7 +835,7 @@ /turf/simulated/floor/plasteel, /area/ruin/ancientstation) "cA" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/hydroponics) "cB" = ( @@ -965,7 +965,7 @@ /area/ruin/ancientstation/betanorth) "cS" = ( /obj/structure/sign/poster/official/nanomichi_ad, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/betanorth) "cT" = ( @@ -976,7 +976,7 @@ /turf/simulated/floor/plasteel/airless, /area/ruin/ancientstation/betanorth) "cU" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/engi) "cV" = ( @@ -1044,7 +1044,7 @@ /turf/simulated/floor/plating/airless, /area/space/nearstation) "dg" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/sec) "dh" = ( @@ -1072,7 +1072,7 @@ /turf/simulated/floor/plasteel, /area/ruin/ancientstation/thetacorridor) "dj" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/rnd) "dk" = ( @@ -1183,7 +1183,7 @@ /area/ruin/ancientstation) "dA" = ( /obj/structure/sign/poster/contraband/donut_corp, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/sec) "dB" = ( @@ -1664,7 +1664,7 @@ /area/ruin/ancientstation) "eN" = ( /obj/structure/sign/poster/official/here_for_your_safety, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/sec) "eO" = ( @@ -2461,7 +2461,7 @@ /turf/simulated/floor/plasteel, /area/ruin/ancientstation/engi) "gs" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/kitchen) "gt" = ( @@ -3340,7 +3340,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/ancientstation/atmo) "ip" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/atmo) "iq" = ( @@ -3377,7 +3377,7 @@ icon_state = "radiation"; name = "\improper HAZARDOUS RADIATION" }, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/ancientstation/engi) "iu" = ( @@ -4281,7 +4281,7 @@ /turf/simulated/floor/engine, /area/ruin/ancientstation/atmo) "kE" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/indestructible/riveted, /area/ruin/ancientstation/proto) "kF" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm index e5a071b709a5f..81d7d22f00a06 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm @@ -162,7 +162,7 @@ /area/ruin/space/onehalf/hallway) "ay" = ( /obj/structure/table_frame, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/ruin/space/onehalf/hallway) "az" = ( @@ -226,7 +226,7 @@ /turf/template_noop, /area/ruin/space/onehalf/hallway) "aI" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/ruin/space/onehalf/hallway) "aJ" = ( @@ -352,12 +352,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/ruin/space/onehalf/hallway) "aU" = ( /obj/item/stack/sheet/metal, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "aV" = ( @@ -423,7 +423,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/ruin/space/onehalf/hallway) "be" = ( @@ -445,7 +445,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/ruin/space/onehalf/hallway) "bg" = ( @@ -462,7 +462,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/ruin/space/onehalf/hallway) "bh" = ( @@ -480,7 +480,7 @@ /obj/structure/disposalpipe/broken{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "bj" = ( @@ -585,14 +585,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "bv" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/ruin/space/onehalf/hallway) "bw" = ( @@ -606,7 +606,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/ruin/space/onehalf/hallway) "by" = ( @@ -618,7 +618,7 @@ /area/ruin/space/onehalf/drone_bay) "bz" = ( /obj/structure/closet/emcloset, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/ruin/space/onehalf/hallway) "bA" = ( @@ -675,12 +675,12 @@ /area/ruin/space/onehalf/hallway) "bK" = ( /obj/machinery/economy/vending/coffee, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/ruin/space/onehalf/hallway) "bL" = ( /obj/machinery/economy/vending/snack, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/ruin/space/onehalf/hallway) "bN" = ( @@ -700,7 +700,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "bR" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "bS" = ( @@ -717,7 +717,7 @@ "bV" = ( /obj/structure/disposalpipe/segment, /obj/item/stack/rods, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "bX" = ( @@ -728,12 +728,12 @@ dir = 1 }, /obj/item/shard, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "ca" = ( /obj/structure/disposalpipe/segment, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/ruin/space/onehalf/hallway) "cb" = ( @@ -794,7 +794,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "ck" = ( @@ -802,7 +802,7 @@ /turf/simulated/floor/plating/airless, /area/space/nearstation) "cl" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/space/nearstation) "cm" = ( @@ -919,7 +919,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/onehalf/hallway) "cA" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm b/_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm index cded6ef453ce6..6cd4e16911998 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm @@ -8,7 +8,7 @@ "ci" = ( /obj/machinery/door/airlock, /obj/structure/fans/tiny, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/powered) "cx" = ( @@ -75,14 +75,14 @@ /area/ruin/space/powered) "gP" = ( /obj/structure/table/wood, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/powered) "gY" = ( /obj/structure/chair/sofa/left{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/powered) "hB" = ( @@ -243,7 +243,7 @@ /turf/simulated/floor/plating, /area/ruin/space/powered) "Cq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/powered) "Cw" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm index ae749ca53ef6e..85a4147836bb1 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm @@ -58,7 +58,7 @@ /obj/machinery/chem_dispenser/beer{ pixel_y = 8 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/wood, /area/ruin/space/powered/bar) "ar" = ( @@ -191,7 +191,7 @@ }, /area/ruin/space/powered/bar) "aU" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/ruin/space/powered/bar) "aV" = ( @@ -207,7 +207,7 @@ pixel_x = -12; pixel_y = -8 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -318,7 +318,7 @@ }, /area/ruin/space/powered/bar) "bn" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/tile/mineral, /turf/simulated/floor/plating, /area/ruin/space/powered/bar) @@ -381,7 +381,7 @@ /turf/simulated/floor/plating/asteroid/ancient, /area/space/nearstation) "eG" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/cable_coil{ amount = 1 }, @@ -415,7 +415,7 @@ }, /area/ruin/space/powered/bar) "jm" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/machinery/economy/vending/cigarette, /turf/simulated/floor/plasteel{ dir = 9; @@ -534,7 +534,7 @@ }, /area/ruin/space/powered/bar) "tv" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/storage/toolbox/electrical, /turf/simulated/floor/plating, /area/ruin/space/powered/bar) @@ -575,12 +575,12 @@ /turf/simulated/floor/wood, /area/ruin/space/powered/bar) "wy" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/holosign/barrier/engineering, /turf/simulated/floor/plating, /area/ruin/space/powered/bar) "wL" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/crowbar/small, /obj/effect/decal/cleanable/blood/writing, /turf/simulated/floor/plating, @@ -608,13 +608,13 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/ruin/space/powered/bar) "yW" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/powered/bar) "yX" = ( @@ -775,7 +775,7 @@ }, /area/ruin/space/powered/bar) "KM" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/cable_coil{ amount = 1 }, @@ -839,7 +839,7 @@ "Ni" = ( /obj/machinery/kitchen_machine/microwave, /obj/structure/table/wood, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/wood, /area/ruin/space/powered/bar) "Nl" = ( @@ -869,7 +869,7 @@ /turf/simulated/floor/wood, /area/ruin/space/powered/bar) "Of" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -898,7 +898,7 @@ /turf/simulated/floor/plating/asteroid/ancient, /area/ruin/space/powered) "QU" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/tile/mineral, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -932,7 +932,7 @@ /turf/simulated/floor/plating/asteroid/ancient, /area/space/nearstation) "UO" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/structure/computerframe{ dir = 8 }, @@ -953,7 +953,7 @@ /turf/simulated/floor/plating, /area/ruin/space/powered/bar) "VU" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /obj/machinery/light_construct/small{ dir = 8 diff --git a/_maps/map_files/RandomRuins/SpaceRuins/submaps/telecomns_returns_submap.dmm b/_maps/map_files/RandomRuins/SpaceRuins/submaps/telecomns_returns_submap.dmm index 10fbaad8e0424..9212722f6953c 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/submaps/telecomns_returns_submap.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/submaps/telecomns_returns_submap.dmm @@ -81,7 +81,7 @@ /area/template_noop) "iP" = ( /obj/machinery/economy/vending/cola, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/mineral/plastitanium/red, /area/template_noop) "jh" = ( @@ -179,7 +179,7 @@ /area/template_noop) "sm" = ( /obj/machinery/economy/vending/cola, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/template_noop, /area/template_noop) "uH" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm index ee7e03df5065a..b3614e01e6793 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm @@ -226,7 +226,7 @@ /turf/simulated/mineral/random/high_chance, /area/ruin/space/syndicate_druglab/asteroid) "yV" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/pod/dark, /area/ruin/space/syndicate_druglab) "AE" = ( @@ -312,7 +312,7 @@ /turf/simulated/floor/pod/dark, /area/ruin/space/syndicate_druglab) "Im" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stock_parts/manipulator/nano, /turf/simulated/floor/pod/dark, /area/ruin/space/syndicate_druglab) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm index 26c6e5586f9f9..1dbe1e1e2f757 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm @@ -224,7 +224,7 @@ }, /area/ruin/space/syndicakefactory) "hF" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/engine/airless, /area/ruin/space/syndicakefactory) "hH" = ( @@ -344,7 +344,7 @@ }, /area/ruin/space/syndicakefactory) "oH" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/ruin/space/syndicakefactory) "oJ" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm index ce4becef7b458..842ba45029dda 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm @@ -832,7 +832,7 @@ /turf/simulated/floor/mineral/silver, /area/syndicate_depot/core) "cs" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating/asteroid/airless, /area/syndicate_depot/outer) "ct" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm b/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm index bbf18163048f3..94f6209c037d5 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm @@ -36,7 +36,7 @@ icon_state = "2-4" }, /mob/living/simple_animal/hostile/malf_drone, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/catwalk, /area/ruin/space/telecomms/powercontrol) "bb" = ( @@ -278,7 +278,7 @@ /turf/space, /area/space/nearstation/no_teleport) "fc" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/bluegrid{ icon_state = "dark"; name = "Mainframe Floor"; @@ -426,7 +426,7 @@ /turf/simulated/floor/plasteel, /area/ruin/space/telecomms/tele) "ia" = ( -/obj/effect/spawner/random_spawners/telecomms_emp_loot, +/obj/effect/spawner/random/telecomms_emp_loot, /turf/simulated/floor/engine, /area/ruin/space/telecomms/computer) "ik" = ( @@ -539,7 +539,7 @@ /area/ruin/space/telecomms/chamber) "kU" = ( /obj/structure/closet/malf/suits, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plasteel, /area/ruin/space/telecomms/tele) "kV" = ( @@ -602,7 +602,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/catwalk, /area/ruin/space/telecomms/powercontrol) "lB" = ( @@ -909,8 +909,8 @@ /turf/simulated/floor/plasteel, /area/ruin/space/telecomms/foyer) "pE" = ( -/obj/effect/spawner/random_spawners/cobweb_left_frequent, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/engine, /area/ruin/space/telecomms/computer) "pS" = ( @@ -1663,7 +1663,7 @@ pixel_y = 10; pixel_x = -7 }, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/item/salvage/ruin/nanotrasen{ pixel_x = 5 }, @@ -2402,7 +2402,7 @@ /area/space/nearstation/no_teleport) "Ky" = ( /obj/machinery/computer/nonfunctional, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel, /area/ruin/space/telecomms/computer) "KH" = ( @@ -2553,7 +2553,7 @@ /turf/simulated/floor/catwalk, /area/ruin/space/telecomms) "Nb" = ( -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/catwalk, /area/ruin/space/telecomms/powercontrol) "No" = ( @@ -2609,7 +2609,7 @@ "Nz" = ( /obj/structure/rack, /obj/item/circuitboard/sleeper/syndicate, -/obj/effect/spawner/random_spawners/telecomms_teleprod_maybe, +/obj/effect/spawner/random/telecomms_teleprod_maybe, /turf/simulated/floor/plasteel, /area/ruin/space/telecomms) "NY" = ( @@ -3301,7 +3301,7 @@ dir = 8 }, /obj/machinery/atmospherics/portable/canister/air, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/catwalk, /area/ruin/space/telecomms/powercontrol) "Zt" = ( @@ -3329,7 +3329,7 @@ dir = 4; level = 1 }, -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/catwalk, /area/ruin/space/telecomms/powercontrol) "ZQ" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/unathi_skiff.dmm b/_maps/map_files/RandomRuins/SpaceRuins/unathi_skiff.dmm new file mode 100644 index 0000000000000..c299df4f9a86c --- /dev/null +++ b/_maps/map_files/RandomRuins/SpaceRuins/unathi_skiff.dmm @@ -0,0 +1,1193 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aZ" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/engineering) +"bF" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"cI" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/ruin/space/unathi_breacher/bridge) +"dg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/mineral/plastitanium/red, +/area/ruin/space/unathi_breacher/bridge) +"dq" = ( +/obj/machinery/computer/nonfunctional{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/ruin/space/unathi_breacher/bridge) +"dt" = ( +/obj/item/cigbutt/roach, +/turf/simulated/floor/plasteel/airless, +/area/ruin/space/unathi_breacher/engineering) +"dK" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"ec" = ( +/mob/living/simple_animal/hostile/drakehound_breacher, +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unathi_breacher/engineering) +"fJ" = ( +/obj/structure/rack, +/obj/item/storage/box/breacher, +/turf/simulated/floor/pod/dark, +/area/ruin/space/unathi_breacher/hold) +"fN" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel/airless, +/area/ruin/space/unathi_breacher/engineering) +"he" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/ruin/space/unathi_breacher/bridge) +"hB" = ( +/obj/structure/bed{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"hP" = ( +/obj/effect/turf_decal/siding, +/obj/machinery/computer/nonfunctional, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/unathi_breacher/bridge) +"hT" = ( +/obj/machinery/computer/nonfunctional{ + dir = 1 + }, +/obj/effect/turf_decal/siding{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/unathi_breacher/bridge) +"iF" = ( +/obj/effect/spawner/random/food_trash, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"jo" = ( +/obj/structure/window/full/shuttle/survival_pod/tinted, +/turf/simulated/floor/plating, +/area/ruin/space/unathi_breacher/dorms) +"jA" = ( +/obj/machinery/door/airlock/hatch, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/unathi_breacher/bridge) +"jC" = ( +/obj/structure/rack, +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/turf/simulated/floor/pod/dark, +/area/ruin/space/unathi_breacher/hold) +"kb" = ( +/obj/structure/rack, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/turf/simulated/floor/pod/dark, +/area/ruin/space/unathi_breacher/hold) +"kf" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel/airless, +/area/ruin/space/unathi_breacher/engineering) +"kt" = ( +/obj/structure/table, +/obj/item/screwdriver, +/turf/simulated/floor/plasteel/airless, +/area/ruin/space/unathi_breacher/engineering) +"li" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/effect/turf_decal/caution/stand_clear/red, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"lq" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/drinks/bottle/random_drink, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"lJ" = ( +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/mineral/plastitanium/red, +/area/ruin/space/unathi_breacher/bridge) +"mj" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/mob/living/simple_animal/hostile/drakehound_breacher, +/obj/effect/turf_decal/siding, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/unathi_breacher/bridge) +"mC" = ( +/turf/simulated/wall/mineral/titanium/survival/pod, +/area/ruin/space/unathi_breacher/bar) +"mH" = ( +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"ny" = ( +/obj/item/stack/sheet/mineral/plasma, +/turf/space, +/area/space) +"nU" = ( +/obj/structure/shuttle/engine/large{ + dir = 8 + }, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unathi_breacher/engineering) +"oa" = ( +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plating/damaged/airless, +/area/ruin/space/unathi_breacher/engineering) +"ol" = ( +/obj/structure/girder, +/turf/simulated/floor/plating/damaged/airless, +/area/ruin/space/unathi_breacher/engineering) +"oK" = ( +/obj/structure/rack, +/obj/item/claymore/ceremonial, +/turf/simulated/floor/pod/dark, +/area/ruin/space/unathi_breacher/hold) +"pP" = ( +/obj/structure/girder, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unathi_breacher/dorms) +"pW" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/mineral/plastitanium/red/airless, +/area/ruin/space/unathi_breacher/bridge) +"pZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/red/line, +/obj/effect/turf_decal/caution/stand_clear/red, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"qp" = ( +/obj/structure/table, +/obj/item/wrench, +/turf/simulated/floor/plasteel/airless, +/area/ruin/space/unathi_breacher/engineering) +"ri" = ( +/mob/living/simple_animal/lizard{ + name = "Lil' Fella" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/pod/dark, +/area/ruin/space/unathi_breacher/hold) +"rl" = ( +/obj/item/toy/plushie/voxplushie{ + has_stuffing = 0 + }, +/turf/space, +/area/space) +"rv" = ( +/obj/structure/chair/stool/bar, +/mob/living/simple_animal/hostile/drakehound_breacher, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"rx" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/pod/dark, +/area/ruin/space/unathi_breacher/hold) +"rI" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel/airless, +/area/ruin/space/unathi_breacher/engineering) +"rJ" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"tT" = ( +/obj/effect/turf_decal/stripes/red/corner{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"uN" = ( +/obj/item/stack/rods, +/obj/item/stack/rods, +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unathi_breacher/engineering) +"vc" = ( +/obj/machinery/suit_storage_unit, +/turf/simulated/floor/plasteel/airless, +/area/ruin/space/unathi_breacher/engineering) +"vY" = ( +/obj/effect/turf_decal/stripes/red/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"wV" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4 + }, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unathi_breacher/engineering) +"xJ" = ( +/obj/item/stack/rods, +/obj/item/stack/sheet/mineral/plastitanium, +/turf/space, +/area/space) +"yi" = ( +/obj/machinery/door/poddoor, +/obj/machinery/door/airlock/survival_pod{ + locked = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"yx" = ( +/turf/simulated/floor/mineral/plastitanium/red, +/area/ruin/space/unathi_breacher/bridge) +"yy" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel/airless, +/area/ruin/space/unathi_breacher/engineering) +"yB" = ( +/obj/item/cigbutt/roach, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unathi_breacher/engineering) +"za" = ( +/obj/effect/turf_decal/stripes/red/corner{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"zC" = ( +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/unathi_breacher/bridge) +"zQ" = ( +/obj/machinery/door/poddoor, +/obj/machinery/door/airlock/survival_pod{ + locked = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red/airless, +/area/ruin/space/unathi_breacher/bridge) +"zX" = ( +/obj/machinery/power/port_gen/pacman, +/turf/simulated/floor/plasteel/airless, +/area/ruin/space/unathi_breacher/engineering) +"Ah" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/survival_pod, +/turf/simulated/floor/mineral/plastitanium/red, +/area/ruin/space/unathi_breacher/bridge) +"Aj" = ( +/obj/machinery/power/apc/off_station/empty_charge/directional/west, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/ruin/space/unathi_breacher/bridge) +"AA" = ( +/obj/structure/rack, +/obj/item/salvage/loot/pirate, +/obj/item/salvage/loot/pirate, +/turf/simulated/floor/pod/dark, +/area/ruin/space/unathi_breacher/hold) +"AL" = ( +/obj/effect/spawner/random/food_trash, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"Bg" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/mob/living/simple_animal/hostile/drakehound_breacher, +/obj/effect/turf_decal/siding{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/unathi_breacher/bridge) +"CC" = ( +/obj/item/stack/rods, +/turf/space, +/area/space) +"CM" = ( +/obj/structure/rack, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/obj/item/stack/sheet/mineral/gold, +/turf/simulated/floor/pod/dark, +/area/ruin/space/unathi_breacher/hold) +"CZ" = ( +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"Dp" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/unathi_breacher/bridge) +"Eq" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"FR" = ( +/obj/item/stack/sheet/mineral/plasma, +/obj/machinery/light_construct/small{ + dir = 4 + }, +/turf/space, +/area/space) +"Gb" = ( +/turf/space, +/area/space) +"GH" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/chair/sofa/left, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"GR" = ( +/turf/simulated/wall/r_wall, +/area/ruin/space/unathi_breacher/hold) +"Hr" = ( +/obj/item/cigbutt/roach, +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unathi_breacher/engineering) +"Hz" = ( +/obj/structure/shelf, +/obj/item/weldingtool/largetank, +/obj/item/weldingtool/largetank, +/obj/item/weldingtool/largetank, +/obj/item/reagent_containers/glass/bottle/thermite, +/obj/item/reagent_containers/glass/bottle/thermite, +/turf/simulated/floor/mineral/plastitanium/red, +/area/ruin/space/unathi_breacher/bridge) +"HK" = ( +/obj/machinery/power/apc/off_station/empty_charge/directional/north, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-4" + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"Ik" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/chair/sofa/right, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"IN" = ( +/obj/item/toy/plushie/lizardplushie, +/obj/structure/bed, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"Jy" = ( +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/unathi_breacher/bridge) +"Kf" = ( +/turf/simulated/floor/plasteel/airless, +/area/ruin/space/unathi_breacher/engineering) +"LO" = ( +/obj/structure/window/full/shuttle/survival_pod/tinted, +/turf/simulated/floor/plating, +/area/ruin/space/unathi_breacher/bridge) +"LX" = ( +/obj/structure/bed, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"Mt" = ( +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unathi_breacher/engineering) +"MI" = ( +/turf/simulated/wall/mineral/titanium/survival/pod, +/area/ruin/space/unathi_breacher/bridge) +"MX" = ( +/obj/structure/window/full/shuttle/survival_pod/tinted, +/turf/simulated/floor/plating, +/area/ruin/space/unathi_breacher/bar) +"NT" = ( +/turf/simulated/wall/mineral/titanium/survival/pod, +/area/ruin/space/unathi_breacher/engineering) +"Oe" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plasteel/airless, +/area/ruin/space/unathi_breacher/engineering) +"OW" = ( +/obj/effect/decal/cleanable/ash, +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plating/burnt/airless, +/area/ruin/space/unathi_breacher/engineering) +"Pq" = ( +/obj/machinery/atmospherics/unary/tank/oxygen, +/turf/simulated/floor/plasteel/airless, +/area/ruin/space/unathi_breacher/engineering) +"Pr" = ( +/obj/machinery/power/apc/off_station/empty_charge/directional/north, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/pod/dark, +/area/ruin/space/unathi_breacher/hold) +"Pt" = ( +/obj/effect/spawner/random/food_trash, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"PE" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"PV" = ( +/turf/simulated/floor/plating/airless, +/area/ruin/space/unathi_breacher/engineering) +"Qa" = ( +/obj/machinery/door/airlock/hatch, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/unathi_breacher/bridge) +"Qh" = ( +/obj/item/stack/cable_coil/ten, +/turf/space, +/area/space) +"QI" = ( +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/turf/space, +/area/space) +"QK" = ( +/obj/machinery/power/apc/off_station/empty_charge/directional/north, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unathi_breacher/engineering) +"QL" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "secure hold door"; + locked = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/pod/dark, +/area/ruin/space/unathi_breacher/hold) +"QS" = ( +/mob/living/simple_animal/hostile/drakehound_breacher, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"RI" = ( +/obj/item/stack/rods, +/obj/structure/table_frame, +/mob/living/simple_animal/hostile/drakehound_breacher, +/turf/space, +/area/space) +"Sg" = ( +/obj/effect/turf_decal/siding{ + dir = 6 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/unathi_breacher/bridge) +"SR" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/ruin/space/unathi_breacher/bridge) +"Tg" = ( +/obj/machinery/economy/vending/boozeomat, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"Tk" = ( +/obj/machinery/barsign, +/turf/simulated/wall/r_wall, +/area/ruin/space/unathi_breacher/hold) +"Uk" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/pod/dark, +/area/ruin/space/unathi_breacher/hold) +"UV" = ( +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc/off_station/empty_charge/directional/south, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"UX" = ( +/obj/structure/chair/stool/bar, +/obj/effect/spawner/random/food_trash, +/obj/effect/turf_decal/stripes/red/corner, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"VI" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"VX" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"Wu" = ( +/obj/effect/spawner/random/food_trash, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/bar) +"Xq" = ( +/obj/machinery/door/poddoor, +/obj/machinery/door/airlock/survival_pod{ + locked = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"XA" = ( +/obj/item/toy/plushie/lizardplushie, +/obj/structure/table, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"Yf" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unathi_breacher/engineering) +"YO" = ( +/obj/effect/turf_decal/siding{ + dir = 5 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/ruin/space/unathi_breacher/bridge) +"Za" = ( +/turf/simulated/floor/pod/dark, +/area/ruin/space/unathi_breacher/hold) +"Zl" = ( +/turf/simulated/wall/mineral/titanium/survival/pod, +/area/ruin/space/unathi_breacher/dorms) +"ZR" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plasteel/dark, +/area/ruin/space/unathi_breacher/dorms) +"ZY" = ( +/obj/effect/decal/remains/human, +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unathi_breacher/engineering) + +(1,1,1) = {" +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +"} +(2,1,1) = {" +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Mt +Gb +PV +nU +Gb +Gb +Gb +"} +(3,1,1) = {" +Gb +Gb +Gb +Gb +Gb +Gb +Gb +QI +Mt +wV +PV +PV +NT +Gb +Gb +"} +(4,1,1) = {" +Gb +Gb +xJ +Gb +CC +Gb +Qh +ol +ol +NT +NT +NT +NT +Gb +Gb +"} +(5,1,1) = {" +Gb +Gb +xJ +ny +rl +xJ +OW +oa +ec +Mt +zX +kt +NT +Gb +Gb +"} +(6,1,1) = {" +Gb +Gb +NT +RI +FR +ZY +Hr +uN +Mt +dt +Oe +qp +NT +Gb +Gb +"} +(7,1,1) = {" +Gb +Gb +Zl +Zl +Zl +pP +Mt +Mt +Yf +mC +mC +mC +mC +Gb +Gb +"} +(8,1,1) = {" +Gb +Gb +Zl +hB +hB +Zl +QK +PV +rI +mC +PE +PE +mC +Gb +Gb +"} +(9,1,1) = {" +Gb +Zl +Zl +CZ +UV +Zl +yB +Kf +rI +mC +HK +mH +mC +mC +Gb +"} +(10,1,1) = {" +Gb +Zl +hB +CZ +iF +aZ +fN +yy +kf +aZ +dK +mH +mH +mC +Gb +"} +(11,1,1) = {" +Gb +Zl +AL +CZ +VX +Zl +vc +Pq +vc +mC +rJ +lq +VI +mC +Gb +"} +(12,1,1) = {" +Gb +Zl +tT +CZ +ZR +GR +GR +GR +GR +Tk +bF +rv +UX +mC +Gb +"} +(13,1,1) = {" +Gb +Xq +li +CZ +LX +GR +fJ +Uk +AA +GR +Wu +mH +pZ +yi +Gb +"} +(14,1,1) = {" +Gb +Zl +vY +QS +XA +GR +Pr +ri +Za +GR +Ik +mH +za +mC +Gb +"} +(15,1,1) = {" +Gb +jo +Pt +CZ +hB +GR +CM +rx +oK +GR +GH +mH +mH +MX +Gb +"} +(16,1,1) = {" +Gb +jo +CZ +VX +CZ +GR +Za +rx +Za +GR +rJ +mH +mH +MX +Gb +"} +(17,1,1) = {" +Gb +Zl +IN +CZ +VX +GR +jC +rx +kb +GR +Eq +PE +Tg +mC +Gb +"} +(18,1,1) = {" +Gb +Zl +Zl +Zl +Qa +GR +GR +QL +GR +GR +jA +mC +mC +mC +Gb +"} +(19,1,1) = {" +Gb +Gb +MI +zC +zC +mj +yx +he +Aj +Bg +Dp +zC +MI +Gb +Gb +"} +(20,1,1) = {" +Gb +Gb +LO +zC +Jy +Sg +yx +yx +yx +YO +Jy +zC +LO +Gb +Gb +"} +(21,1,1) = {" +Gb +Gb +MI +hP +SR +yx +Hz +dg +yx +yx +lJ +hT +MI +Gb +Gb +"} +(22,1,1) = {" +Gb +Gb +MI +MI +cI +cI +MI +Ah +MI +cI +cI +MI +MI +Gb +Gb +"} +(23,1,1) = {" +Gb +Gb +Gb +MI +dq +dq +MI +pW +MI +dq +dq +MI +Gb +Gb +Gb +"} +(24,1,1) = {" +Gb +Gb +Gb +MI +MI +MI +MI +zQ +MI +MI +MI +MI +Gb +Gb +Gb +"} +(25,1,1) = {" +Gb +Gb +Gb +Gb +MI +MI +Gb +Gb +Gb +MI +MI +Gb +Gb +Gb +Gb +"} +(26,1,1) = {" +Gb +Gb +Gb +Gb +Gb +MI +Gb +Gb +Gb +MI +Gb +Gb +Gb +Gb +Gb +"} +(27,1,1) = {" +Gb +Gb +Gb +Gb +Gb +MI +Gb +Gb +Gb +MI +Gb +Gb +Gb +Gb +Gb +"} +(28,1,1) = {" +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +Gb +"} diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index 5265570fb7dd5..0d96dad40443d 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -64,16 +64,16 @@ /turf/simulated/floor/plating, /area/ruin/space/derelict/bridge) "ao" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, /area/ruin/space/derelict/bridge) "ap" = ( -/obj/effect/landmark/damageturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, /area/ruin/space/derelict/bridge) "aq" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/spawner/window/shuttle, /obj/machinery/door/poddoor/shutters{ dir = 2; @@ -84,7 +84,7 @@ /turf/simulated/floor/plating, /area/ruin/space/derelict/bridge) "ar" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/spawner/window/shuttle, /obj/machinery/door/poddoor/shutters{ dir = 2; @@ -149,7 +149,7 @@ }, /area/ruin/space/derelict/bridge) "ay" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/computerframe{ desc = "This computer is a husk of what it once was. Time and decay has worn its cheap circuitry to dust."; name = "decrepit computer" @@ -276,8 +276,8 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/derelict/bridge) "aN" = ( -/obj/effect/landmark/damageturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/shard{ icon_state = "small" }, @@ -298,7 +298,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/derelict/bridge) "aQ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/remains/human{ desc = "This guy seemed to have died in terrible way! Half his remains are dust."; name = "Human remains" @@ -732,7 +732,7 @@ }, /area/ruin/space/derelict/arrival) "bV" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/derelict/bridge) "bW" = ( @@ -902,7 +902,7 @@ /obj/structure/rack, /obj/item/reagent_containers/drinks/bottle/vodka/badminka, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/derelict/bridge) "ct" = ( @@ -1065,10 +1065,6 @@ /obj/structure/sign/mech, /turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, /area/ruin/space/derelict/arrival) -"cM" = ( -/obj/structure/sign/securearea, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, -/area/ruin/space/derelict/arrival) "cN" = ( /obj/machinery/door/airlock/hatch{ desc = "A sturdy armoury door. If you listen closely, you can barely make out a soviet marching tune coming from the other side of the door."; @@ -1803,7 +1799,7 @@ /area/ruin/space/derelict/crew_quarters) "eC" = ( /obj/structure/chair/wood, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/derelict/crew_quarters) "eD" = ( @@ -1830,7 +1826,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/derelict/crew_quarters) "eH" = ( @@ -2203,7 +2199,7 @@ /obj/structure/chair/wood{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/derelict/crew_quarters) "fx" = ( @@ -2223,7 +2219,7 @@ /area/ruin/space/derelict/crew_quarters) "fz" = ( /obj/structure/mopbucket, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/derelict/crew_quarters) "fA" = ( @@ -2371,18 +2367,6 @@ icon_state = "caution" }, /area/ruin/space/derelict/hallway/primary) -"fT" = ( -/obj/machinery/door_control{ - id = "ruslock"; - layer = 2.1; - 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 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/shotgun, /turf/simulated/floor/wood, @@ -2532,7 +2516,7 @@ /area/ruin/space/derelict/crew_quarters) "gn" = ( /obj/structure/chair/stool/bar, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/derelict/crew_quarters) "go" = ( @@ -2612,7 +2596,7 @@ }, /area/ruin/space/derelict/hallway/primary) "gy" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, /area/ruin/space/derelict/hallway/primary) "gz" = ( @@ -2746,7 +2730,7 @@ /turf/template_noop, /area/space/nearstation) "gS" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; @@ -2873,7 +2857,7 @@ /turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, /area/ruin/space/derelict/hallway/primary) "hi" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/table/reinforced, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass, @@ -3001,7 +2985,7 @@ }, /area/ruin/space/derelict/hallway/primary) "hz" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, /area/ruin/space/derelict/hallway/primary) "hA" = ( @@ -3014,7 +2998,7 @@ }, /area/ruin/space/derelict/hallway/primary) "hB" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "caution" @@ -3251,7 +3235,7 @@ /turf/simulated/floor/plating, /area/ruin/space/derelict/hallway/primary) "ig" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/flora/rock/pile, /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) @@ -3505,7 +3489,7 @@ }, /area/ruin/space/derelict/arrival) "iU" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel, /area/ruin/space/derelict/arrival) "iV" = ( @@ -3553,7 +3537,7 @@ /turf/template_noop, /area/ruin/space/derelict/hallway/primary) "iZ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/remains/human{ desc = "This guy seemed to have died in terrible way! Half his remains are dust."; name = "Human remains" @@ -3667,11 +3651,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/plasteel, /area/ruin/space/derelict/arrival) -"jq" = ( -/obj/effect/landmark/burnturf, -/obj/item/trash/spentcasing/bullet, -/turf/simulated/floor/plasteel, -/area/ruin/space/derelict/arrival) "jr" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ @@ -3739,7 +3718,7 @@ /turf/template_noop, /area/ruin/space/derelict/hallway/primary) "jz" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) "jA" = ( @@ -4087,7 +4066,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) "kp" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/ore/slag, /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) @@ -4666,7 +4645,7 @@ /turf/template_noop, /area/ruin/space/derelict/solar_control) "lD" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/engine/vacuum, /area/ruin/space/derelict/hallway/primary) "lE" = ( @@ -4885,14 +4864,14 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) "mk" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ dir = 5; icon_state = "green" }, /area/ruin/space/derelict/hallway/primary) "ml" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/grille/broken, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating/airless, @@ -4986,7 +4965,7 @@ /turf/simulated/floor/plasteel/airless, /area/ruin/space/derelict/hallway/primary) "mz" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/ruin/space/derelict/hallway/primary) "mA" = ( @@ -5053,7 +5032,7 @@ /turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, /area/ruin/space/derelict/arrival) "mL" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ dir = 8; icon_state = "green" @@ -5346,13 +5325,13 @@ }, /area/ruin/space/derelict/arrival) "nx" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "white" }, /area/ruin/space/derelict/arrival) "ny" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light/small{ dir = 1 }, @@ -5410,8 +5389,8 @@ }, /area/ruin/space/derelict/arrival) "nG" = ( -/obj/effect/landmark/damageturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "floorscorched2" }, @@ -5456,12 +5435,12 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) "nN" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/ore/iron, /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/hallway/primary) "nO" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/clothing/suit/tracksuit, /obj/item/clothing/under/pants/track, /obj/item/clothing/shoes/black, @@ -5566,7 +5545,7 @@ }, /area/ruin/space/derelict/arrival) "oa" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "floorscorched2" }, @@ -5581,14 +5560,14 @@ /turf/template_noop, /area/ruin/space/derelict/arrival) "od" = ( -/obj/effect/landmark/damageturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/grille/broken, /turf/simulated/floor/plating/airless, /area/space/nearstation) "oe" = ( -/obj/effect/landmark/damageturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless, /area/ruin/space/derelict/hallway/primary) "of" = ( @@ -5675,7 +5654,7 @@ }, /area/ruin/space/derelict/hallway/primary) "or" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/flora/rock/pile, /turf/simulated/floor/plasteel/airless, /area/ruin/space/derelict/hallway/primary) @@ -5797,14 +5776,14 @@ /turf/template_noop, /area/ruin/space/derelict/arrival) "oE" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/grille/broken, /turf/simulated/floor/plasteel/airless{ icon_state = "floorscorched2" }, /area/ruin/space/derelict/arrival) "oF" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "floorscorched2" }, @@ -5881,7 +5860,7 @@ }, /area/ruin/space/derelict/crew_quarters) "oS" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/ore/iron, /turf/simulated/floor/plasteel/airless{ icon_state = "floorscorched2" @@ -6042,7 +6021,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/arrival) "pp" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/arrival) "pq" = ( @@ -6118,7 +6097,7 @@ }, /area/ruin/space/derelict/crew_quarters) "pA" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "white" }, @@ -6163,14 +6142,14 @@ }, /area/ruin/space/derelict/crew_quarters) "pH" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/hemostat, /turf/simulated/floor/plasteel/airless{ icon_state = "floorscorched2" }, /area/ruin/space/derelict/arrival) "pI" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light/small{ dir = 4 }, @@ -6179,7 +6158,7 @@ }, /area/ruin/space/derelict/arrival) "pJ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, /area/ruin/space/derelict/arrival) "pK" = ( @@ -6308,7 +6287,7 @@ }, /area/ruin/space/derelict/crew_quarters) "qa" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/stack/cable_coil/cut{ amount = 1 }, @@ -6347,7 +6326,7 @@ }, /area/ruin/space/derelict/crew_quarters) "qf" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/ore/slag, /obj/structure/grille/broken, /turf/simulated/floor/plasteel/airless{ @@ -6411,7 +6390,7 @@ }, /area/ruin/space/derelict/crew_quarters) "qp" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, /area/ruin/space/derelict/arrival) "qr" = ( @@ -7392,6 +7371,18 @@ /obj/effect/spawner/random/fungus/frequent, /turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, /area/ruin/space/derelict/arrival) +"Bx" = ( +/obj/machinery/door_control{ + id = "ruslock"; + layer = 2.1; + 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 Soviet cigarette!","Cigarettes! Now with 100% less capitalism.") + }, +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/wood, +/area/ruin/space/derelict/crew_quarters) "Ci" = ( /mob/living/simple_animal/hostile/pirate/ranged, /turf/simulated/floor/plasteel/airless{ @@ -7405,6 +7396,10 @@ }, /turf/simulated/floor/plasteel/dark, /area/ruin/space/derelict/crew_quarters) +"El" = ( +/obj/structure/sign/securearea, +/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/area/ruin/space/derelict/arrival) "Mi" = ( /obj/effect/spawner/random/fungus/frequent, /turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, @@ -7430,6 +7425,11 @@ icon_state = "red" }, /area/ruin/space/derelict/arrival) +"Tc" = ( +/obj/effect/mapping_helpers/turfs/burn, +/obj/item/trash/spentcasing/bullet, +/turf/simulated/floor/plasteel, +/area/ruin/space/derelict/arrival) "XQ" = ( /obj/structure/chair/wood{ dir = 4 @@ -8589,7 +8589,7 @@ aW bn ed en -cM +El fg fB fX @@ -8693,7 +8693,7 @@ hM ia iz iV -jq +Tc jZ kS lx @@ -8865,7 +8865,7 @@ dQ do do cm -cM +El de fE fZ @@ -9408,7 +9408,7 @@ aW bn cm cA -cM +El cA do dD @@ -9592,7 +9592,7 @@ bF bT co cA -cM +El dg ds bn @@ -13007,7 +13007,7 @@ ek eD fb eD -fT +Bx bm dH aV diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm index 305ddef9a9c88..5d5105c61bf60 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm @@ -14,7 +14,7 @@ }, /area/ruin/space/derelict/teleporter) "dj" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/space/nearstation) "ds" = ( @@ -79,7 +79,7 @@ /area/space/nearstation) "ic" = ( /obj/effect/turf_decal/stripes/line, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light{ dir = 8 }, @@ -141,7 +141,7 @@ }, /area/ruin/space/derelict/teleporter) "mY" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, @@ -167,7 +167,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/remains/human, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" @@ -204,7 +204,7 @@ /area/ruin/space/derelict/teleporter) "pZ" = ( /obj/effect/turf_decal/stripes/line, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, @@ -331,7 +331,7 @@ }, /area/ruin/space/derelict/teleporter) "Av" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/teleporter) "Dp" = ( @@ -350,19 +350,19 @@ }, /area/ruin/space/derelict/teleporter) "FQ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/teleporter) "HC" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/teleporter) "HL" = ( /mob/living/simple_animal/hostile/carp/megacarp, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/teleporter) "Io" = ( @@ -399,7 +399,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, @@ -412,7 +412,7 @@ }, /area/ruin/space/derelict/teleporter) "Vu" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -435,7 +435,7 @@ /area/ruin/space/derelict/teleporter) "Wu" = ( /obj/effect/spawner/window/shuttle, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/derelict/teleporter) "Zl" = ( @@ -451,7 +451,7 @@ /turf/template_noop, /area/ruin/space/derelict/teleporter) "ZN" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm index b6e072a07e2e1..b4e529f766542 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm @@ -3,11 +3,11 @@ /obj/structure/sign/vacuum/external{ pixel_y = -32 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/shuttle/abandoned) "cf" = ( -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/plating, /area/shuttle/abandoned) "cA" = ( @@ -144,7 +144,7 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "sm" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/door/airlock/titanium, /turf/simulated/floor/plating, /area/shuttle/abandoned) @@ -176,7 +176,7 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "vz" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, @@ -308,7 +308,7 @@ /turf/simulated/floor/wood, /area/shuttle/abandoned) "Kd" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) "KX" = ( @@ -355,7 +355,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/shuttle/abandoned) "Ro" = ( @@ -371,7 +371,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/shuttle/abandoned) "Vd" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/shuttle/abandoned) "VD" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm index c1b6dad133e1c..2e638bbc1c3fd 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm @@ -13,7 +13,7 @@ /obj/item/shard{ icon_state = "small" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/powered) "ae" = ( @@ -21,17 +21,17 @@ /area/ruin/space/powered) "af" = ( /obj/structure/computerframe, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/powered) "ag" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/powered) "ah" = ( /obj/structure/grille/broken, /obj/item/shard, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/powered) "aj" = ( @@ -84,7 +84,7 @@ dir = 1; in_use = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/powered) "as" = ( @@ -240,7 +240,7 @@ /area/ruin/space/powered) "aW" = ( /obj/effect/spawner/window/reinforced, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/powered) "aY" = ( @@ -491,7 +491,7 @@ "YM" = ( /obj/structure/table/wood, /obj/item/blank_tarot_card, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ruin/space/powered) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm index 243674063756f..21203db3e6dbb 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm @@ -365,7 +365,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/largecrate, /turf/simulated/floor/plasteel{ dir = 4; @@ -432,7 +432,7 @@ /obj/machinery/door/firedoor/border_only/closed{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/wreck_cargoship) "py" = ( @@ -549,13 +549,13 @@ }, /area/ruin/space/wreck_cargoship) "tm" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/ruin/space/wreck_cargoship) "tn" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/door/poddoor/shutters{ dir = 8; id_tag = "cargoshipblastdoor4" @@ -603,7 +603,7 @@ }, /area/ruin/space/wreck_cargoship) "wf" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -802,7 +802,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "black" }, @@ -938,7 +938,7 @@ }, /area/ruin/space/wreck_cargoship) "Mc" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/wreck_cargoship) "Mt" = ( @@ -1079,7 +1079,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/button/windowtint{ pixel_y = -32 }, @@ -1098,7 +1098,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel{ icon_state = "black" }, diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index c1955a7c2c53e..338bf9cccca0f 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -76,7 +76,7 @@ /turf/simulated/mineral/random/volcanic/labormineral, /area/lavaland/surface/outdoors) "ao" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "ap" = ( @@ -172,7 +172,7 @@ /area/mine/laborcamp) "aL" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "aN" = ( @@ -497,7 +497,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/catwalk, /area/mine/outpost/hallway/west) "bU" = ( @@ -614,8 +614,8 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/dirt/maybe, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "ch" = ( @@ -741,7 +741,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/storage) "cx" = ( @@ -831,7 +831,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/mapping_helpers/airlock/access/any/supply/qm, /obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, /turf/simulated/floor/plasteel/dark, @@ -848,7 +848,7 @@ /area/mine/outpost/hallway/east) "cM" = ( /obj/effect/spawner/random/fungus/maybe, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/lavaland/surface/outdoors/outpost/catwalk) "cN" = ( @@ -990,7 +990,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/cable{ icon_state = "0-8" }, @@ -1024,7 +1024,7 @@ dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -1268,7 +1268,7 @@ }, /area/mine/outpost/storage) "dB" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/production) "dC" = ( @@ -1280,7 +1280,7 @@ /area/mine/outpost/production) "dD" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/cyan, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -1297,7 +1297,7 @@ name = "west bump"; pixel_x = -27 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -1380,7 +1380,7 @@ /turf/simulated/floor/plating, /area/mine/outpost/production) "dM" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/effect/decal/cleanable/glass, /obj/machinery/requests_console/directional/west, /turf/simulated/floor/plating, @@ -1483,7 +1483,7 @@ }, /area/mine/outpost/cafeteria) "dW" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) "dX" = ( @@ -1599,6 +1599,12 @@ icon_state = "darkfull" }, /area/mine/outpost/hallway/east) +"ek" = ( +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors/targetable) "el" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -1629,7 +1635,7 @@ "eo" = ( /obj/structure/flora/ash/leaf_shroom, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "ep" = ( /obj/structure/cable{ icon_state = "0-4" @@ -1725,7 +1731,7 @@ "ex" = ( /obj/effect/turf_decal/delivery/hollow, /obj/structure/ore_box, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -1888,7 +1894,7 @@ /area/mine/outpost/mechbay) "eL" = ( /obj/structure/closet/crate, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/vending_refill/wallmed, /obj/item/vending_refill/cigarette, /turf/simulated/floor/plating, @@ -2038,7 +2044,7 @@ /turf/simulated/floor/plating, /area/mine/outpost/production) "fa" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /obj/effect/spawner/random/fungus/maybe, /turf/simulated/wall, /area/lavaland/surface/outdoors/outpost/catwalk) @@ -2050,7 +2056,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "fc" = ( @@ -2221,7 +2227,7 @@ /area/lavaland/surface/outdoors) "fu" = ( /obj/effect/turf_decal/delivery, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/mine/outpost/production) @@ -2355,12 +2361,12 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 6 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/catwalk, /area/mine/outpost/engineering) "fG" = ( /obj/effect/turf_decal/caution, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -2421,7 +2427,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "fN" = ( @@ -2700,7 +2706,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) @@ -2774,7 +2780,7 @@ }, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "gE" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -3251,6 +3257,9 @@ /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"iF" = ( +/turf/simulated/floor/lava/mapping_lava, +/area/lavaland/surface/outdoors/targetable) "iK" = ( /obj/structure/stone_tile/block, /obj/structure/stone_tile/cracked{ @@ -3509,6 +3518,9 @@ }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"jZ" = ( +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors/targetable) "kb" = ( /obj/machinery/atmospherics/portable/canister/oxygen, /obj/effect/decal/cleanable/dirt, @@ -3683,6 +3695,10 @@ }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"ln" = ( +/obj/structure/glowshroom, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors/targetable) "lo" = ( /obj/structure/lattice/catwalk/mining, /obj/effect/decal/cleanable/dirt, @@ -3875,7 +3891,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/siberia) "mp" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/mechbay) "mq" = ( @@ -3995,6 +4011,9 @@ }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"mE" = ( +/turf/simulated/mineral/random/high_chance/volcanic, +/area/lavaland/surface/outdoors/targetable) "mF" = ( /obj/structure/stone_tile/block/cracked, /obj/structure/stone_tile{ @@ -4258,6 +4277,9 @@ /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"nu" = ( +/turf/simulated/mineral/volcanic/lava_land_surface, +/area/lavaland/surface/outdoors/targetable) "nv" = ( /obj/item/radio/intercom/locked/prison{ pixel_y = -28 @@ -4625,7 +4647,7 @@ /area/mine/laborcamp/security) "pa" = ( /obj/machinery/firealarm/directional/south, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "purplecorner"; dir = 8 @@ -4682,7 +4704,7 @@ pixel_x = -32 }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "pn" = ( /obj/structure/stone_tile{ dir = 1 @@ -4934,6 +4956,10 @@ /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"rf" = ( +/obj/structure/flora/ash/stem_shroom, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors/targetable) "ri" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -4943,7 +4969,7 @@ }, /area/mine/laborcamp/security) "rk" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/lockers) "rm" = ( @@ -4962,7 +4988,7 @@ pixel_y = 8 }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "ru" = ( /obj/effect/turf_decal/stripes/red/corner{ dir = 4 @@ -5101,7 +5127,7 @@ "ss" = ( /obj/effect/turf_decal/delivery/hollow, /obj/structure/ore_box, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -5113,10 +5139,14 @@ icon_state = "yellowfull" }, /area/mine/laborcamp) +"sA" = ( +/obj/effect/mapping_helpers/turfs/rust/maybe, +/turf/simulated/wall, +/area/lavaland/surface/outdoors/targetable) "sD" = ( /obj/structure/lavaland_billboard, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "sF" = ( /obj/structure/bookcase{ name = "bookcase (Fiction)" @@ -5140,7 +5170,7 @@ /obj/item/flashlight/flare/glowstick/random, /obj/item/flashlight/flare/glowstick/random, /obj/item/flashlight/flare/glowstick/random, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "sP" = ( @@ -5297,7 +5327,7 @@ /obj/structure/sign/securearea{ pixel_x = -32 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/outpost/catwalk) "tX" = ( @@ -5310,7 +5340,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/mine/outpost/mechbay) "tZ" = ( @@ -5356,7 +5386,7 @@ "uu" = ( /obj/structure/closet/crate, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "uB" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -5370,6 +5400,10 @@ /obj/effect/decal/remains/human, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"uM" = ( +/obj/structure/flora/ash/rock/style_random, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors/targetable) "uO" = ( /obj/machinery/door/airlock/maintenance{ name = "Airlock Maintence" @@ -5440,7 +5474,7 @@ /obj/structure/marker_beacon/dock_marker/collision, /obj/effect/mapping_helpers/no_lava, /turf/simulated/mineral/volcanic/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "va" = ( /obj/effect/turf_decal/delivery/hollow, /obj/structure/ore_box, @@ -5555,7 +5589,7 @@ "vx" = ( /obj/structure/ore_box, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "vy" = ( /obj/effect/spawner/window/reinforced/plasma/grilled, /obj/structure/cable{ @@ -5768,7 +5802,7 @@ /turf/simulated/floor/catwalk, /area/mine/laborcamp) "wy" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/sign/fire{ pixel_y = 32 }, @@ -5809,6 +5843,10 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/mine/laborcamp/security) +"xb" = ( +/obj/effect/mapping_helpers/turfs/rust, +/turf/simulated/wall, +/area/lavaland/surface/outdoors/targetable) "xg" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/newscaster{ @@ -5860,7 +5898,7 @@ }, /obj/structure/closet/crate, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "xA" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5871,7 +5909,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plasteel{ dir = 1; @@ -5964,7 +6002,7 @@ /obj/machinery/computer/arcade{ dir = 4 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "ya" = ( @@ -6120,6 +6158,9 @@ }, /turf/simulated/floor/carpet, /area/mine/outpost/quartermaster) +"yG" = ( +/turf/simulated/mineral/random/volcanic/labormineral, +/area/lavaland/surface/outdoors/targetable) "yH" = ( /obj/machinery/light_switch{ pixel_x = 24; @@ -6157,7 +6198,7 @@ /area/mine/outpost/maintenance/south) "yR" = ( /obj/effect/spawner/random/barrier/grille_maybe, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) @@ -6245,7 +6286,7 @@ /obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/door/airlock/maintenance/external/glass{ name = "Landing Pad" }, @@ -6323,6 +6364,10 @@ }, /turf/simulated/floor/wood, /area/mine/laborcamp) +"zI" = ( +/obj/effect/mapping_helpers/no_lava, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors/targetable) "zM" = ( /obj/structure/chair, /obj/item/cigbutt, @@ -6459,7 +6504,7 @@ /turf/simulated/floor/wood, /area/mine/laborcamp) "At" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/cable{ icon_state = "1-10" }, @@ -6521,7 +6566,7 @@ network = list("Mining Outpost") }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "AE" = ( /turf/simulated/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) @@ -6632,7 +6677,7 @@ /area/mine/laborcamp) "Bs" = ( /obj/structure/window/reinforced, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/mine/outpost/production) @@ -6672,7 +6717,7 @@ }, /area/mine/outpost/lockers) "BH" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/hallway/east) "BL" = ( @@ -6789,7 +6834,7 @@ /turf/simulated/floor/plasteel, /area/mine/outpost/mechbay) "Cp" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/mine/laborcamp/security) "Cu" = ( @@ -6912,7 +6957,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/outpost/catwalk) "Dc" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/mine/outpost/maintenance/south) "De" = ( @@ -6984,7 +7029,7 @@ /area/mine/outpost/airlock) "DA" = ( /obj/effect/spawner/random/barrier/grille_often, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) "DB" = ( @@ -7226,7 +7271,7 @@ "EO" = ( /obj/item/toy/figure/crew/miner, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "EP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -7245,8 +7290,8 @@ "Fa" = ( /obj/structure/table, /obj/item/lighter/random, -/obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/dirt/maybe, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "Fd" = ( @@ -7298,7 +7343,7 @@ /area/mine/laborcamp) "Fl" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) @@ -7331,7 +7376,7 @@ /obj/structure/marker_beacon/dock_marker/collision, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "FE" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -7351,7 +7396,7 @@ /area/lavaland/surface/outdoors) "FH" = ( /obj/structure/cable, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/power/apc/directional/west, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) @@ -7451,7 +7496,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "Gs" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /obj/structure/sign/nanotrasen, /turf/simulated/wall, /area/mine/outpost/maintenance/south) @@ -7516,6 +7561,10 @@ /obj/structure/lattice/catwalk/mining, /turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) +"GL" = ( +/obj/effect/decal/remains/human, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors/targetable) "GM" = ( /obj/machinery/mineral/equipment_vendor, /obj/structure/sign/poster/official/random{ @@ -7689,7 +7738,7 @@ }, /area/mine/outpost/medbay) "HT" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkyellowcorners" @@ -7721,9 +7770,9 @@ "Is" = ( /obj/effect/mapping_helpers/no_lava, /turf/simulated/mineral/volcanic/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "Iv" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/mine/laborcamp) "Iw" = ( @@ -7927,7 +7976,7 @@ /obj/structure/lattice/catwalk/mining, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "JD" = ( /obj/structure/grille/broken, /obj/structure/grille/broken, @@ -8150,7 +8199,7 @@ pixel_x = -32 }, /turf/simulated/mineral/volcanic/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "KU" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -8374,10 +8423,6 @@ icon_state = "darkfull" }, /area/mine/outpost/hallway/west) -"Mv" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, -/turf/simulated/wall, -/area/lavaland/surface/outdoors) "My" = ( /obj/structure/cable{ d1 = 1; @@ -8488,7 +8533,7 @@ }, /area/mine/outpost/hallway/east) "Nw" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/light/small, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) @@ -8523,7 +8568,7 @@ /obj/effect/mapping_helpers/no_lava, /obj/structure/flora/ash/rock/style_random, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "NF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -8549,13 +8594,17 @@ /area/mine/outpost/cafeteria) "NK" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "NP" = ( /obj/machinery/computer/shuttle/mining, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/mining) +"NR" = ( +/obj/effect/mapping_helpers/no_lava, +/turf/simulated/mineral/random/volcanic, +/area/lavaland/surface/outdoors/targetable) "NT" = ( /obj/structure/sign/nanotrasen, /turf/simulated/wall, @@ -8956,7 +9005,7 @@ "Qd" = ( /obj/structure/sign/nanotrasen, /turf/simulated/wall/mineral/iron, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "Qf" = ( /obj/machinery/economy/vending/wallmed/directional/south, /turf/simulated/floor/plasteel{ @@ -8975,7 +9024,7 @@ /turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "Qv" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/structure/disposalpipe/segment/corner{ dir = 2 }, @@ -8990,6 +9039,12 @@ icon_state = "darkfull" }, /area/mine/outpost/hallway/east) +"Qw" = ( +/obj/structure/sign/nanotrasen{ + pixel_y = -32 + }, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors/targetable) "Qz" = ( /obj/machinery/light{ dir = 4 @@ -9181,8 +9236,8 @@ /turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "Sh" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/production) "Sk" = ( @@ -9242,10 +9297,6 @@ }, /turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) -"SH" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, -/turf/simulated/wall, -/area/lavaland/surface/outdoors) "SJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -9285,7 +9336,7 @@ }, /area/mine/outpost/mechbay) "SQ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/cafeteria) "SR" = ( @@ -9370,7 +9421,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) @@ -9406,6 +9457,12 @@ icon_state = "darkfull" }, /area/mine/outpost/hallway/west) +"TJ" = ( +/obj/structure/sign/nanotrasen{ + pixel_y = 32 + }, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors/targetable) "TL" = ( /obj/machinery/atmospherics/unary/tank/air{ dir = 8 @@ -9424,7 +9481,7 @@ }, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "TN" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -9489,7 +9546,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/catwalk, /area/mine/outpost/engineering) "Ur" = ( @@ -9549,7 +9606,7 @@ /obj/effect/mapping_helpers/no_lava, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "UI" = ( /obj/structure/lattice/catwalk/mining, /obj/structure/marker_beacon/dock_marker, @@ -9586,7 +9643,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -9690,6 +9747,9 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/outpost/catwalk) +"Vy" = ( +/turf/simulated/mineral/random/volcanic, +/area/lavaland/surface/outdoors/targetable) "Vz" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -9743,7 +9803,7 @@ }, /area/mine/outpost/engineering) "VG" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/maintenance/east) "VK" = ( @@ -9789,10 +9849,14 @@ }, /turf/simulated/floor/plasteel, /area/mine/laborcamp) +"VU" = ( +/obj/effect/mapping_helpers/no_lava, +/turf/simulated/floor/lava/mapping_lava, +/area/lavaland/surface/outdoors/targetable) "VV" = ( /obj/machinery/firealarm/directional/west, /obj/item/kirbyplants, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/radio/intercom{ name = "north bump"; pixel_y = 28 @@ -9962,7 +10026,7 @@ /turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "WV" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/gps/ruin{ pixel_x = 32; gpstag = "Nanotrasen Mining Outpost" @@ -10102,7 +10166,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel{ dir = 8; @@ -10185,7 +10249,7 @@ }, /area/mine/laborcamp) "Yk" = ( -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/machinery/alarm/directional/north, /obj/effect/turf_decal/loading_area, /obj/effect/decal/cleanable/dirt, @@ -10219,7 +10283,7 @@ /turf/simulated/floor/plasteel, /area/mine/laborcamp) "Yr" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -10229,7 +10293,7 @@ /turf/simulated/floor/plasteel, /area/mine/outpost/maintenance/south) "Ys" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/trash/chips, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) @@ -10264,7 +10328,7 @@ }, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/area/lavaland/surface/outdoors/targetable) "YA" = ( /obj/structure/lattice/catwalk/mining, /obj/structure/railing{ @@ -10389,7 +10453,7 @@ }, /area/mine/outpost/hallway/west) "Zh" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/maintenance/south) "Zj" = ( @@ -16107,34 +16171,34 @@ hb ar vW OG -ai -ai -Aw -Aw -Aw -Aw -Aw -Aw -ad -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -ad -ad -Aw -Aw +Vy +Vy +iF +iF +iF +iF +iF +iF +mE +jZ +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +mE +mE +iF +iF Aw Aw Aw @@ -16366,32 +16430,32 @@ OG OG OG Iv -Aw -Aw -Aw -Aw -Aw -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -ab -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +jZ +iF +iF +iF +iF +iF +iF +iF +iF +jZ +jZ +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF Aw Aw Aw @@ -16623,32 +16687,32 @@ UA nd EP Iv -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -ai -ad -ai -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +Vy +mE +Vy +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF Aw Aw Aw @@ -16880,32 +16944,32 @@ gz aU pd Iv -Aw -Aw -ab -Aw -Aw -Aw -Aw -ab -Aw -Aw -Aw -Aw -ab -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +jZ +iF +iF +iF +iF +jZ +iF +iF +iF +iF +jZ +jZ +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF Aw Aw Aw @@ -17137,32 +17201,32 @@ wx hD gZ OG -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -ai +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +Vy rp -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF Aw Aw Aw @@ -17394,32 +17458,32 @@ aK np Zn OG -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +jZ +iF +iF +iF +iF +iF +iF +iF +iF Aw Aw Aw @@ -17651,32 +17715,32 @@ gz aU tZ OG -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -YL -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +rf +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF Aw Aw Aw @@ -17908,32 +17972,32 @@ vN PM tZ OG -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -OA -Aw -Aw -Aw -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +uM +iF +iF +iF +jZ +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF Aw Aw Aw @@ -18165,32 +18229,32 @@ OG OG OG ZM -Aw -Aw -Aw -Aw -Aw -ab -Aw -Aw -Aw -Aw -Aw -Aw -ab -ai -Aw -Aw -Aw -Aw -Aw -ai -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +jZ +iF +iF +iF +iF +iF +iF +jZ +Vy +iF +iF +iF +iF +iF +Vy +iF +iF +iF +iF +iF +iF Aw Aw Aw @@ -18417,16 +18481,16 @@ OG OG Iv Iv -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF bt dO dO @@ -18437,17 +18501,17 @@ dO dO gl ef -Aw -Aw -Aw -ab -Aw -Aw -Aw -Aw -ab -ab -Aw +iF +iF +iF +jZ +iF +iF +iF +iF +jZ +jZ +iF Aw Aw Aw @@ -18671,18 +18735,18 @@ OG OG OG OG -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF GJ eC Iw @@ -18695,16 +18759,16 @@ BY eh WR ef -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -ai -ab +iF +iF +iF +iF +iF +iF +iF +iF +Vy +jZ Aw Aw Aw @@ -18919,27 +18983,27 @@ an an an an -an -ab -ab -ab +yG +jZ +jZ +jZ xr uu uu -ab -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +jZ +jZ +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF hC UO pg @@ -18952,16 +19016,16 @@ xo LM vZ dx -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF Aw Aw Aw @@ -19176,27 +19240,27 @@ an an an an -ab -ab -ab -ab -ab -ab -ab -ab -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -ab -Aw -Aw +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +iF +iF +iF +iF +iF +iF +iF +iF +iF +jZ +iF +iF hC cR xC @@ -19209,16 +19273,16 @@ xC CX Hm dx -Aw -ab -ad -ai +iF +jZ +mE +Vy eo -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF Aw Aw Aw @@ -19433,26 +19497,26 @@ an an an an -ab -ab -ab -ab -ab -ab -ab -ab -ab -Aw -Aw -Aw -Aw -Aw -Aw -ab -ab -Aw -Aw -Aw +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +iF +iF +iF +iF +iF +iF +jZ +jZ +iF +iF +iF sD hC vj @@ -19466,22 +19530,22 @@ xC CX Hm dx -Aw -ai -ai -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +Vy +Vy +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (36,1,1) = {" aa @@ -19690,27 +19754,27 @@ an an an an -ab -ab -ab -ab -ab -ab -ab -ab -Aw -Aw -Aw -Aw -Aw -Aw -AE -Aw -Aw -Aw -Aw -Aw -ab +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +iF +iF +iF +iF +iF +iF +nu +iF +iF +iF +iF +iF +jZ hC bo xC @@ -19723,22 +19787,22 @@ xC CX vZ bH -Aw -Aw -ab -Aw -Aw -Aw -Aw -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +jZ +iF +iF +iF +iF +jZ +iF +iF +iF +iF +iF +iF +iF +iF "} (37,1,1) = {" aa @@ -19947,27 +20011,27 @@ an an an an -an -an +yG +yG vx vx -an -an -ab -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -AE -AE -Aw -Aw -ab +yG +yG +jZ +jZ +iF +iF +iF +iF +iF +iF +iF +iF +nu +nu +iF +iF +jZ VA cH WD @@ -19980,22 +20044,22 @@ xo LM vZ dx -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (38,1,1) = {" aa @@ -20204,27 +20268,27 @@ an an an an -an -an -an -an -an -an -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -AE -AE -Aw -Aw +yG +yG +yG +yG +yG +yG +jZ +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +nu +nu +iF +iF ZT vZ Ry @@ -20237,22 +20301,22 @@ WZ vz XI Bo -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (39,1,1) = {" aa @@ -20461,27 +20525,27 @@ an an an an -an -an -an -an -an -an -an -Aw -Aw -Aw -Aw -uE -Aw -Aw -Aw -Aw -Aw -ab -AE -ab -Aw +yG +yG +yG +yG +yG +yG +yG +iF +iF +iF +iF +GL +iF +iF +iF +iF +iF +jZ +nu +jZ +iF hC vZ KA @@ -20493,23 +20557,23 @@ cm By Lw Cu -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (40,1,1) = {" aa @@ -20718,22 +20782,22 @@ an an an an -an -an -an -an -an -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +yG +yG +yG +yG +yG +jZ +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF bt tF gl @@ -20751,22 +20815,22 @@ tX Qp CZ CZ -AE -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +nu +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (41,1,1) = {" aa @@ -20975,22 +21039,22 @@ an an an an -an -an -an -an -an -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -AE -Aw +yG +yG +yG +yG +yG +jZ +iF +iF +iF +iF +iF +iF +iF +iF +nu +iF ra dJ jj @@ -21009,21 +21073,21 @@ gi gi gi NT -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (42,1,1) = {" aa @@ -21232,22 +21296,22 @@ an an an an -an -an -an -an -an -an -Aw -Aw -Aw -AE -Aw -ab -AE -Aw -Aw -ab +yG +yG +yG +yG +yG +yG +iF +iF +iF +nu +iF +jZ +nu +iF +iF +jZ ra dJ yE @@ -21266,21 +21330,21 @@ tI BD gH sk -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (43,1,1) = {" aa @@ -21489,22 +21553,22 @@ an an an an -an -an -an -an -ab -Aw -Aw -Aw -Aw -Aw -AE -AE -AE -AE -AE -AE +yG +yG +yG +yG +jZ +iF +iF +iF +iF +iF +nu +nu +nu +nu +nu +nu Vw dJ oa @@ -21523,21 +21587,21 @@ AO Fe bC sk -AE -Aw -Aw -Aw -Aw -Aw -Aw -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw +nu +iF +iF +iF +iF +iF +iF +jZ +iF +iF +iF +iF +iF +iF +iF "} (44,1,1) = {" aa @@ -21746,21 +21810,21 @@ an an an an -an -an -an -an -ab -Aw -Aw -Aw -Aw -AE -AE -AE -AE -AE -AE +yG +yG +yG +yG +jZ +iF +iF +iF +iF +nu +nu +nu +nu +nu +nu Rs ec dJ @@ -21780,21 +21844,21 @@ bG Wf rB rk -AE -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +nu +jZ +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (45,1,1) = {" aa @@ -22003,16 +22067,16 @@ an an an an -an -an -an -an -Aw -Aw -Aw -Aw -Aw -ab +yG +yG +yG +yG +iF +iF +iF +iF +iF +jZ cO cO cO @@ -22037,21 +22101,21 @@ IK Lr bC sk -AE -Aw -Aw -Aw -Aw -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +nu +iF +iF +iF +iF +jZ +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (46,1,1) = {" aa @@ -22260,16 +22324,16 @@ Aw ab an an -an -an -ab -Aw -Aw -Aw -Aw -Aw -AE -AE +yG +yG +jZ +iF +iF +iF +iF +iF +nu +nu cO Am fB @@ -22294,21 +22358,21 @@ em WX EB sk -Aw -Aw +iF +iF EO -Aw -Aw -Aw -Aw -Aw -AE -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +nu +iF +iF +iF +iF +iF +iF "} (47,1,1) = {" aa @@ -22517,16 +22581,16 @@ Aw Aw Aw Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -AE +iF +iF +iF +iF +iF +iF +iF +iF +iF +nu cO cQ SX @@ -22551,21 +22615,21 @@ gi gi gi rk -Dx -Aw -Aw -ab -ab -Aw -OA -Aw -AE -ab -Aw -Aw -Aw -Aw -Aw +TJ +iF +iF +jZ +jZ +iF +uM +iF +nu +jZ +iF +iF +iF +iF +iF "} (48,1,1) = {" aa @@ -22774,16 +22838,16 @@ Aw Aw Aw Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -AE -AE +iF +iF +iF +iF +iF +iF +iF +iF +nu +nu cO cO cK @@ -22806,23 +22870,23 @@ fA XZ XK bH -Yc -Aw -Aw -Aw -AE -AE -Aw -AE -Aw -Aw -Aw -Aw -ab -Aw -Aw -Aw -Aw +ln +iF +iF +iF +nu +nu +iF +nu +iF +iF +iF +iF +jZ +iF +iF +iF +iF "} (49,1,1) = {" aa @@ -23031,17 +23095,17 @@ Aw Aw Aw Aw -Aw -ai -ai -ai -Aw -Aw -AE -Aw -ab -AE -AE +iF +Vy +Vy +Vy +iF +iF +nu +iF +jZ +nu +nu tS rJ fX @@ -23063,23 +23127,23 @@ Pd XZ Jn Kc -Aw -ab -OA -AE -AE -AE -ab -AE -AE -rH -Aw -AE -Aw -Aw -Aw -Aw -Aw +iF +jZ +uM +nu +nu +nu +jZ +nu +nu +ek +iF +nu +iF +iF +iF +iF +iF "} (50,1,1) = {" aa @@ -23288,22 +23352,22 @@ ai ai ai ai -ai -am -JA -ci -HB -HB -HB +Vy +Vy +NR +zI +VU +VU +VU Is Is Is -AE +nu ec eQ gq -AE -AE +nu +nu cM fo cj @@ -23320,11 +23384,11 @@ aI XZ cl xQ -ab -ab -AE -AE -AE +jZ +jZ +nu +nu +nu Oq dB dB @@ -23332,11 +23396,11 @@ Oq Oq dB dB -OA -Aw -ab -Aw -Aw +uM +iF +jZ +iF +iF "} (51,1,1) = {" aa @@ -23545,22 +23609,22 @@ am am am am -am -ai -ci -HB -HB -HB +Vy +Vy +zI +VU +VU +VU Is -HB +VU Is Is -AE +nu ec -AE -AE -AE -Aw +nu +nu +nu +iF SQ dy dy @@ -23579,9 +23643,9 @@ eM eM Zh Zh -AE -AE -AE +nu +nu +nu Oq Yk We @@ -23589,11 +23653,11 @@ oq Ow dN Sh -ab -Aw -Aw -Aw -Aw +jZ +iF +iF +iF +iF "} (52,1,1) = {" aa @@ -23802,22 +23866,22 @@ am am am am -am -ai -ci -HB -ci +Vy +Vy +zI +VU +zI Is -HB +VU Is Is Is -AE +nu cx -AE -Aw -Aw -ab +nu +iF +iF +jZ dy EL jJ @@ -23846,11 +23910,11 @@ aY Fw cX Oq -AE -Aw -ab -Aw -Aw +nu +iF +jZ +iF +iF "} (53,1,1) = {" aa @@ -24059,11 +24123,11 @@ am am am am -am -ai -ci -HB -HB +Vy +Vy +zI +VU +VU FC Is Is @@ -24071,9 +24135,9 @@ Is JB Qd Bh -Aw -Aw -nP +iF +iF +Qw dy dy Bq @@ -24103,11 +24167,11 @@ yp Bs eX Oq -AE -ab -Aw -Aw -Aw +nu +jZ +iF +iF +iF "} (54,1,1) = {" aa @@ -24316,21 +24380,21 @@ am am am am -am -ai -HB -HB -HB -HB -HB -HB +Vy +Vy +VU +VU +VU +VU +VU +VU FC -ci -Aw +zI +iF Ej -Aw -Aw -ab +iF +iF +jZ bJ PI Xk @@ -24360,11 +24424,11 @@ fP en VK dB -AE -ab -Aw -ab -Aw +nu +jZ +iF +jZ +iF "} (55,1,1) = {" aa @@ -24573,21 +24637,21 @@ am am am am -am -am -JA -HB -HB -HB -HB -HB -HB -HB -Aw +Vy +Vy +NR +VU +VU +VU +VU +VU +VU +VU +iF Ej -Aw -Aw -Aw +iF +iF +iF bJ eW bN @@ -24617,11 +24681,11 @@ dn eN fn dB -AE -AE -ab -Aw -Aw +nu +nu +jZ +iF +iF "} (56,1,1) = {" aa @@ -24830,21 +24894,21 @@ am am am am -am -am -JA -HB -HB -ci -HB -HB -HB -HB -Aw +Vy +Vy +NR +VU +VU +zI +VU +VU +VU +VU +iF Ej -ab -Aw -Aw +jZ +iF +iF bJ cE bN @@ -24874,11 +24938,11 @@ Oq Oq dB dB -AE -AE -Aw -Aw -Aw +nu +nu +iF +iF +iF "} (57,1,1) = {" aa @@ -25087,21 +25151,21 @@ am am am am -am -am -AS -ci -HB -HB -ci +Vy +Vy +NR +zI +VU +VU +zI FC -HB -HB -Aw +VU +VU +iF lB -ab -Aw -Aw +jZ +iF +iF dy Nc Jv @@ -25126,16 +25190,16 @@ KH eM Fa Zh -AE -AE -AE -AE -AE -ab -Aw -AE -Aw -ab +nu +nu +nu +nu +nu +jZ +iF +nu +iF +jZ "} (58,1,1) = {" aa @@ -25344,21 +25408,21 @@ am am am am -am -am -AS -AS -HB -HB +Vy +Vy +NR +NR +VU +VU Is Is NC -HB -Aw +VU +iF Ej -Aw +iF eo -Aw +iF bJ Ff Av @@ -25383,16 +25447,16 @@ uT Fl Nw Zh -AE -AE -AE -AE -OA -ab -Aw -Aw -Aw -Aw +nu +nu +nu +nu +uM +jZ +iF +iF +iF +iF "} (59,1,1) = {" aa @@ -25601,21 +25665,21 @@ am am am am -am -am -AS -AS -AS -HB -HB +Vy +Vy +NR +NR +NR +VU +VU uZ -HB -HB -Aw +VU +VU +iF FA -Aw -Aw -ab +iF +iF +jZ wi eW zu @@ -25640,16 +25704,16 @@ Np eM wy Zh -AE -AE -ab -ab -Aw -Aw -ab -Aw -Aw -Aw +nu +nu +jZ +jZ +iF +iF +jZ +iF +iF +iF "} (60,1,1) = {" aa @@ -25858,21 +25922,21 @@ am am am am -am -am -AS -AS -JA -HB -HB -HB -HB -HB +Vy +Vy +NR +NR +NR +VU +VU +VU +VU +VU SD Zz LS -Aw -Aw +iF +iF bJ cE bN @@ -25897,16 +25961,16 @@ uT eM Gt Gs -AE -ab -Aw -ab -Aw -Aw -Aw -Aw -Aw -Aw +nu +jZ +iF +jZ +iF +iF +iF +iF +iF +iF "} (61,1,1) = {" aa @@ -26115,15 +26179,15 @@ am am am am -am -am -AS -JA -HB -HB -HB -HB -HB +Vy +Vy +NR +NR +VU +VU +VU +VU +VU cr cr bp @@ -26153,17 +26217,17 @@ mT Dc eM FZ -Aw -OA -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +uM +jZ +iF +iF +iF +iF +iF +iF +iF +iF "} (62,1,1) = {" aa @@ -26372,15 +26436,15 @@ am am am am -am -am -AS -JA -HB -HB -HB -HB -HB +Vy +Vy +NR +NR +VU +VU +VU +VU +VU cU dH HT @@ -26410,17 +26474,17 @@ Yr uT lf dx -OA -Aw -Aw -Aw -Aw -ab -Aw -Aw -Aw -Aw -Aw +uM +iF +iF +iF +iF +jZ +iF +iF +iF +iF +iF "} (63,1,1) = {" aa @@ -26629,15 +26693,15 @@ am am am am -am -am -AS -AS -JA -HB -HB -HB -ci +Vy +Vy +NR +NR +NR +VU +VU +VU +zI cU jP bE @@ -26667,17 +26731,17 @@ hh RR lf dx -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (64,1,1) = {" aa @@ -26886,14 +26950,14 @@ am am am am -am -am -AS -AS -AS -ci -ci -HB +Vy +Vy +NR +NR +NR +zI +zI +VU gD cr bY @@ -26924,17 +26988,17 @@ eM lf lf dx -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (65,1,1) = {" aa @@ -27143,14 +27207,14 @@ am am am am -am -am -AS -AS -JA -ci -HB -HB +Vy +Vy +NR +NR +NR +zI +VU +VU Is cU jP @@ -27181,17 +27245,17 @@ Ty YA Jg Bo -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (66,1,1) = {" aa @@ -27400,14 +27464,14 @@ am am am am -am -am -AS -AS -JA -HB -HB -HB +Vy +Vy +NR +NR +NR +VU +VU +VU Is cU yY @@ -27433,22 +27497,22 @@ Nq fO nX Hp -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (67,1,1) = {" aa @@ -27657,15 +27721,15 @@ am am am am -am -am -AS -AS -JA -HB -HB -HB -Mv +Vy +Vy +NR +NR +NR +VU +VU +VU +sA cr cr fs @@ -27688,24 +27752,24 @@ vh IC BH IC -AE -AE -ab -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +nu +nu +jZ +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (68,1,1) = {" aa @@ -27914,15 +27978,15 @@ am am am am -am -am -AS -AS -JA -HB -HB +Vy +Vy +NR +NR +NR +VU +VU Is -Mv +sA cr ex Ib @@ -27943,26 +28007,26 @@ cN vh vh AE -AE -AE -SH -AE -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +nu +nu +xb +nu +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (69,1,1) = {" aa @@ -28171,12 +28235,12 @@ am am am am -am -am -AS -AS -JA -ci +Vy +Vy +NR +NR +NR +zI Is Is Is @@ -28194,32 +28258,32 @@ dE kf Is Yz -ci +zI Is Is Is KS Is Is -ci +zI pl -ci -ci -HB -HB -HB -HB -HB -HB -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +zI +zI +VU +VU +VU +VU +VU +VU +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (70,1,1) = {" aa @@ -28428,12 +28492,12 @@ am am am am -am -am -AS -JA -ci -ci +Vy +Vy +NR +NR +zI +zI Is Is Is @@ -28449,34 +28513,34 @@ cD fG vT kf -ci -ci -ci -ci +zI +zI +zI +zI Is Is Is -ci -ci -ci -HB -HB -HB -HB -HB -HB -HB -HB -HB -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +zI +zI +zI +VU +VU +VU +VU +VU +VU +VU +VU +VU +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (71,1,1) = {" aa @@ -28685,12 +28749,12 @@ am am am am -am -am -JA -ci -ci -ci +Vy +Vy +NR +zI +zI +zI Is Is Is @@ -28706,34 +28770,34 @@ Dz Yv iN Dz -ci -ci -ci -ci -ci -ci -HB -ci -HB -ci -HB -HB -HB -HB -HB -HB -HB -HB -HB -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +zI +zI +zI +zI +zI +zI +VU +zI +VU +zI +VU +VU +VU +VU +VU +VU +VU +VU +VU +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (72,1,1) = {" aa @@ -28942,55 +29006,55 @@ ai ai am am -am -JA -ci -ci -ci -ci -ci +Vy +NR +zI +zI +zI +zI +zI Is Is TM -ci -ci +zI +zI Is Is KS Is Is Is -ci -ci +zI +zI AD -ci -ci -ci -ci -ci -ci -HB -HB -HB -HB -HB -HB -HB -HB -HB -HB -HB -HB -HB -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +zI +zI +zI +zI +zI +zI +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +VU +iF +iF +iF +iF +iF +iF +iF +iF +iF "} (73,1,1) = {" aa @@ -29199,54 +29263,54 @@ ab ab ai ai -am -JA -ci -ci -ci -ci -ci -ci +Vy +NR +zI +zI +zI +zI +zI +zI Is Is -ci -ci -ci +zI +zI +zI Is Is Is Is -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -HB -HB -HB -HB -ci -HB -HB -HB -HB -HB -HB -HB -Aw -Aw -Aw -Aw -Aw -Aw -Aw -Aw +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +VU +VU +VU +VU +zI +VU +VU +VU +VU +VU +VU +VU +iF +iF +iF +iF +iF +iF +iF +iF Aw "} (74,1,1) = {" @@ -29456,53 +29520,53 @@ ab ab ai ab -ai -AS -JA -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -HB -HB -ci -HB -HB -HB -HB -HB -HB -HB -HB -Aw -Aw -Aw -Aw -Aw -Aw -Aw +Vy +NR +NR +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +VU +VU +zI +VU +VU +VU +VU +VU +VU +VU +VU +iF +iF +iF +iF +iF +iF +iF Aw Aw "} @@ -29713,52 +29777,52 @@ ab ab ab ab -ab -JA -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -JA -JA -JA -ci -ci -ci -ci -ci -ci -ci -ci -HB -HB -HB -ci -HB -HB -HB -Aw -Aw -Aw -Aw -Aw -Aw +jZ +NR +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +NR +NR +NR +zI +zI +zI +zI +zI +zI +zI +zI +VU +VU +VU +zI +VU +VU +VU +iF +iF +iF +iF +iF +iF Aw Aw Aw @@ -29970,46 +30034,46 @@ ab ab ab ab -ab -JA -ci -ci -ci -ci -ci -ci -JA -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -JA -JA -JA -JA -JA -ci -ci -ci -ci -ci -ci -ci -HB -HB -ci -HB -HB -HB -HB +jZ +NR +zI +zI +zI +zI +zI +zI +NR +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +NR +NR +NR +NR +NR +zI +zI +zI +zI +zI +zI +zI +VU +VU +zI +VU +VU +VU +VU Aw Aw Aw @@ -30227,45 +30291,45 @@ ai ab ab ab -ab -JA -JA -ci -ci -ci -ci -JA -JA -JA -ci -ci -ci -ci -ci -ci -ci -JA -JA -JA -JA -JA -JA -JA -JA -JA -JA -ci -ci -ci -ci -ci -ci -ci -ci -JA -HB -HB -HB +jZ +NR +NR +zI +zI +zI +zI +NR +NR +NR +zI +zI +zI +zI +zI +zI +zI +NR +NR +NR +NR +NR +NR +NR +NR +NR +NR +zI +zI +zI +zI +zI +zI +zI +zI +NR +VU +VU +VU HB Aw Aw @@ -30484,44 +30548,44 @@ ai ab ab ab -ab -ci -JA -JA -ci -ci -ci -JA -JA -JA -ci -ci -ci -ci -ci -ci -ci -ci -ci -JA -JA -JA -JA -HB -HB -HB -ci -ci -ci -ci -ci -ci -ci -JA -ci -JA -HB -HB +jZ +zI +NR +NR +zI +zI +zI +NR +NR +NR +zI +zI +zI +zI +zI +zI +zI +zI +zI +NR +NR +NR +NR +VU +VU +VU +zI +zI +zI +zI +zI +zI +zI +NR +zI +NR +VU +VU HB HB Aw @@ -30741,31 +30805,31 @@ ab ab ab ab -ab -ci -ci -ci +jZ +zI +zI +zI UC -ci -ci -JA -JA -JA -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -HB -HB -HB +zI +zI +NR +NR +NR +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +zI +VU +VU +VU HB ci ci @@ -30998,30 +31062,30 @@ ai ab ab ab -ab -ci -ci -ci -ci -ci -ci -JA -JA -JA -ci -ci -ci -ci -ci -ci -ci -ci -HB -HB -HB -HB -HB -HB +jZ +zI +zI +zI +zI +zI +zI +NR +NR +NR +zI +zI +zI +zI +zI +zI +zI +zI +VU +VU +VU +VU +VU +VU HB HB HB diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 7f85c69cd9912..dabdbceff0baa 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -2353,7 +2353,7 @@ /turf/simulated/floor/wood, /area/ghost_bar) "ip" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ghost_bar) "iq" = ( @@ -6220,7 +6220,7 @@ /turf/simulated/floor/plasteel, /area/admin) "vh" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/centcom/evac) "vj" = ( diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm index f504ec930e7a1..1216ce56db99c 100644 --- a/_maps/map_files/shuttles/emergency_dept.dmm +++ b/_maps/map_files/shuttles/emergency_dept.dmm @@ -128,9 +128,13 @@ pixel_x = 29; pixel_y = -60 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/effect/turf_decal/siding{ + dir = 1 + }, +/obj/effect/turf_decal/siding{ + dir = 4 }, +/turf/simulated/floor/mineral/plastitanium, /area/shuttle/escape) "au" = ( /obj/structure/chair/comfy/shuttle{ @@ -286,10 +290,7 @@ /area/shuttle/escape) "aT" = ( /obj/item/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/turf/simulated/floor/plasteel, /area/shuttle/escape) "aU" = ( /obj/structure/chair/stool/bar{ @@ -320,10 +321,8 @@ /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "ba" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plating, /area/shuttle/escape) "bb" = ( /obj/structure/sign/greencross, @@ -385,9 +384,10 @@ pixel_x = 5; pixel_y = -28 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/effect/turf_decal/siding{ + dir = 8 }, +/turf/simulated/floor/mineral/plastitanium, /area/shuttle/escape) "bi" = ( /obj/machinery/chem_dispenser/soda, @@ -455,12 +455,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) -"br" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/mineral/titanium/yellow, -/area/shuttle/escape) "bu" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -482,19 +476,29 @@ }, /area/shuttle/escape) "by" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/clothing/mask/gas{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/tank/internals/emergency_oxygen/engi, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellow" }, -/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "bz" = ( /turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "bA" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 +/obj/structure/closet/firecloset, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellow" }, -/turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) "bB" = ( /obj/structure/table/reinforced, @@ -520,10 +524,8 @@ /turf/simulated/floor/plasteel, /area/shuttle/escape) "bE" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/mineral/titanium/purple, +/obj/machinery/mech_bay_recharge_port, +/turf/simulated/floor/bluegrid, /area/shuttle/escape) "bF" = ( /obj/structure/chair/comfy/shuttle{ @@ -545,67 +547,48 @@ }, /area/shuttle/escape) "bI" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple" }, -/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/escape) "bJ" = ( /turf/simulated/floor/mineral/titanium/purple, /area/shuttle/escape) "bK" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/escape) -"bL" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/mineral/titanium/yellow, -/area/shuttle/escape) -"bM" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/mineral/titanium/yellow, -/area/shuttle/escape) -"bO" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" + dir = 8; + icon_state = "whitepurple" }, /area/shuttle/escape) "bP" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/closet/crate, +/obj/item/stamp/granted{ + pixel_x = -3; + pixel_y = 3 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" +/obj/item/stamp/denied{ + pixel_x = 4; + pixel_y = -2 }, +/obj/item/clipboard, +/turf/simulated/floor/plating, /area/shuttle/escape) "bQ" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/rack{ + dir = 8; + layer = 2.9 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" +/obj/effect/decal/cleanable/dirt, +/obj/item/pickaxe{ + pixel_x = 5 + }, +/obj/item/shovel{ + pixel_x = -5 }, +/turf/simulated/floor/plating, /area/shuttle/escape) "bR" = ( /obj/structure/flora/ausbushes/grassybush, @@ -615,24 +598,6 @@ /obj/structure/window/full/shuttle, /turf/simulated/floor/grass/no_creep, /area/shuttle/escape) -"bS" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/escape) -"bT" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/escape) "bU" = ( /obj/structure/sign/directions/science, /turf/simulated/wall/mineral/titanium, @@ -664,17 +629,14 @@ /area/shuttle/escape) "bZ" = ( /obj/machinery/recharge_station/upgraded, +/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "purple" }, /area/shuttle/escape) "ca" = ( /obj/machinery/light, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/turf/simulated/floor/plasteel, /area/shuttle/escape) "cb" = ( /obj/machinery/door/airlock/engineering/glass{ @@ -697,15 +659,15 @@ /turf/simulated/floor/mineral/titanium/purple, /area/shuttle/escape) "ck" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, /obj/machinery/light{ dir = 4 }, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" + dir = 4; + icon_state = "brown" }, /area/shuttle/escape) "cp" = ( @@ -728,9 +690,10 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bot" + dir = 8; + icon_state = "brown" }, /area/shuttle/escape) "cD" = ( @@ -758,24 +721,214 @@ "cH" = ( /turf/simulated/wall/mineral/plastitanium, /area/shuttle/escape) +"dn" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/closet/crate/internals, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"eg" = ( +/obj/effect/turf_decal/woodsiding{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium/yellow, +/area/shuttle/escape) +"eL" = ( +/obj/structure/table/reinforced, +/obj/effect/decal/cleanable/dirt, +/obj/item/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/pen/red, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, +/area/shuttle/escape) +"fe" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/packageWrap, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"fz" = ( +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/escape) +"gj" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"gI" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/escape) +"hH" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellow" + }, +/area/shuttle/escape) +"ja" = ( +/obj/item/flag/atmos, +/obj/structure/window/full/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"mj" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, +/area/shuttle/escape) +"mD" = ( +/obj/item/flag/med, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"no" = ( +/obj/item/flag/cargo, +/obj/structure/window/full/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"oe" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/shuttle/escape) +"pS" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellow" + }, +/area/shuttle/escape) +"qU" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"re" = ( +/turf/simulated/floor/plasteel, +/area/shuttle/escape) +"rZ" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/suit/storage/hazardvest/staff, +/turf/simulated/floor/mineral/titanium/yellow, +/area/shuttle/escape) "sc" = ( /obj/machinery/door/airlock/medical/glass{ name = "Escape Shuttle Medical Seating"; normalspeed = 0 }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/escape) +"sg" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "cmo" + dir = 8; + icon_state = "brown" }, /area/shuttle/escape) +"sk" = ( +/obj/effect/turf_decal/siding{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/shuttle/escape) +"sP" = ( +/turf/simulated/floor/plasteel{ + icon_state = "yellow" + }, +/area/shuttle/escape) +"tC" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/siding{ + dir = 8 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/escape) "tG" = ( /obj/machinery/door/airlock/command/glass{ name = "Escape Shuttle Cockpit"; normalspeed = 0 }, /obj/effect/mapping_helpers/airlock/access/all/security/doors, +/turf/simulated/floor/mineral/plastitanium, +/area/shuttle/escape) +"vv" = ( +/obj/machinery/recharge_station/upgraded, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 1; + icon_state = "purple" + }, +/area/shuttle/escape) +"vU" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellow" + }, +/area/shuttle/escape) +"xz" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/head/welding{ + layer = 8 + }, +/obj/item/weldingtool, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple" }, /area/shuttle/escape) "xD" = ( @@ -791,22 +944,187 @@ icon_state = "whiteblue" }, /area/shuttle/escape) -"AU" = ( -/obj/structure/chair/stool/bar{ - dir = 4 +"yh" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "cafeteria" + dir = 8; + icon_state = "whitepurple" }, /area/shuttle/escape) -"PY" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/machine{ - pixel_x = -5; - pixel_y = -5 +"yG" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/adv{ +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple" + }, +/area/shuttle/escape) +"zj" = ( +/obj/item/flag/sec, +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"AU" = ( +/obj/structure/chair/stool/bar{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/shuttle/escape) +"Bb" = ( +/obj/item/flag/rnd, +/obj/structure/window/full/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"BN" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/escape) +"Cm" = ( +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/shuttle/escape) +"Db" = ( +/obj/machinery/computer/mech_bay_power_console{ + dir = 1 + }, +/turf/simulated/floor/bluegrid, +/area/shuttle/escape) +"Di" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellow" + }, +/area/shuttle/escape) +"EG" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/science, +/turf/simulated/floor/mineral/titanium/purple, +/area/shuttle/escape) +"EZ" = ( +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "purple" + }, +/area/shuttle/escape) +"Hg" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/turf_decal/siding{ + dir = 8 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/escape) +"IN" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, +/area/shuttle/escape) +"IY" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/siding{ + dir = 8 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/escape) +"KR" = ( +/obj/effect/turf_decal/siding{ + dir = 1 + }, +/obj/effect/turf_decal/siding{ + dir = 8 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/shuttle/escape) +"Lh" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Escape Shuttle Cockpit"; + normalspeed = 0 + }, +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/turf/simulated/floor/mineral/plastitanium, +/area/shuttle/escape) +"Ly" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/siding{ + dir = 1 + }, +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/escape) +"Pj" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/obj/effect/turf_decal/siding, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/escape) +"PL" = ( +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "purple" + }, +/area/shuttle/escape) +"PW" = ( +/obj/item/kirbyplants, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/shuttle/escape) +"PY" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/machine{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/adv{ pixel_x = 5; pixel_y = 5 }, @@ -818,10 +1136,100 @@ /obj/machinery/defibrillator_mount/loaded, /turf/simulated/wall/mineral/titanium, /area/shuttle/escape) +"Qr" = ( +/turf/simulated/floor/mineral/plastitanium, +/area/shuttle/escape) +"Rk" = ( +/turf/simulated/floor/plasteel{ + icon_state = "brown" + }, +/area/shuttle/escape) +"Rq" = ( +/turf/simulated/floor/plasteel{ + icon_state = "purple" + }, +/area/shuttle/escape) +"RU" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel, +/area/shuttle/escape) +"RW" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellow" + }, +/area/shuttle/escape) +"Sw" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/obj/effect/turf_decal/siding{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/escape) +"SN" = ( +/obj/structure/table/reinforced, +/obj/item/robotanalyzer, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, +/area/shuttle/escape) +"SQ" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/turf_decal/siding{ + dir = 8 + }, +/obj/effect/turf_decal/siding{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/escape) +"Us" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple" + }, +/area/shuttle/escape) +"UF" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/escape) "UN" = ( /obj/structure/chair/comfy/shuttle, /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) +"VV" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel, +/area/shuttle/escape) +"Wn" = ( +/turf/simulated/floor/mech_bay_recharge_floor, +/area/shuttle/escape) +"Wv" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/turf/simulated/floor/mineral/titanium/yellow, +/area/shuttle/escape) "Wy" = ( /obj/structure/chair/comfy/shuttle, /obj/machinery/light{ @@ -830,6 +1238,34 @@ }, /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) +"WP" = ( +/obj/structure/closet/radiation, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellow" + }, +/area/shuttle/escape) +"Xf" = ( +/obj/effect/turf_decal/woodsiding{ + dir = 8 + }, +/turf/simulated/floor/mineral/titanium/yellow, +/area/shuttle/escape) +"Yr" = ( +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplefull" + }, +/area/shuttle/escape) +"ZV" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/turf_decal/siding{ + dir = 8 + }, +/obj/effect/turf_decal/siding, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/escape) (1,1,1) = {" aa @@ -874,20 +1310,20 @@ bW az aH aN -ba -bP -bO -bP -bP -bP -ba +re +Ly +BN +gI +UF +Pj +re aT -ba -bR -bP +Rk +no +sg cA -bP -bP +oe +dn bP ab cH @@ -905,20 +1341,20 @@ aH aH aH ab -ba -ba -ba -ba -ba -ba -ba -ba -ba +re +re +re +re +re +re +re +re +Rk bV -ba -ba -ba -ba +RU +re +VV +gj ba ab bu @@ -936,21 +1372,21 @@ aH aH aR ab -ba -bQ -bQ -bQ -bQ -bQ -bQ -ba -ba +re +SQ +Hg +tC +IY +Hg +ZV +re +Rk bk +re +RU +VV ba -ba -ba -ba -ba +fe ac bu bw @@ -967,20 +1403,20 @@ aH aH bg ab -ba -bP -bP -bP -bP -bP -bP -ba -ba +re +Sw +BN +gI +UF +BN +Pj +re +Rk bR -bQ +eL ck -bQ -bQ +IN +qU bQ ab cH @@ -998,14 +1434,14 @@ aH aH aH aW -ba -ba -ba -ba -ba -ba -ba -ba +re +re +re +re +re +re +re +re ca aD bY @@ -1029,21 +1465,21 @@ aG aH aH aW -ba -bQ -bQ -bQ -bQ -bQ -bQ -ba -ba -bR -by -bL +re +SQ +Hg +tC +IY +Hg +ZV +re +sP +ja +vU +pS +vU by -by -bn +WP ab cH cH @@ -1052,29 +1488,29 @@ cH ac ag ao -an +KR bh ab ab ab aW -ac -ab -ba -bP -bP -bP -bP -bP -bP -ba -ba +zj +ab +re +Sw +BN +gI +UF +BN +Pj +re +sP bC -bz -bz -bz -bz -br +Xf +Xf +Xf +Xf +Xf ab bu bw @@ -1083,29 +1519,29 @@ bw ac ah ao -an -an -aE -an -an -an -an +sk +Qr +Lh +Qr +Qr +Qr +Qr tG -ba -ba -ba -ba -ba -ba -ba -ba -ba +re +re +re +re +re +re +re +re +sP cb bz +rZ +Wv +bn bz -bz -bz -br ac bu bw @@ -1114,29 +1550,29 @@ bw ac ai ao -an -an +sk +Qr aE -an -an -an -an +Qr +Qr +Qr +Qr tG -ba -ba -ba -ba -ba -ba -ba -ba -ba +re +re +re +re +re +re +re +re +sP bR -bz -bz -bz -bz -br +eg +eg +eg +eg +eg ab bu bw @@ -1146,28 +1582,28 @@ ac aj ao at -an +Cm ab ab ab aL -ac +mD bb -ba -bQ -bQ -bQ -bQ -bQ -bQ -ba -ba +re +SQ +Hg +tC +IY +Hg +ZV +re +sP bR +Di +hH +Di bA -bM -bA -bA -bn +RW ab bu bw @@ -1184,14 +1620,14 @@ cp cp cp aI -ba -bP -bP -bP -bP -bP -bP -ba +re +Sw +BN +gI +UF +BN +Pj +re ca aD bY @@ -1211,25 +1647,25 @@ ax aC aD bm -cp -cp +fz +fz cp aI -ba -ba -ba -ba -ba -ba -ba -ba -ba -bR -bI -bS -bI +re +re +re +re +re +re +re +re +Rq +Bb +Us +yG +Us bI -bB +xz ab cH cH @@ -1242,24 +1678,24 @@ ab ab ab bc -cp -cp +fz +fz bx ab -ba aS AU AU AU AU aS -ba -ba +re +re +Rq bU -bJ -bJ -bJ -bJ +Yr +Yr +Yr +Yr bE ab cH @@ -1273,25 +1709,25 @@ aM bF Qf cE -cp -cp +fz +fz cw ab -ba aO aV aV aV aV aU -ba -ba +re +re +Rq cd bJ +EG +bB bJ -bJ -bJ -bE +Wn ac bu bw @@ -1299,30 +1735,30 @@ bw (16,1,1) = {" aa ac -cp -cp -cp +fz +fz +fz sc -cp -cp -cp +fz +fz +fz xD ab -ba aS aS aS aS aV aU -ba -ba +re +PL +EZ bR -bJ -bJ -bJ -bJ -bE +Yr +Yr +Yr +Yr +Db ab bu bw @@ -1339,21 +1775,21 @@ PY cD bf ab -aT -aS +PW bd be bi aV aU -bZ +re +vv bZ bR +yh +mj +yh bK -bT -bK -bK -bB +SN ab cH cH diff --git a/_maps/map_files/shuttles/emergency_lance.dmm b/_maps/map_files/shuttles/emergency_lance.dmm index 51c690540983a..4304275d58617 100644 --- a/_maps/map_files/shuttles/emergency_lance.dmm +++ b/_maps/map_files/shuttles/emergency_lance.dmm @@ -472,9 +472,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/windoor/access/all/command{ - dir = 4 - }, /obj/machinery/door/window/reinforced/normal{ name = "Last Resort"; dir = 4 @@ -487,6 +484,9 @@ pixel_y = -6 }, /obj/item/gun/energy/gun/mini, +/obj/effect/mapping_helpers/airlock/windoor/access/all/command/general{ + dir = 4 + }, /turf/simulated/floor/plasteel/dark, /area/shuttle/escape) "vk" = ( diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 6b42d8e033cca..59f264349e92d 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -602,6 +602,25 @@ }, /turf/simulated/floor/plating, /area/station/aisat/hall) +"adM" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint2) "adN" = ( /obj/structure/table, /obj/item/instrument/harmonica, @@ -820,7 +839,7 @@ }, /area/station/command/office/hos) "aeE" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "aeF" = ( @@ -1490,6 +1509,20 @@ icon_state = "white" }, /area/station/medical/virology) +"ahz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "ahA" = ( /obj/machinery/ai_status_display{ pixel_y = -32; @@ -3488,9 +3521,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5 - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -4489,7 +4519,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "aqc" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/fore) "aqd" = ( @@ -5354,8 +5384,7 @@ /area/station/legal/lawoffice) "asO" = ( /obj/machinery/computer/prisoner{ - dir = 4; - req_access = list(2) + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -5722,8 +5751,7 @@ /area/station/maintenance/fore) "atN" = ( /obj/machinery/computer/prisoner{ - dir = 4; - req_access = list(2) + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -6677,7 +6705,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "awO" = ( @@ -7818,7 +7846,7 @@ /obj/structure/chair/stool/bar{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "aAc" = ( @@ -8108,7 +8136,7 @@ }, /area/station/security/prison/cell_block/A) "aAY" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aAZ" = ( @@ -8147,7 +8175,7 @@ /obj/structure/chair/wood/wings{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "aBf" = ( @@ -8244,7 +8272,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "aBy" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/space/nearstation) "aBz" = ( @@ -8338,7 +8366,7 @@ /area/station/security/execution) "aBT" = ( /obj/item/paper/crumpled, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/space/nearstation) "aBU" = ( @@ -8349,11 +8377,11 @@ layer = 4; pixel_y = 32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "aBV" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "aBW" = ( @@ -8363,7 +8391,7 @@ /obj/machinery/light_construct/small{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "aBX" = ( @@ -8378,7 +8406,7 @@ }, /area/station/hallway/primary/fore) "aBZ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/space/nearstation) "aCa" = ( @@ -8414,9 +8442,7 @@ pixel_y = 32 }, /obj/machinery/alarm/directional/west, -/obj/machinery/computer/prisoner{ - req_access = list(2) - }, +/obj/machinery/computer/prisoner, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -8656,7 +8682,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "aCP" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/abandonedbar) "aCQ" = ( @@ -8681,7 +8707,7 @@ /area/station/maintenance/abandonedbar) "aCS" = ( /obj/item/lighter/random, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "aCT" = ( @@ -8941,13 +8967,13 @@ /area/station/maintenance/fpmaint2) "aDA" = ( /obj/structure/filingcabinet/filingcabinet, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aDB" = ( /obj/structure/rack, /obj/item/camera, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint2) "aDC" = ( @@ -9070,7 +9096,7 @@ "aEa" = ( /obj/structure/table/wood, /obj/item/trash/can, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "aEc" = ( @@ -9311,7 +9337,7 @@ "aEH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/spawner/xeno, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint2) "aEI" = ( @@ -9341,7 +9367,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aEQ" = ( -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aES" = ( @@ -9354,7 +9380,7 @@ }, /area/station/maintenance/abandonedbar) "aET" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aEU" = ( @@ -9383,7 +9409,7 @@ "aEX" = ( /obj/item/trash/pistachios, /obj/machinery/light_construct, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "aEY" = ( @@ -9403,7 +9429,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "aFb" = ( @@ -9699,7 +9725,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_port) "aFT" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/solar_maintenance/fore_port) "aFU" = ( @@ -9761,12 +9787,12 @@ /obj/structure/mineral_door/wood{ name = "Abandoned Bar" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "aGd" = ( /obj/effect/spawner/random/fungus/frequent, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/abandonedbar) "aGe" = ( @@ -9776,7 +9802,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aGi" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/fpmaint) "aGj" = ( @@ -9798,7 +9824,7 @@ /obj/structure/chair/stool{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint) "aGm" = ( @@ -9826,7 +9852,7 @@ /area/station/maintenance/fpmaint) "aGp" = ( /obj/machinery/economy/vending/coffee, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint) "aGq" = ( @@ -10102,7 +10128,7 @@ "aHm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint2) "aHo" = ( @@ -10285,7 +10311,7 @@ dir = 6; level = 1 }, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/item/wrench, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plating, @@ -10444,7 +10470,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aIy" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint2) "aIA" = ( @@ -10515,7 +10541,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 5 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint2) "aIN" = ( @@ -10550,7 +10576,7 @@ layer = 2 }, /obj/machinery/atmospherics/portable/canister/air, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aIR" = ( @@ -10577,7 +10603,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/fpmaint) "aIV" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint) @@ -10846,7 +10872,7 @@ /turf/simulated/floor/plating, /area/shuttle/pod_1) "aJU" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/fpmaint2) "aJV" = ( @@ -10856,7 +10882,7 @@ "aJW" = ( /mob/living/simple_animal/mouse, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint) "aJX" = ( @@ -10886,7 +10912,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aKc" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aKd" = ( @@ -10916,7 +10942,7 @@ /area/station/hallway/primary/fore) "aKh" = ( /obj/structure/chair/office/dark, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aKi" = ( @@ -11268,7 +11294,7 @@ /area/station/maintenance/fpmaint2) "aLk" = ( /obj/machinery/kitchen_machine/oven, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aLm" = ( @@ -11405,7 +11431,7 @@ }, /area/station/maintenance/fpmaint) "aLH" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/command/vault) "aLI" = ( @@ -11427,7 +11453,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint) "aLM" = ( @@ -11730,7 +11756,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aMz" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fsmaint) "aMA" = ( @@ -11857,7 +11883,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fpmaint) "aMR" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/fpmaint) "aMS" = ( @@ -12004,7 +12030,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aNo" = ( @@ -12492,7 +12518,7 @@ /area/station/engineering/atmos) "aOT" = ( /obj/structure/chair, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aOU" = ( @@ -12538,7 +12564,7 @@ /area/station/maintenance/fpmaint2) "aPa" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/food/meat/slab, /obj/item/clothing/mask/face/fox, /turf/simulated/floor/plasteel, @@ -12600,12 +12626,12 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "aPr" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "aPs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aPt" = ( @@ -13254,7 +13280,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aRp" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fpmaint2) "aRr" = ( @@ -13765,7 +13791,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aTg" = ( @@ -14168,7 +14194,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aUf" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/electrical) "aUg" = ( @@ -15452,7 +15478,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "aXJ" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -15480,7 +15506,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "aXM" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/public/storage/tools) "aXN" = ( @@ -16244,7 +16270,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bad" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bae" = ( @@ -16374,7 +16400,7 @@ }, /area/station/ai_monitored/storage/eva) "bat" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/fpmaint2) "bau" = ( @@ -19457,9 +19483,7 @@ }, /area/station/service/bar) "bjc" = ( -/obj/structure/closet/secure_closet/bar{ - req_access = list(25) - }, +/obj/structure/closet/secure_closet/bar, /turf/simulated/floor/wood, /area/station/service/bar) "bjd" = ( @@ -20416,7 +20440,7 @@ /area/station/maintenance/port) "blL" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "blM" = ( @@ -21688,7 +21712,7 @@ }, /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/port) "bpm" = ( @@ -22509,7 +22533,7 @@ /area/station/public/locker) "brw" = ( /obj/structure/bookcase{ - name = "bookcase (Adult)" + name = "bookcase (Romance)" }, /turf/simulated/floor/wood, /area/station/service/library) @@ -22678,7 +22702,7 @@ }, /area/station/service/chapel) "bsc" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/rack{ dir = 8; layer = 2.9 @@ -22767,7 +22791,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "bsn" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/machinery/atmospherics/portable/canister/air, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -23411,7 +23435,7 @@ desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; name = "KEEP CLEAR: DOCKING AREA" }, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/port) "bum" = ( @@ -23721,7 +23745,7 @@ /obj/machinery/atmospherics/unary/tank/air{ dir = 4 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "bvp" = ( @@ -23769,7 +23793,7 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "bvw" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -25985,7 +26009,7 @@ }, /area/station/science/robotics) "bEO" = ( -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/storage, /obj/effect/spawner/random/maintenance, @@ -26026,6 +26050,17 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/disposal) +"bFa" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/catwalk, +/area/station/engineering/transmission_laser) "bFd" = ( /obj/structure/rack{ dir = 8; @@ -26247,7 +26282,7 @@ /area/station/public/storage/tools/auxiliary) "bGb" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/port) "bGc" = ( @@ -26518,7 +26553,7 @@ /obj/machinery/camera{ c_tag = "Auxiliary Tool Storage" }, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel, /area/station/public/storage/tools/auxiliary) "bGU" = ( @@ -26649,7 +26684,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/west) "bHv" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/wood, /area/station/maintenance/port) @@ -27074,8 +27109,8 @@ /area/station/turret_protected/ai_upload) "bIP" = ( /obj/structure/closet/secure_closet/personal, -/obj/effect/spawner/random_spawners/cobweb_right_rare, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/cobweb/right/rare, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/port) "bIR" = ( @@ -27536,21 +27571,6 @@ }, /turf/simulated/floor/plasteel, /area/station/supply/sorting) -"bKD" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/apmaint2) "bKE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -30193,12 +30213,22 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "bUw" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "bUx" = ( @@ -30341,6 +30371,12 @@ /obj/machinery/economy/vending/cart, /turf/simulated/floor/plasteel, /area/station/supply/lobby) +"bVw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "bVA" = ( /obj/structure/disposalpipe/segment/corner{ dir = 1 @@ -30454,7 +30490,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "bVV" = ( @@ -30496,7 +30532,7 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -30987,7 +31023,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -31572,7 +31608,7 @@ }, /area/station/medical/reception) "cao" = ( -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -31615,7 +31651,7 @@ /area/station/supply/expedition) "cat" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -32383,7 +32419,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/sorting) "cdb" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "cdg" = ( @@ -32652,7 +32688,7 @@ /turf/simulated/floor/wood, /area/station/medical/psych) "ceb" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "ceh" = ( @@ -32819,8 +32855,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "ceK" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/cobweb/right/frequent, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint2) "ceM" = ( @@ -33463,7 +33499,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, @@ -33936,7 +33972,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "ciT" = ( @@ -33999,7 +34035,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "cjc" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/port) "cjf" = ( @@ -34494,7 +34530,7 @@ }, /area/station/medical/patients_rooms_secondary) "clg" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint2) "clh" = ( @@ -34602,7 +34638,7 @@ /area/station/science/storage) "clz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "clA" = ( @@ -34680,12 +34716,12 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint2) "clX" = ( /obj/structure/fermenting_barrel, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint2) "clY" = ( @@ -35089,7 +35125,7 @@ /area/station/command/office/ntrep) "cnv" = ( /obj/item/seeds/berry, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint2) "cnw" = ( @@ -35349,7 +35385,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) "con" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/port) "coo" = ( @@ -35384,11 +35420,11 @@ /area/station/medical/storage/secondary) "coA" = ( /obj/item/seeds/apple, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint2) "coH" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/dispenser/oxygen, /turf/simulated/floor/plasteel{ dir = 5; @@ -37044,13 +37080,13 @@ /obj/structure/table/glass, /obj/item/storage/bag/trash, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/station/maintenance/aft) "cuy" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/effect/turf_decal/delivery/white/hollow, /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/atmospherics/portable/canister/air{ @@ -37156,7 +37192,7 @@ /turf/simulated/wall, /area/station/maintenance/asmaint2) "cuS" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /obj/effect/spawner/random/fungus/maybe, /turf/simulated/wall, /area/station/maintenance/asmaint2) @@ -37379,7 +37415,7 @@ /turf/simulated/wall, /area/station/medical/virology) "cvQ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -37748,7 +37784,7 @@ /area/station/maintenance/aft) "cxy" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/blood/innards, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -38006,7 +38042,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "cyk" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/apmaint) "cyn" = ( @@ -38221,7 +38257,7 @@ "cyK" = ( /obj/item/clothing/under/rank/medical/scrubs/purple, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cyM" = ( @@ -38230,7 +38266,7 @@ pixel_x = 6 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cyN" = ( @@ -38414,7 +38450,7 @@ /area/station/maintenance/aft) "czr" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "czt" = ( @@ -39979,7 +40015,7 @@ /area/station/science/misc_lab) "cEv" = ( /obj/machinery/space_heater, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/port) "cEx" = ( @@ -39988,7 +40024,7 @@ /area/station/maintenance/aft) "cEy" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -40045,7 +40081,7 @@ /area/station/maintenance/port) "cEM" = ( /obj/structure/largecrate, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "cES" = ( @@ -40298,7 +40334,7 @@ layer = 2.9 }, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/port) "cFU" = ( @@ -41049,7 +41085,7 @@ /turf/simulated/floor/plating, /area/station/engineering/atmos/control) "cIj" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/aft) "cIl" = ( @@ -41083,7 +41119,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cIu" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cIC" = ( @@ -41357,14 +41393,9 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "cJC" = ( -/obj/structure/dispenser, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/dispenser, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "cJD" = ( @@ -41459,7 +41490,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 8 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/port) "cJP" = ( @@ -41554,7 +41585,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/aft) "cKi" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -42329,7 +42360,7 @@ }, /area/station/maintenance/aft) "cNk" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cNl" = ( @@ -42537,7 +42568,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "cNZ" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/assembly_line) @@ -43159,7 +43190,7 @@ /turf/simulated/wall/r_wall, /area/station/science/test_chamber) "cQw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/asmaint) "cQy" = ( @@ -43560,14 +43591,9 @@ "cRE" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/port) -"cRG" = ( -/obj/structure/girder, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/turf/simulated/floor/plating, -/area/station/maintenance/apmaint2) "cRK" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 @@ -43756,6 +43782,11 @@ /area/station/engineering/solar/aft_port) "cSl" = ( /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "cSm" = ( @@ -43776,6 +43807,11 @@ /area/station/engineering/atmos/distribution) "cSp" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "cSr" = ( @@ -44249,6 +44285,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "cTI" = ( @@ -44316,7 +44357,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cTU" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cTV" = ( @@ -44347,10 +44388,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) -"cUc" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, -/turf/simulated/wall/r_wall, -/area/station/maintenance/apmaint2) "cUd" = ( /obj/structure/cable{ d1 = 2; @@ -44373,7 +44410,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/aft_port) "cUf" = ( -/obj/structure/cable{ +/obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" @@ -44635,28 +44672,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) -"cVk" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/hardsuitstorage) "cVl" = ( /obj/structure/cable, /obj/machinery/power/solar_control{ @@ -44677,11 +44692,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/aft_port) "cVo" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -44691,6 +44701,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "cVp" = ( @@ -44714,17 +44729,17 @@ /obj/structure/disposalpipe/segment/corner{ dir = 8 }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "cVv" = ( @@ -45004,11 +45019,6 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "cWy" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -45301,7 +45311,7 @@ name = "west bump"; pixel_x = -28 }, -/obj/machinery/suit_storage_unit/ce/secure, +/obj/machinery/suit_storage_unit/industrial/ce/secure, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "yellow" @@ -46369,7 +46379,7 @@ /turf/simulated/floor/engine/plasma, /area/station/engineering/atmos) "dbX" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "dbZ" = ( @@ -49251,6 +49261,10 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) +"dmr" = ( +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/engineering/transmission_laser) "dms" = ( /obj/structure/cable{ d1 = 1; @@ -50710,7 +50724,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "dsK" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "dsL" = ( @@ -50776,6 +50790,11 @@ /area/station/maintenance/port) "dsY" = ( /obj/structure/chair, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "dta" = ( @@ -50800,6 +50819,11 @@ }, /obj/item/pen, /obj/structure/table, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "dtc" = ( @@ -50822,6 +50846,11 @@ pixel_y = 6 }, /obj/structure/table, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "dtl" = ( @@ -50830,6 +50859,11 @@ pixel_y = 5 }, /obj/structure/table, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "dtn" = ( @@ -51275,7 +51309,7 @@ pixel_y = 3 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "dEG" = ( @@ -51432,6 +51466,17 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) +"dHd" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/mapping_helpers/turfs/rust/maybe, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint2) "dHw" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -51585,7 +51630,7 @@ /obj/item/stack/medical/bruise_pack/advanced, /obj/effect/decal/cleanable/blood/gibs/robot/down, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "dLd" = ( @@ -51693,7 +51738,7 @@ /area/station/hallway/primary/starboard/east) "dMM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "dMT" = ( @@ -52113,7 +52158,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "dXC" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/rods{ amount = 4 }, @@ -52364,7 +52409,7 @@ inlet_injector_autolink_id = "o2_in"; name = "Oxygen Supply Control"; outlet_vent_autolink_id = "o2_out"; - autolink_sensors = list("o2_sensor" = "Tank") + autolink_sensors = list("o2_sensor"="Tank") }, /turf/simulated/floor/plasteel{ icon_state = "blue" @@ -52530,7 +52575,7 @@ /obj/structure/sign/poster/contraband/red_rum{ pixel_y = 30 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "efD" = ( @@ -53213,8 +53258,16 @@ /area/station/engineering/control) "euD" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) @@ -53677,7 +53730,7 @@ /obj/structure/chair/stool{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/aft) "eGZ" = ( @@ -53686,7 +53739,7 @@ }, /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "eHw" = ( @@ -54065,7 +54118,7 @@ }, /area/station/public/dorms) "ePX" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) @@ -54195,7 +54248,7 @@ inlet_injector_autolink_id = "n2_in"; name = "Nitrogen Supply Control"; outlet_vent_autolink_id = "n2_out"; - autolink_sensors = list("n2_sensor" = "Tank") + autolink_sensors = list("n2_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/plasteel{ @@ -54279,7 +54332,7 @@ }, /area/station/security/brig) "eWA" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -54531,6 +54584,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/security/permabrig) +"fcp" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_x = -32 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "fct" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -54635,7 +54697,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "fea" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/item/clothing/gloves/color/fyellow/old, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -55483,7 +55545,7 @@ /obj/machinery/computer/general_air_control{ dir = 4; name = "Tank Monitor"; - autolink_sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank") + autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) @@ -55595,6 +55657,10 @@ icon_state = "dark" }, /area/station/maintenance/apmaint) +"fzl" = ( +/obj/structure/sign/radiation/rad_area, +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "fzC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/binary/valve/open{ @@ -55799,7 +55865,7 @@ /turf/simulated/wall/r_wall, /area/station/science/toxins/launch) "fDM" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/structure/disposalpipe/segment/corner{ dir = 2 }, @@ -55845,7 +55911,7 @@ /area/station/maintenance/aft) "fEw" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/machinery/message_server, /turf/simulated/floor/bluegrid, /area/station/command/server) @@ -56057,7 +56123,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "fJX" = ( @@ -56276,7 +56342,7 @@ }, /area/station/medical/chemistry) "fRo" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/chair, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plating, @@ -57519,7 +57585,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/west) "gwb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -57583,7 +57649,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint2) "gyt" = ( @@ -57645,7 +57711,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "gzN" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/apmaint) "gAk" = ( @@ -57690,7 +57756,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "gAJ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/port) "gAK" = ( @@ -57710,6 +57776,11 @@ d2 = 8; icon_state = "1-8" }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "gCJ" = ( @@ -57851,7 +57922,7 @@ /turf/simulated/floor/engine, /area/station/science/xenobiology) "gGR" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, @@ -57934,7 +58005,7 @@ /area/station/maintenance/assembly_line) "gIn" = ( /obj/item/lighter/random, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/aft) "gIp" = ( @@ -58582,6 +58653,13 @@ icon_state = "darkred" }, /area/station/security/brig) +"gVS" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "gVT" = ( /obj/structure/table, /obj/item/ashtray/glass, @@ -58702,6 +58780,12 @@ icon_state = "red" }, /area/station/security/permabrig) +"gXh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "gXD" = ( /obj/item/kirbyplants, /obj/machinery/requests_console/directional/north, @@ -58811,7 +58895,7 @@ /turf/simulated/floor/engine/vacuum, /area/station/science/toxins/mixing) "gZn" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -59006,7 +59090,7 @@ /area/station/science/robotics/chargebay) "hgb" = ( /obj/structure/chair, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "hgj" = ( @@ -59502,7 +59586,7 @@ /area/space/nearstation) "huo" = ( /obj/structure/chair/stool, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood, /area/station/maintenance/asmaint2) "hut" = ( @@ -59764,7 +59848,7 @@ /turf/simulated/floor/plasteel, /area/station/science/storage) "hCY" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -60007,10 +60091,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "hIc" = ( @@ -60085,13 +60169,17 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "hJN" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "hJW" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -60651,6 +60739,17 @@ icon_state = "yellowcorner" }, /area/station/maintenance/asmaint2) +"hYH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc/directional/east, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "hZc" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable, @@ -60819,7 +60918,7 @@ }, /area/station/medical/reception) "iez" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/apmaint) "ieI" = ( @@ -61013,10 +61112,10 @@ /obj/structure/closet/crate, /obj/item/vending_refill/cargodrobe, /obj/item/vending_refill/boozeomat, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) @@ -61073,6 +61172,20 @@ "ikv" = ( /turf/simulated/wall, /area/station/science/lobby) +"ikK" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint2) "ikL" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, @@ -61690,7 +61803,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "iBU" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/disposal) "iCd" = ( @@ -62192,6 +62305,11 @@ icon_state = "dark" }, /area/station/medical/morgue) +"iQq" = ( +/obj/structure/sign/securearea, +/obj/effect/mapping_helpers/turfs/rust/maybe, +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "iQJ" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/alarm/directional/north, @@ -62770,6 +62888,25 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/station/security/prisonershuttle) +"jeU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/hardsuitstorage) "jfa" = ( /obj/machinery/light{ dir = 1 @@ -62871,7 +63008,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -62971,6 +63107,10 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) +"jlS" = ( +/obj/structure/sign/securearea, +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "jlW" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -63397,7 +63537,7 @@ /area/station/hallway/primary/aft/north) "jtP" = ( /obj/item/kirbyplants, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "jum" = ( @@ -63786,7 +63926,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/port) "jDJ" = ( @@ -63816,6 +63956,13 @@ }, /turf/simulated/floor/plasteel, /area/station/public/dorms) +"jEc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/alarm/directional/west, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "jFf" = ( /obj/structure/closet/crate/secure{ req_one_access = list(33,41) @@ -64214,12 +64361,12 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "jQI" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "jQQ" = ( /obj/item/latexballon, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/port) "jRo" = ( @@ -64628,7 +64775,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "jZL" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 4 }, @@ -64989,7 +65136,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "kiQ" = ( @@ -65074,7 +65221,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/aft) "kkk" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/engineering/gravitygenerator) "kkv" = ( @@ -65580,13 +65727,21 @@ /area/station/science/hallway) "kyh" = ( /obj/machinery/washing_machine, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "kym" = ( /obj/machinery/economy/slot_machine, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) +"kyo" = ( +/obj/item/radio/intercom{ + name = "west bump"; + pixel_x = -28 + }, +/obj/effect/mapping_helpers/turfs/rust/maybe, +/turf/simulated/wall/r_wall, +/area/station/engineering/gravitygenerator) "kzB" = ( /obj/effect/spawner/lootdrop/three_course_meal, /obj/structure/closet/crate/freezer, @@ -65810,7 +65965,7 @@ /area/station/maintenance/aft) "kEe" = ( /obj/machinery/economy/vending/coffee, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "kEs" = ( @@ -65998,7 +66153,7 @@ inlet_injector_autolink_id = "co2_in"; name = "Carbon Dioxide Supply Control"; outlet_vent_autolink_id = "co2_out"; - autolink_sensors = list("co2_sensor" = "Tank") + autolink_sensors = list("co2_sensor"="Tank") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -66221,9 +66376,7 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "kNx" = ( -/obj/machinery/computer/prisoner{ - req_access = list(2) - }, +/obj/machinery/computer/prisoner, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -67193,25 +67346,30 @@ icon_state = "blue" }, /area/station/hallway/primary/central/ne) -"lmM" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +"lmL" = ( +/obj/machinery/door/airlock/engineering{ + name = "Power Transmission Laser" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/turf/simulated/floor/plasteel, +/area/station/engineering/gravitygenerator) +"lmM" = ( +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "lmU" = ( @@ -67377,7 +67535,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "lqd" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/asmaint2) "lqg" = ( @@ -67608,7 +67766,7 @@ name = "Silver Crate" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/effect/spawner/random/maintenance, /obj/item/coin/silver{ pixel_x = 5; @@ -67726,7 +67884,7 @@ }, /area/station/command/office/cmo) "lAb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light_construct/small{ dir = 8 }, @@ -67734,7 +67892,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "lAc" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/tracks/mapped{ dir = 1 @@ -68079,7 +68237,7 @@ /area/station/maintenance/asmaint) "lHs" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "lHv" = ( @@ -68123,12 +68281,28 @@ /obj/machinery/sleeper{ dir = 2 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/aft) +"lIl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/camera{ + c_tag = "Prison Solitary Confinement 2"; + dir = 6; + network = list("Prison","SS13") + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "lIV" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -68398,6 +68572,15 @@ icon_state = "cafeteria" }, /area/station/public/dorms) +"lPx" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "lPC" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -68544,7 +68727,7 @@ /area/station/science/lobby) "lSg" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "lSr" = ( @@ -68901,7 +69084,7 @@ dir = 1; level = 3; name = "Distribution and Waste Monitor"; - autolink_sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop") + autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) @@ -68988,7 +69171,7 @@ /obj/item/food/grown/cannabis, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/mask/cigarette/medical_marijuana, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "med" = ( @@ -69122,7 +69305,7 @@ /obj/machinery/floodlight{ light_power = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "mhC" = ( @@ -69433,6 +69616,9 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/simulated/floor/plating, /area/station/engineering/tech_storage) +"mnN" = ( +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "mpk" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -69498,7 +69684,7 @@ /obj/structure/chair/stool{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/aft) "mrw" = ( @@ -69519,7 +69705,7 @@ }, /area/station/science/xenobiology) "msm" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, /turf/simulated/floor/plating, @@ -69681,7 +69867,7 @@ /area/station/medical/reception) "mxz" = ( /obj/machinery/space_heater, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "mxA" = ( @@ -69792,7 +69978,7 @@ "mAq" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, -/obj/structure/cable{ +/obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" @@ -69921,7 +70107,7 @@ dir = 6; level = 1 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/machinery/alarm/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) @@ -70645,6 +70831,15 @@ icon_state = "whiteblue" }, /area/station/medical/medbay2) +"mVd" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/hardsuitstorage) "mVm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -71193,7 +71388,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "npb" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitehall" @@ -71226,7 +71421,7 @@ }, /area/station/science/xenobiology) "nqv" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/port) "nqG" = ( @@ -71316,18 +71511,14 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "nsU" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ +/obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "nsZ" = ( @@ -71525,6 +71716,15 @@ /obj/machinery/light, /turf/simulated/floor/plasteel, /area/station/supply/storage) +"nxt" = ( +/obj/structure/chair, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/hardsuitstorage) "nxI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple, /obj/machinery/door/airlock/maintenance, @@ -71637,7 +71837,7 @@ /area/station/maintenance/aft) "nBs" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "nBz" = ( @@ -72026,7 +72226,7 @@ }, /area/station/science/rnd) "nLf" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "nLC" = ( @@ -72070,7 +72270,7 @@ /turf/simulated/floor/plating, /area/station/command/office/rd) "nMd" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "nMi" = ( @@ -72094,6 +72294,20 @@ icon_state = "blue" }, /area/station/command/bridge) +"nME" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint2) "nMU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -72473,21 +72687,6 @@ }, /turf/simulated/floor/plating, /area/station/security/prison/cell_block/A) -"nVM" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/station/maintenance/apmaint2) "nXc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ @@ -73147,7 +73346,7 @@ pixel_x = -32 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "ojT" = ( @@ -73311,6 +73510,14 @@ }, /turf/simulated/floor/plasteel, /area/station/public/dorms) +"omG" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/hardsuitstorage) "onc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -73357,6 +73564,15 @@ icon_state = "whitebluefull" }, /area/station/medical/reception) +"onZ" = ( +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "ooa" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -73488,7 +73704,7 @@ "orE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "orL" = ( @@ -73734,7 +73950,7 @@ }, /area/station/command/bridge) "owJ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "owP" = ( @@ -73746,7 +73962,7 @@ /turf/simulated/floor/plating/airless, /area/station/maintenance/fpmaint2) "oxf" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, @@ -73782,6 +73998,10 @@ icon_state = "bluecorner" }, /area/station/hallway/primary/central/west) +"oyi" = ( +/obj/effect/mapping_helpers/turfs/rust/maybe, +/turf/simulated/wall/r_wall, +/area/station/maintenance/apmaint2) "oyt" = ( /obj/structure/cable{ d1 = 4; @@ -73826,7 +74046,7 @@ }, /area/station/science/rnd) "oyY" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/asmaint2) "ozk" = ( @@ -74513,7 +74733,7 @@ inlet_injector_autolink_id = "tox_in"; name = "Toxin Supply Control"; outlet_vent_autolink_id = "tox_out"; - autolink_sensors = list("tox_sensor" = "Tank") + autolink_sensors = list("tox_sensor"="Tank") }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -74824,7 +75044,7 @@ "oVs" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "oVH" = ( @@ -74870,7 +75090,7 @@ dir = 8; level = 3; name = "Distribution and Waste Monitor"; - autolink_sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop") + autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) @@ -75610,7 +75830,7 @@ /turf/simulated/floor/plasteel, /area/station/security/range) "pqA" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "pqW" = ( @@ -75703,7 +75923,7 @@ /area/station/maintenance/apmaint) "psT" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "ptK" = ( @@ -75749,7 +75969,7 @@ dir = 1 }, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "puC" = ( @@ -75865,22 +76085,17 @@ /turf/simulated/floor/plasteel, /area/station/medical/storage) "pxP" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) @@ -75903,6 +76118,15 @@ icon_state = "green" }, /area/station/medical/virology) +"pyC" = ( +/obj/structure/sign/electricshock{ + pixel_y = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "pyI" = ( /obj/structure/sign/biohazard, /turf/simulated/wall/r_wall, @@ -76247,7 +76471,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -76787,14 +77010,19 @@ /turf/simulated/floor/engine/co2, /area/station/engineering/atmos) "pUZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "pVb" = ( @@ -76877,7 +77105,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, @@ -77575,7 +77802,7 @@ }, /obj/machinery/computer/general_air_control{ name = "Bomb Mix Monitor"; - autolink_sensors = list("burn_sensor" = "Burn Mix") + autolink_sensors = list("burn_sensor"="Burn Mix") }, /obj/machinery/door_control{ id = "ToxinsVenting"; @@ -77754,7 +77981,7 @@ dir = 8; name = "Glass Door" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint2) "qqk" = ( @@ -77810,9 +78037,17 @@ name = "shutter door controller"; pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "qrx" = ( @@ -78048,14 +78283,14 @@ /turf/space, /area/space/nearstation) "qwJ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/cultivator, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "qwM" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/machinery/light/small{ dir = 1 }, @@ -78314,7 +78549,7 @@ /turf/simulated/floor/plating, /area/station/engineering/engine/supermatter) "qCH" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, @@ -78763,6 +78998,11 @@ /area/station/science/robotics/chargebay) "qLK" = ( /obj/structure/closet/firecloset, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "qMk" = ( @@ -79230,7 +79470,7 @@ /area/station/security/permabrig) "qYC" = ( /obj/item/pen/fancy, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "qYE" = ( @@ -79340,7 +79580,7 @@ }, /obj/machinery/computer/general_air_control{ name = "Tank Monitor"; - autolink_sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank") + autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") }, /obj/machinery/light{ dir = 4 @@ -79376,7 +79616,7 @@ /area/station/engineering/hardsuitstorage) "rbZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "rcf" = ( @@ -79571,7 +79811,7 @@ /area/station/maintenance/aft) "rfh" = ( /obj/item/clothing/under/misc/assistantformal, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "rfn" = ( @@ -79908,7 +80148,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "rnd" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plating, /area/station/maintenance/aft) "rne" = ( @@ -79925,6 +80165,11 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "rng" = ( @@ -80109,7 +80354,7 @@ dir = 1 }, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "rtx" = ( @@ -80165,6 +80410,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/engine, /area/station/engineering/control) "ruY" = ( @@ -80365,7 +80615,7 @@ /turf/simulated/floor/engine, /area/station/maintenance/incinerator) "rAe" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/security/permabrig) "rAi" = ( @@ -80430,7 +80680,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "rBN" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -80447,7 +80697,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -80512,7 +80762,7 @@ name = "Mixed Air Supply Control"; outlet_vent_autolink_id = "air_out"; outlet_setting = 2000; - autolink_sensors = list("air_sensor" = "Tank") + autolink_sensors = list("air_sensor"="Tank") }, /turf/simulated/floor/plasteel{ icon_state = "arrival" @@ -80569,11 +80819,11 @@ }, /area/station/public/dorms) "rEZ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/apmaint2) "rFc" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "rFe" = ( @@ -80706,6 +80956,25 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) +"rIH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/hardsuitstorage) "rJb" = ( /obj/structure/cable{ d1 = 1; @@ -80724,6 +80993,15 @@ icon_state = "brown" }, /area/station/supply/miningdock) +"rJr" = ( +/obj/effect/spawner/window/reinforced/plasma, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/station/engineering/control) "rJJ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -80793,7 +81071,7 @@ /area/station/science/explab/chamber) "rMb" = ( /obj/machinery/mecha_part_fabricator, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "rMq" = ( @@ -80853,11 +81131,6 @@ icon_state = "yellowcorner" }, /area/station/maintenance/asmaint2) -"rNN" = ( -/obj/effect/spawner/random/barrier/grille_maybe, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/turf/simulated/floor/plating, -/area/station/maintenance/apmaint2) "rOl" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -81036,7 +81309,7 @@ /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "rSS" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/science/misc_lab) "rSX" = ( @@ -81440,6 +81713,9 @@ icon_state = "brown" }, /area/station/supply/miningdock) +"scI" = ( +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "scM" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -81467,7 +81743,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "sdw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/solar_maintenance/aft_port) "sem" = ( @@ -81672,7 +81948,7 @@ /area/station/medical/sleeper) "sji" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/machinery/light/small{ dir = 1 }, @@ -81731,8 +82007,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "smx" = ( -/obj/effect/spawner/random_spawners/blood_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/blood/maybe, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "smL" = ( @@ -81974,6 +82250,13 @@ icon_state = "whitepurple" }, /area/station/science/xenobiology) +"sqN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "srx" = ( /obj/structure/disposalpipe/segment/corner{ dir = 1 @@ -82346,6 +82629,12 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"sDe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "sDp" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -82387,6 +82676,21 @@ }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) +"sEh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint2) "sEl" = ( /obj/structure/bed, /obj/effect/landmark/spawner/nukedisc_respawn, @@ -82588,11 +82892,11 @@ /area/station/service/chapel/office) "sJC" = ( /obj/machinery/economy/slot_machine, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "sJQ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "sJX" = ( @@ -82620,7 +82924,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, @@ -82957,7 +83261,7 @@ /obj/structure/chair/wood{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/aft) "sSb" = ( @@ -82972,6 +83276,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/engine, /area/station/engineering/control) "sSf" = ( @@ -83023,6 +83332,18 @@ /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/grass, /area/station/security/permabrig) +"sTc" = ( +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/stack/cable_coil{ + color = "#FFFF00" + }, +/obj/item/storage/toolbox/mechanical, +/obj/item/multitool, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "sTF" = ( /obj/structure/cable{ d1 = 1; @@ -83312,7 +83633,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "tcM" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -83344,6 +83665,11 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "tdg" = ( @@ -83388,6 +83714,14 @@ /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plating, /area/station/security/permabrig) +"tdO" = ( +/obj/structure/cable/yellow, +/obj/machinery/power/transmission_laser, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "ten" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -83413,13 +83747,6 @@ icon_state = "dark" }, /area/station/medical/cryo) -"tfD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/station/maintenance/apmaint2) "tfN" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 @@ -83544,6 +83871,10 @@ icon_state = "barber" }, /area/station/public/locker) +"tjG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "tjS" = ( /obj/structure/sign/chinese{ pixel_x = -32; @@ -83753,7 +84084,7 @@ /area/station/medical/medbay3) "tqH" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "trR" = ( @@ -83847,7 +84178,7 @@ /area/station/maintenance/fsmaint) "tue" = ( /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "tum" = ( @@ -83932,6 +84263,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "twe" = ( @@ -84049,7 +84385,7 @@ /turf/simulated/floor/plasteel, /area/station/service/janitor) "tzm" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/incinerator) "tzo" = ( @@ -84296,13 +84632,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) -"tEU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/maintenance/apmaint2) "tFe" = ( /obj/machinery/requests_console/directional/south, /obj/machinery/camera/autoname{ @@ -84386,11 +84715,14 @@ "tHh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, -/obj/structure/cable{ +/obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "tHl" = ( @@ -84416,6 +84748,13 @@ }, /turf/simulated/floor/plating, /area/station/security/lobby) +"tHE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "tHH" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 @@ -84590,7 +84929,7 @@ /area/station/science/misc_lab) "tMs" = ( /obj/effect/turf_decal/stripes/line, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/random/mech, /turf/simulated/floor/plating, /area/station/maintenance/disposal) @@ -84857,7 +85196,7 @@ /area/station/command/office/ce) "tRE" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "vault" @@ -85002,7 +85341,7 @@ /obj/item/clothing/accessory/stethoscope, /obj/item/crowbar, /obj/effect/landmark/spawner/nukedisc_respawn, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) @@ -85397,7 +85736,7 @@ "ucU" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "udq" = ( @@ -85631,7 +85970,7 @@ /obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = -5 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "ulE" = ( @@ -85782,6 +86121,18 @@ icon_state = "freezerfloor" }, /area/station/medical/cryo) +"upX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-4"; + d1 = 1; + d2 = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellow" + }, +/area/station/engineering/transmission_laser) "upZ" = ( /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel{ @@ -86110,8 +86461,24 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/structure/closet/radiation, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) +"uyl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/maintenance/apmaint2) "uzd" = ( /obj/machinery/alarm/directional/west, /obj/structure/table/glass/reinforced, @@ -86345,7 +86712,7 @@ inlet_injector_autolink_id = "waste_in"; name = "Gas Mix Tank Control"; outlet_vent_autolink_id = "waste_out"; - autolink_sensors = list("waste_sensor" = "Tank") + autolink_sensors = list("waste_sensor"="Tank") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -86460,7 +86827,7 @@ /area/station/security/prisonlockers) "uJa" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, @@ -86538,7 +86905,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "uMu" = ( @@ -86868,14 +87235,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "uWf" = ( @@ -86903,7 +87270,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "uWq" = ( @@ -87087,6 +87454,13 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) +"vbt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/caution/stand_clear, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "vbD" = ( /obj/structure/table/wood, /obj/machinery/computer/med_data/laptop, @@ -87363,13 +87737,14 @@ /area/station/maintenance/apmaint) "vjx" = ( /obj/structure/girder, -/obj/structure/cable{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "vkC" = ( @@ -88001,7 +88376,7 @@ /area/station/medical/morgue) "vyw" = ( /obj/structure/chair/stool, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "vyx" = ( @@ -88407,7 +88782,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, @@ -88487,12 +88861,15 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/closet/radiation, -/obj/item/radio/intercom{ - name = "west bump"; - pixel_x = -28 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellow" }, -/turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "vLm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -88602,7 +88979,7 @@ }, /area/station/science/lobby) "vOy" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -88616,7 +88993,7 @@ "vOE" = ( /obj/item/circuitboard/operating, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -88819,20 +89196,6 @@ icon_state = "white" }, /area/station/science/hallway) -"vVB" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/apmaint2) "vVK" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -89106,6 +89469,17 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/science/misc_lab) +"wct" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/spawner/window/reinforced/grilled, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/station/engineering/transmission_laser) "wcA" = ( /obj/structure/closet/emcloset, /obj/machinery/light{ @@ -89235,7 +89609,7 @@ /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "wgA" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plasteel, @@ -89419,7 +89793,7 @@ /turf/simulated/floor/grass, /area/station/security/permabrig) "wkQ" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -89524,7 +89898,7 @@ "wnG" = ( /obj/structure/chair/sofa/bench/left, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "woA" = ( @@ -89673,7 +90047,7 @@ id_tag = "maint_house" }, /obj/structure/barricade/wooden, -/obj/structure/cable{ +/obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" @@ -89853,7 +90227,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/landmark/spawner/nukedisc_respawn, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -90541,7 +90915,7 @@ }, /obj/structure/bed, /obj/item/bedsheet/black, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/carpet/royalblack, /area/station/maintenance/apmaint) "wOr" = ( @@ -90781,11 +91155,6 @@ name = "Engineering Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -90795,6 +91164,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "wWp" = ( @@ -90817,6 +91191,13 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"wXb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint2) "wXg" = ( /obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -91959,7 +92340,7 @@ inlet_injector_autolink_id = "n2o_in"; name = "Nitrous Oxide Supply Control"; outlet_vent_autolink_id = "n2o_out"; - autolink_sensors = list("n2o_sensor" = "Tank") + autolink_sensors = list("n2o_sensor"="Tank") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -92157,6 +92538,12 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/science/toxins/launch) +"xEw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "xEG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -92237,6 +92624,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "xHA" = ( @@ -92586,7 +92978,7 @@ }, /area/station/security/permabrig) "xPE" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/security/permabrig) "xQB" = ( @@ -92678,7 +93070,7 @@ }, /area/station/supply/qm) "xRG" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "purple" @@ -92735,21 +93127,6 @@ icon_state = "dark" }, /area/station/maintenance/aft) -"xSq" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/maintenance/apmaint2) "xSF" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/effect/spawner/airlock/e_to_w, @@ -93390,6 +93767,12 @@ icon_state = "dark" }, /area/station/command/office/hos) +"yfP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "yfT" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 8 @@ -93528,7 +93911,7 @@ "yhY" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "yif" = ( @@ -114285,18 +114668,18 @@ gSg ajF qsa cLi +aab +aab aaa -aaa -aaa -aaa -cPG -aaa -aaa -aaa -aaa +swl +ntD +xSF +aab +aab aaa aab aab +aab aaa aaa aaa @@ -114542,15 +114925,15 @@ vYD ilt sXR pOC +aaa +aab +aab +swl +jCt +swl +aab aab aab -aaa -aaa -cPG -aaa -aaa -aaa -aaa aab aab aaa @@ -114800,13 +115183,12 @@ pgV cKe pOC aaa -aab aaa swl +swl ntD -xSF -aab -aab +swl +swl aab aab aaa @@ -114884,6 +115266,7 @@ aaa aaa aaa aaa +aaa "} (83,1,1) = {" aaa @@ -115057,14 +115440,14 @@ ogh cLF cLi aaa -aaa -aab -swl -jCt -swl -aab -aab aab +cRA +cSR +gOm +cVl +sdw +aaa +aaa aaa aaa aaa @@ -115314,19 +115697,19 @@ dTu cKe rEZ aaa -aab -swl -swl -ntD -swl -swl -aab -aaa -aaa -aaa -aaa -aaa aaa +cRA +cTa +cUe +cVd +cRA +mnN +mnN +jlS +mnN +mnN +mnN +mnN aaa aaa aaa @@ -115571,19 +115954,19 @@ ogh cKe pOC aaa -aaa -cRA -cSR -gOm -cVl +aab sdw -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cST +cUd +cVm +sdw +sTc +jEc +tjG +tHE +fcp +xEw +mnN aaa aaa aaa @@ -115827,20 +116210,20 @@ rMq wfP eAw pOC -aaa +aab aab cRA -cTa -cUe -cVd cRA -aaa -aab -aab -aaa -aaa -aaa -aaa +lQm +cRA +sdw +onZ +bFa +tdO +sDe +bVw +pyC +mnN aaa aaa aaa @@ -116084,20 +116467,20 @@ cLi qdV kLd rEZ -aab -aab -sdw -cST -cUd -cVm -cRA -aab -aab -aaa -aaa -aaa aaa aaa +oyi +iKY +hgj +eNV +cLi +fzl +lIl +xEw +scI +scI +vbt +dmr aaa aaa aaa @@ -116343,22 +116726,22 @@ qod rEZ aaa aaa -cRA -cRA -lQm -cRA -sdw -aab -aab +cQy +cNB +cUh +ikK +dHd +wct +ahz +bVw +yfP +gXh +xEw +fzl +aaa +aaa aaa aaa -aYm -aYm -aYm -aYm -aYm -aYm -aYm aaa aaa aaa @@ -116600,20 +116983,20 @@ cKe pOC aaa aaa -cUc -iKY -hgj -eNV -cLi -rEZ -aaa -aaa -aaa -aaa +oyi +cNB +cNB +nME +cUf +iQq +hYH +upX +sqN +lPx +gVS +mnN aaa -aab aaa -aab aaa aaa aaa @@ -116855,16 +117238,16 @@ csC ygR eAw wcG -cUc +oyi pOC cQy cLi cZw -hgj +uyl iir bFC bFC -bFC +lmL bFC bFC bFC @@ -117114,10 +117497,10 @@ weq cLi jUM cZw -cZw +wXb rMq wQI -cZw +sEh mAq bFC jtw @@ -117628,12 +118011,12 @@ cNB cLi tmS cZw -bKD +cKe cLi cLi -tEU +uyl mAq -kkk +kyo rne bUv qlp @@ -117885,10 +118268,10 @@ cKK cKb cKb gSd -xSq +qWJ cNB rMq -tEU +uyl cUf bFC sOz @@ -118142,7 +118525,7 @@ cJx kNS cKb cUh -vVB +qod cUh cLi qrr @@ -118399,10 +118782,10 @@ tPe cJx cOr cZw -nVM -rNN -cRG -tfD +qWJ +tmS +gSd +uyl cUf xsP mLi @@ -118659,7 +119042,7 @@ cZw qWJ cNB cUh -cNB +adM hJN tdf uVX @@ -119689,8 +120072,8 @@ rgM cUj cVi cWy -iUF -cVk +uVt +cVo dtp dar cXP @@ -120202,7 +120585,7 @@ mcW rgM dsH mJT -mJT +mVd mJT cVs cJC @@ -120716,7 +121099,7 @@ mfv rgM dsK uVt -uVt +cWy uVt xHz uVt @@ -121233,13 +121616,13 @@ uVt dsY dta dtk -uVt -cXJ -uVt -uVt -uVt +omG +jeU +omG +omG +omG qLK -cYQ +rJr ruR tEq cRb @@ -121487,11 +121870,11 @@ exN rgM dsK uVt -dsY +nxt dtb dtl -uVt -cXJ +iUF +rIH cVj cSU cYQ diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index eba1a4522aac9..ea63ddadb28f7 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -199,7 +199,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/north) "abm" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/disposal/external/north) "abq" = ( @@ -476,14 +476,6 @@ icon_state = "bcircuit" }, /area/station/turret_protected/ai) -"acK" = ( -/obj/structure/closet, -/obj/effect/spawner/random/maintenance, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/disposal/northeast) "acM" = ( /obj/structure/cable{ d1 = 1; @@ -902,7 +894,7 @@ name = "External Airlock Access" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) "aeM" = ( @@ -1214,7 +1206,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel/white, /area/station/science/hallway) "ahF" = ( @@ -1490,7 +1482,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "ajq" = ( @@ -1971,7 +1963,7 @@ /turf/simulated/floor/plasteel, /area/station/security/prisonershuttle) "alX" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/restraints/handcuffs, /turf/simulated/floor/plating{ icon_state = "asteroidplating" @@ -2016,12 +2008,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/disposal/northeast) -"amu" = ( -/obj/machinery/conveyor/auto{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/disposal/northeast) "amw" = ( /obj/machinery/disposal/deliveryChute{ dir = 4 @@ -2038,6 +2024,10 @@ }, /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior/secondary) +"amB" = ( +/obj/structure/sign/radiation/rad_area, +/turf/simulated/wall, +/area/station/maintenance/fore) "amF" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -2336,12 +2326,6 @@ /obj/effect/spawner/random/storage, /turf/simulated/floor/plating, /area/station/maintenance/disposal/northeast) -"aoF" = ( -/obj/machinery/conveyor/auto{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/disposal/northeast) "aoH" = ( /obj/machinery/conveyor/auto/ccw{ dir = 9 @@ -2378,7 +2362,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -2503,6 +2487,11 @@ pixel_y = -28; name = "custom placement" }, +/obj/machinery/power/apc/directional/west, +/obj/structure/cable/orange{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/plating, /area/station/maintenance/disposal/northeast) "apz" = ( @@ -2638,7 +2627,7 @@ /obj/structure/sign/poster/contraband/kss13{ pixel_x = -32 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/disposal/northeast) "aqC" = ( @@ -2667,10 +2656,6 @@ /obj/effect/landmark/spawner/rev, /turf/simulated/floor/plating, /area/station/maintenance/disposal/northeast) -"aqT" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, -/turf/simulated/wall, -/area/station/maintenance/disposal/northeast) "aqY" = ( /obj/machinery/door/airlock/security/glass, /obj/effect/mapping_helpers/airlock/autoname, @@ -2812,7 +2797,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "arV" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/stack/ore/iron, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -2855,7 +2840,7 @@ /turf/simulated/wall/r_wall, /area/station/security/brig) "asi" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/port) "asq" = ( @@ -3004,6 +2989,25 @@ /obj/item/restraints/handcuffs, /turf/simulated/floor/plasteel, /area/station/security/prisonlockers) +"atv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating/asteroid/ancient, +/area/station/maintenance/fore) "atB" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, @@ -3021,7 +3025,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, -/area/station/maintenance/fore) +/area/station/maintenance/disposal/northeast) "atD" = ( /obj/structure/girder, /turf/simulated/floor/plating, @@ -3453,7 +3457,7 @@ /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fore2) "awd" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) "awg" = ( @@ -3578,7 +3582,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) "awQ" = ( @@ -3628,17 +3632,6 @@ }, /area/station/security/lobby) "axi" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/fore) -"axj" = ( /obj/structure/cable/orange{ d1 = 2; d2 = 8; @@ -3647,6 +3640,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -4134,7 +4130,7 @@ }, /area/station/telecomms/chamber) "aAT" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -4735,7 +4731,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -4750,7 +4746,7 @@ dir = 10; level = 2 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "aFt" = ( @@ -4760,8 +4756,8 @@ /obj/structure/window/reinforced/tinted{ dir = 8 }, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/freezer, /area/station/maintenance/gambling_den) "aFu" = ( @@ -4828,6 +4824,16 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/port) +"aGc" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/primary/central/north) "aGg" = ( /obj/machinery/light/small{ dir = 4 @@ -4863,7 +4869,7 @@ path_to_spawn = /mob/living/simple_animal/hostile/scarybat; total_amount = 20 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) "aGH" = ( @@ -5134,7 +5140,7 @@ pixel_x = -24; name = "west bump" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "darkyellow"; dir = 8 @@ -5209,7 +5215,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" @@ -5315,21 +5321,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/port/north) -"aKC" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/station/maintenance/fore) "aKI" = ( /obj/machinery/suit_storage_unit/security/secure, /obj/structure/window/reinforced{ @@ -5462,7 +5453,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/port) "aLH" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/starboard) "aLJ" = ( @@ -5774,20 +5765,6 @@ }, /turf/simulated/floor/carpet, /area/station/legal/lawoffice) -"aNP" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" - }, -/area/station/maintenance/fore) "aNQ" = ( /obj/structure/sign/poster/official/random{ pixel_x = -32 @@ -6085,7 +6062,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -6346,17 +6323,6 @@ icon_state = "darkredcorners" }, /area/station/security/prison/cell_block/A) -"aRc" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/fore) "aRd" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -6499,7 +6465,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -6695,19 +6661,6 @@ icon_state = "tranquillite" }, /area/station/service/mime) -"aTL" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" - }, -/area/station/maintenance/fore) "aTR" = ( /obj/machinery/computer/prisoner{ dir = 4 @@ -7585,6 +7538,11 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) "aZn" = ( @@ -7613,6 +7571,19 @@ }, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) +"aZp" = ( +/obj/structure/disposalpipe/segment{ + color = "#954535" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/primary/central/north) "aZt" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ id = "qm" @@ -7623,6 +7594,26 @@ "aZu" = ( /turf/simulated/floor/plating/asteroid/ancient/airless, /area/mine/unexplored/cere/medical) +"aZy" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK"; + pixel_x = 32 + }, +/obj/effect/spawner/random/dirt/often, +/turf/simulated/floor/plating, +/area/station/hallway/primary/fore/north) "aZF" = ( /turf/simulated/wall, /area/station/maintenance/port2) @@ -7678,20 +7669,6 @@ icon_state = "dark" }, /area/station/science/robotics) -"aZY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/binary/pump{ - dir = 1; - name = "Mix To Turbine" - }, -/obj/effect/spawner/random_spawners/dirt_frequent, -/turf/simulated/floor/plasteel{ - icon_state = "darkyellow"; - dir = 1 - }, -/area/station/engineering/atmos) "aZZ" = ( /turf/simulated/wall, /area/station/service/bar) @@ -7955,7 +7932,7 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) "bbw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /obj/effect/spawner/random/fungus/maybe, /turf/simulated/wall, /area/station/maintenance/disposal/south) @@ -8006,6 +7983,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) "bbV" = ( @@ -8016,6 +7998,11 @@ name = "External Airlock Access" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) "bca" = ( @@ -8095,7 +8082,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/southwest) "bcB" = ( @@ -8108,6 +8095,11 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -8439,6 +8431,11 @@ /area/station/maintenance/disposal/north) "beU" = ( /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -8573,7 +8570,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -8587,7 +8584,7 @@ }, /area/station/hallway/primary/fore/east) "bfF" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/computer/nonfunctional{ dir = 4 }, @@ -8694,6 +8691,11 @@ pixel_x = -32; pixel_y = -32 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/north) "bgl" = ( @@ -9536,7 +9538,7 @@ }, /area/station/service/hydroponics) "ble" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/public/vacant_office) "blg" = ( @@ -9639,6 +9641,11 @@ /obj/structure/disposalpipe/segment/corner{ dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -9866,6 +9873,23 @@ }, /turf/simulated/floor/plating, /area/station/engineering/control) +"bmG" = ( +/obj/machinery/door/airlock/engineering{ + name = "Power Transmission Laser" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "bmH" = ( /obj/structure/disposalpipe/segment/corner{ dir = 1 @@ -10363,7 +10387,7 @@ "bqf" = ( /obj/structure/table, /obj/item/analyzer, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "bqj" = ( @@ -10532,7 +10556,7 @@ /turf/simulated/floor/wood/nitrogen, /area/station/maintenance/abandonedbar) "bqK" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -10914,7 +10938,7 @@ }, /area/station/hallway/primary/starboard/south) "bss" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/apmaint) "bst" = ( @@ -11055,7 +11079,7 @@ }, /area/station/science/hallway) "bsU" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /obj/effect/spawner/random/fungus/maybe, /turf/simulated/wall, /area/station/maintenance/apmaint) @@ -11092,6 +11116,11 @@ /area/station/command/office/hop) "bto" = ( /obj/machinery/alarm/directional/east, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -11490,6 +11519,11 @@ /area/station/command/office/hop) "bve" = ( /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -11712,7 +11746,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/port) "bwi" = ( @@ -11788,6 +11822,11 @@ layer = 2.6; name = "Emergency Lockdown Blastdoor" }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/engineering/break_room/secondary) "bwx" = ( @@ -11845,7 +11884,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" @@ -12010,6 +12049,11 @@ "bxG" = ( /obj/structure/disposalpipe/segment, /obj/item/kirbyplants/plant22, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellowcorners" @@ -12288,6 +12332,11 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -12733,7 +12782,7 @@ /turf/simulated/floor/engine, /area/station/science/misc_lab) "bAt" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkredcorners" @@ -12902,6 +12951,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "bBH" = ( @@ -13023,6 +13077,11 @@ dir = 4; network = list("SS13","CE") }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -13045,7 +13104,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -14194,6 +14253,11 @@ d2 = 4; icon_state = "1-4" }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -14566,6 +14630,11 @@ /obj/item/storage/box/lights/mixed, /obj/item/storage/box/lights/mixed, /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -14595,6 +14664,11 @@ /area/station/hallway/primary/fore/north) "bID" = ( /obj/effect/spawner/window/reinforced, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plating, /area/station/engineering/break_room/secondary) "bIF" = ( @@ -14808,7 +14882,7 @@ }, /area/station/engineering/atmos) "bJH" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -14983,7 +15057,7 @@ /obj/machinery/computer/general_air_control{ dir = 4; name = "Tank Monitor"; - autolink_sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank") + autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) @@ -15103,7 +15177,7 @@ }, /area/station/security/armory/secure) "bLc" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -15243,7 +15317,7 @@ }, /area/station/security/armory/secure) "bLz" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/disposalpipe/segment/corner{ dir = 4 }, @@ -15343,7 +15417,7 @@ "bMh" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/binary/valve/open, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) "bMj" = ( @@ -15371,7 +15445,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -15495,7 +15569,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plating, /area/station/supply/miningdock) @@ -15947,8 +16021,8 @@ }, /area/station/hallway/primary/starboard/south) "bOY" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/dirt/frequent, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel{ icon_state = "darkbrown" }, @@ -16047,7 +16121,7 @@ /area/station/engineering/atmos) "bPz" = ( /obj/machinery/light, -/obj/machinery/suit_storage_unit/ce/secure, +/obj/machinery/suit_storage_unit/industrial/ce/secure, /obj/machinery/computer/guestpass{ pixel_x = -28; pixel_y = null @@ -16118,16 +16192,6 @@ dir = 8 }, /area/station/engineering/smes) -"bPF" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/station/engineering/smes) "bPG" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -16345,11 +16409,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -16646,21 +16705,21 @@ }, /area/station/engineering/smes) "bRK" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkyellow" }, /area/station/engineering/smes) "bRL" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "darkyellow" }, /area/station/engineering/smes) "bRM" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkyellow" @@ -16953,7 +17012,7 @@ /turf/simulated/floor/plating, /area/station/engineering/smes) "bTp" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/disposal/southwest) "bTy" = ( @@ -17576,7 +17635,7 @@ inlet_injector_autolink_id = "co2_in"; name = "Carbon Dioxide Supply Control"; outlet_vent_autolink_id = "co2_out"; - autolink_sensors = list("co2_sensor" = "Tank"); + autolink_sensors = list("co2_sensor"="Tank"); dir = 1 }, /obj/machinery/atmospherics/pipe/simple/visible/green{ @@ -17626,7 +17685,7 @@ pixel_x = 24; name = "east bump" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -17761,7 +17820,7 @@ inlet_injector_autolink_id = "waste_in"; name = "Gas Mix Tank Control"; outlet_vent_autolink_id = "waste_out"; - autolink_sensors = list("waste_sensor" = "Tank") + autolink_sensors = list("waste_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -18141,7 +18200,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/spawner/random/maintenance, /obj/item/paper/crumpled, /turf/simulated/floor/plasteel{ @@ -18400,6 +18459,25 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/supply/office) +"cac" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/orange{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/apc/directional/south, +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/turf/simulated/floor/plasteel{ + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "cag" = ( /obj/machinery/door/poddoor{ id_tag = "QMLoaddoor2"; @@ -18493,7 +18571,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "caX" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -18730,7 +18808,7 @@ dir = 4; color = "#954535" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/sign/custodian{ pixel_y = -32 }, @@ -19905,7 +19983,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "ckx" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "ckC" = ( @@ -20048,6 +20126,15 @@ }, /turf/simulated/floor/plating, /area/station/command/office/ce) +"clv" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "clB" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -20112,7 +20199,7 @@ /turf/simulated/floor/engine, /area/station/science/xenobiology) "clN" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/port) "clQ" = ( @@ -20246,16 +20333,6 @@ }, /turf/simulated/floor/plasteel, /area/station/science/storage) -"cmN" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" - }, -/area/station/maintenance/fore) "cmW" = ( /obj/machinery/status_display{ layer = 4 @@ -20467,21 +20544,6 @@ icon_state = "neutralfull" }, /area/station/turret_protected/aisat/interior) -"coU" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Central Asteroid Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_frequent, -/turf/simulated/floor/plating, -/area/station/maintenance/maintcentral) "coV" = ( /obj/structure/cable{ d1 = 1; @@ -20548,7 +20610,7 @@ /area/station/science/rnd) "cpo" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -20569,7 +20631,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -21193,7 +21255,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "cuJ" = ( @@ -21261,6 +21323,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -21367,8 +21434,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/southeast) "cvW" = ( @@ -21408,7 +21475,7 @@ /area/station/security/lobby) "cwk" = ( /obj/effect/landmark/spawner/nukedisc_respawn, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -21457,7 +21524,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -21693,7 +21760,7 @@ "cza" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -21802,6 +21869,11 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fore) "czC" = ( @@ -22189,6 +22261,9 @@ /mob/living/carbon/human/monkey, /turf/simulated/floor/engine, /area/station/science/test_chamber) +"cCu" = ( +/turf/simulated/mineral/ancient/outer, +/area/space) "cCw" = ( /turf/simulated/floor/engine, /area/station/science/test_chamber) @@ -23146,6 +23221,11 @@ /obj/structure/railing{ dir = 8 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/space, /area/station/hallway/spacebridge/comeng) "cHB" = ( @@ -23172,7 +23252,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -23242,6 +23322,19 @@ }, /turf/simulated/floor/grass/jungle, /area/station/hallway/secondary/garden) +"cIe" = ( +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/disposal/northeast) "cIg" = ( /obj/structure/chair/stool{ dir = 4 @@ -23659,6 +23752,10 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/supply/lobby) +"cJJ" = ( +/obj/structure/sign/electricshock, +/turf/simulated/mineral/ancient, +/area/station/maintenance/fore) "cJK" = ( /obj/structure/table, /turf/simulated/floor/mineral/titanium, @@ -24084,6 +24181,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/station/legal/magistrate) +"cMh" = ( +/obj/effect/spawner/random/fungus/probably, +/turf/simulated/wall, +/area/station/maintenance/disposal/northeast) "cMm" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -24149,7 +24250,7 @@ }, /area/station/maintenance/port) "cMH" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fore) "cMM" = ( @@ -24276,7 +24377,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "cNC" = ( @@ -24686,7 +24786,7 @@ /area/station/medical/virology) "cPw" = ( /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "cPz" = ( @@ -24800,6 +24900,12 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/starboard/south) +"cPS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "cPW" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -25117,11 +25223,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/storage) "cRo" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -25131,7 +25232,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/storage) "cRq" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/service/clown/secret) "cRs" = ( @@ -25276,10 +25377,6 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) -"cSk" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plating, -/area/station/hallway/primary/fore/north) "cSm" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -25534,7 +25631,7 @@ /turf/simulated/floor/plasteel, /area/station/security/prison/cell_block/A) "cTs" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/nitrogen, /area/station/maintenance/abandonedbar) "cTu" = ( @@ -25562,6 +25659,9 @@ }, /turf/simulated/floor/wood, /area/station/service/library) +"cTG" = ( +/turf/simulated/floor/plating/asteroid/ancient/airless, +/area/space) "cTH" = ( /obj/machinery/washing_machine, /turf/simulated/floor/plasteel, @@ -25639,27 +25739,37 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/yellow, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "cUj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "cUl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "cUm" = ( /obj/machinery/light/small{ dir = 8 }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, @@ -25668,6 +25778,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 5 }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -25677,6 +25792,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -25696,16 +25816,6 @@ }, /turf/simulated/floor/plasteel, /area/station/security/processing) -"cUr" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" - }, -/area/station/maintenance/maintcentral) "cUs" = ( /obj/structure/cable/orange{ d1 = 1; @@ -25724,14 +25834,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/turf/simulated/floor/plating, -/area/station/maintenance/storage) -"cUw" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/turf/simulated/floor/plating, +/area/station/maintenance/storage) +"cUw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -25778,11 +25888,6 @@ name = "Central Asteroid Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -26203,7 +26308,7 @@ /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/fore) "cVY" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -26598,7 +26703,7 @@ name = "Storefront Shutters Control"; pixel_x = 24 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -26942,6 +27047,17 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/station/security/permabrig) +"ddm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/station/hallway/primary/fore/north) "ddn" = ( /obj/structure/table/glass/reinforced, /obj/item/ashtray/bronze, @@ -27018,6 +27134,11 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "ddD" = ( @@ -27108,7 +27229,7 @@ inlet_injector_autolink_id = "n2_in"; name = "Nitrogen Supply Control"; outlet_vent_autolink_id = "n2_out"; - autolink_sensors = list("n2_sensor" = "Tank") + autolink_sensors = list("n2_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/structure/window/reinforced{ @@ -27181,7 +27302,7 @@ inlet_injector_autolink_id = "o2_in"; name = "Oxygen Supply Control"; outlet_vent_autolink_id = "o2_out"; - autolink_sensors = list("o2_sensor" = "Tank") + autolink_sensors = list("o2_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/structure/window/reinforced{ @@ -27333,7 +27454,7 @@ name = "Mixed Air Supply Control"; outlet_vent_autolink_id = "air_out"; outlet_setting = 2000; - autolink_sensors = list("air_sensor" = "Tank") + autolink_sensors = list("air_sensor"="Tank") }, /obj/structure/window/reinforced{ dir = 8 @@ -27381,7 +27502,7 @@ inlet_injector_autolink_id = "tox_in"; name = "Toxin Supply Control"; outlet_vent_autolink_id = "tox_out"; - autolink_sensors = list("tox_sensor" = "Tank") + autolink_sensors = list("tox_sensor"="Tank") }, /obj/structure/window/reinforced, /turf/simulated/floor/plasteel, @@ -27416,7 +27537,7 @@ inlet_injector_autolink_id = "n2o_in"; name = "Nitrous Oxide Supply Control"; outlet_vent_autolink_id = "n2o_out"; - autolink_sensors = list("n2o_sensor" = "Tank") + autolink_sensors = list("n2o_sensor"="Tank") }, /obj/structure/window/reinforced, /turf/simulated/floor/plasteel, @@ -27557,7 +27678,7 @@ /obj/structure/rack, /obj/item/clothing/gloves/fingerless, /obj/item/clothing/shoes/workboots/mining, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "dgq" = ( @@ -28036,7 +28157,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -28417,18 +28538,6 @@ icon_state = "white" }, /area/station/science/toxins/mixing) -"dmC" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance{ - name = "Command SMES Access" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/simulated/floor/plating, -/area/station/maintenance/fore) "dmK" = ( /obj/machinery/hydroponics/constructable{ desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; @@ -28442,7 +28551,7 @@ }, /area/station/security/permabrig) "dmR" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbrowncorners" @@ -28476,7 +28585,7 @@ /turf/simulated/wall, /area/station/hallway/primary/fore/north) "dnc" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -28597,7 +28706,7 @@ }, /area/station/maintenance/port) "dog" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/rack, /obj/item/stack/cable_coil, /obj/item/tank/internals/emergency_oxygen/engi, @@ -28647,7 +28756,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "doy" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -28744,7 +28853,7 @@ /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/fpmaint) "dpf" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -29259,7 +29368,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "dsc" = ( -/obj/structure/bookcase/random, +/obj/structure/bookcase{ + name = "bookcase (Reference)" + }, /turf/simulated/floor/wood, /area/station/service/library) "dsd" = ( @@ -29565,6 +29676,14 @@ icon_state = "redcorner" }, /area/station/hallway/primary/fore/west) +"dtN" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating/asteroid/ancient, +/area/station/maintenance/fore) "dtP" = ( /obj/machinery/light{ dir = 4 @@ -30166,6 +30285,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/item/radio/intercom{ + pixel_y = 28; + name = "custom placement" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" @@ -30251,16 +30374,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/radio/intercom{ - pixel_y = 28; - name = "custom placement" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" @@ -30290,31 +30414,6 @@ icon_state = "bluecorner" }, /area/station/hallway/primary/fore/north) -"dxx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "bluecorner" - }, -/area/station/hallway/primary/fore/north) "dxD" = ( /turf/simulated/wall, /area/station/security/detective) @@ -30329,7 +30428,7 @@ "dxJ" = ( /obj/structure/table, /obj/item/food/fried_vox, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel/freezer, /area/station/maintenance/starboard) "dxK" = ( @@ -30392,7 +30491,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -31227,6 +31326,10 @@ }, /turf/simulated/floor/plasteel/dark/telecomms, /area/station/science/server) +"dCr" = ( +/obj/structure/sign/engineering, +/turf/simulated/mineral/ancient, +/area/station/maintenance/fore) "dCt" = ( /obj/structure/cable/orange{ d1 = 4; @@ -31341,7 +31444,7 @@ /turf/simulated/wall, /area/station/hallway/primary/central/west) "dDB" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/disposal/west) "dDG" = ( @@ -31391,6 +31494,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -31412,6 +31520,18 @@ icon_state = "asteroidplating" }, /area/station/maintenance/port2) +"dEi" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkyellow" + }, +/area/station/engineering/smes) "dEm" = ( /obj/machinery/light/small, /turf/simulated/floor/plating{ @@ -31493,7 +31613,7 @@ /turf/space, /area/station/hallway/spacebridge/servsci) "dFD" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, @@ -31569,7 +31689,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/fore) "dGH" = ( @@ -31632,7 +31752,7 @@ /turf/simulated/wall, /area/station/maintenance/apmaint) "dHV" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/fsmaint) "dHZ" = ( @@ -31742,7 +31862,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "dJM" = ( @@ -31980,7 +32100,7 @@ pixel_y = 28; name = "custom placement" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "dMG" = ( @@ -32171,11 +32291,11 @@ }, /area/station/engineering/atmos) "dOC" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_starboard) "dPj" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) "dPq" = ( @@ -32222,7 +32342,7 @@ name = "Central Access" }, /obj/effect/turf_decal/stripes/line, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -32278,6 +32398,16 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -32357,7 +32487,7 @@ name = "Aft Asteroid Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -32434,6 +32564,21 @@ icon_state = "darkbrown" }, /area/station/public/quantum/cargo) +"dRN" = ( +/obj/machinery/door/airlock/engineering{ + name = "Power Transmission Laser" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "dRP" = ( /obj/machinery/door/window/brigdoor{ id = "Cell 8"; @@ -32464,6 +32609,14 @@ icon_state = "dark" }, /area/station/security/prison/cell_block/A) +"dRV" = ( +/obj/machinery/power/transmission_laser/north, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "dSl" = ( /obj/machinery/conveyor/east{ id = "QMLoad2" @@ -32509,6 +32662,11 @@ /obj/machinery/door/airlock/public/glass{ name = "Central Access" }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -32623,6 +32781,11 @@ /area/station/hallway/primary/fore/west) "dTd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -32648,6 +32811,11 @@ location = "CommandMiddle"; name = "navigation beacon (Command-Middle)" }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -32671,7 +32839,7 @@ /turf/simulated/floor/plating, /area/station/security/processing) "dUj" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -32731,11 +32899,11 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/fpmaint) "dUP" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/supply/storage) "dUR" = ( @@ -32747,7 +32915,7 @@ }, /area/station/hallway/spacebridge/dockmed) "dUZ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "dVe" = ( @@ -32849,6 +33017,11 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -32979,7 +33152,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "dZd" = ( @@ -32999,7 +33172,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 1; d2 = 4; @@ -33072,6 +33245,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "ebi" = ( @@ -33272,7 +33450,7 @@ }, /area/station/medical/morgue) "eeN" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating{ icon_state = "asteroidplating" @@ -33360,7 +33538,7 @@ name = "Morgue" }, /obj/effect/mapping_helpers/airlock/access/all/medical/morgue, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -33555,7 +33733,7 @@ /area/station/service/library) "eke" = ( /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -33611,7 +33789,7 @@ }, /area/station/medical/virology) "elI" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/light/small, /obj/effect/decal/cleanable/ash, /turf/simulated/floor/plating, @@ -33939,7 +34117,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) "erm" = ( @@ -33977,7 +34155,7 @@ }, /area/station/hallway/secondary/entry/west) "esJ" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -34298,7 +34476,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -34432,7 +34610,7 @@ }, /area/station/maintenance/port2) "eyx" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/mine/unexplored/cere/civilian) "eyA" = ( @@ -34521,7 +34699,7 @@ opacity = 0 }, /obj/effect/mapping_helpers/airlock/unres, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "ezI" = ( @@ -34621,7 +34799,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -34783,7 +34961,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "eDa" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -34806,7 +34984,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -34951,7 +35129,7 @@ /area/station/medical/medbay) "eFm" = ( /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/door/airlock/maintenance{ name = "Aft Asteroid Maintenance" }, @@ -34965,7 +35143,7 @@ /area/station/hallway/primary/central/north) "eFq" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -35021,7 +35199,7 @@ /obj/effect/mapping_helpers/airlock/access/all/science/tox, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -35037,6 +35215,19 @@ color = "#62416F" }, /area/station/public/quantum/science) +"eGK" = ( +/obj/effect/spawner/random/dirt/often, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door_control{ + id = "medeva"; + name = "Medical EVA shutter control"; + pixel_y = 24; + req_one_access = list(19,41) + }, +/turf/simulated/floor/plating, +/area/station/hallway/primary/starboard/south) "eGO" = ( /obj/structure/cable{ d1 = 4; @@ -35076,6 +35267,11 @@ c_tag = "Engineering Asteroid Hallway 5"; dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -35225,7 +35421,7 @@ }, /area/station/hallway/primary/port/north) "eIK" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -35479,7 +35675,7 @@ "eMb" = ( /obj/machinery/power/apc/directional/south, /obj/structure/cable/orange, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/gambling_den) "eMh" = ( @@ -35813,7 +36009,7 @@ dir = 4; color = "#954535" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -35992,6 +36188,22 @@ icon_state = "darkyellowfull" }, /area/station/engineering/break_room/secondary) +"eUJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/fore) "eUU" = ( /obj/structure/disposalpipe/junction{ dir = 1 @@ -36136,7 +36348,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/port) "eXo" = ( @@ -36151,7 +36363,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -36218,7 +36430,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/north) "eZB" = ( @@ -36230,7 +36442,7 @@ }, /area/station/engineering/atmos) "eZF" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -36292,7 +36504,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/nitrogen, /area/station/maintenance/abandonedbar) "fav" = ( @@ -36361,6 +36573,14 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) +"fce" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plating/asteroid/ancient, +/area/station/maintenance/fore) "fcm" = ( /obj/structure/chair/office/dark{ dir = 1 @@ -36535,7 +36755,7 @@ /obj/machinery/camera{ c_tag = "Supply Dock External"; dir = 5; - network = list("SS13", "QM") + network = list("SS13","QM") }, /turf/space, /area/space) @@ -36661,7 +36881,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/port) "fhE" = ( @@ -36743,7 +36963,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "fjm" = ( @@ -36871,7 +37091,7 @@ /turf/simulated/mineral/ancient/outer, /area/station/maintenance/electrical_shop) "flF" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/station/maintenance/fore) "flM" = ( @@ -36895,16 +37115,6 @@ icon_state = "solarpanel" }, /area/station/engineering/solar/aft_starboard) -"fms" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 5 - }, -/obj/effect/spawner/random_spawners/dirt_often, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/station/engineering/atmos) "fmy" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable/orange{ @@ -37024,6 +37234,25 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/port) +"foa" = ( +/obj/effect/spawner/random/dirt/often, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK"; + pixel_x = 32 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/station/hallway/primary/central/north) "fof" = ( /obj/machinery/door/airlock/external{ id_tag = "specops_home"; @@ -37093,7 +37322,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -37377,7 +37606,7 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) "ftZ" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -37458,7 +37687,7 @@ }, /area/station/maintenance/asmaint) "fuN" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/light/small{ dir = 1 }, @@ -37522,7 +37751,7 @@ name = "Aft Asteroid Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) "fvk" = ( @@ -37644,7 +37873,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "fxp" = ( @@ -37684,7 +37913,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "fxL" = ( @@ -37701,7 +37930,7 @@ /turf/simulated/floor/carpet/black, /area/station/command/bridge) "fyo" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/disposal/external/southeast) "fyN" = ( @@ -37714,6 +37943,11 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -37799,7 +38033,7 @@ /turf/simulated/floor/plasteel, /area/station/security/main) "fAx" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -37819,7 +38053,7 @@ }, /area/station/hallway/primary/port/north) "fAK" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/supply/miningdock) "fBa" = ( @@ -37841,7 +38075,7 @@ /area/station/hallway/primary/port/north) "fBr" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/door/airlock/maintenance/glass, /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plating, @@ -37893,7 +38127,7 @@ /turf/simulated/floor/wood, /area/station/service/library) "fCP" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/stack/ore/glass, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -37909,6 +38143,9 @@ }, /turf/simulated/floor/plating, /area/station/science/xenobiology) +"fDs" = ( +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "fDu" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/orange{ @@ -37948,7 +38185,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, @@ -37959,6 +38196,11 @@ /obj/structure/girder, /obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/hidden/yellow, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "fEn" = ( @@ -38182,7 +38424,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/security/range) "fHp" = ( @@ -38412,7 +38654,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -38421,7 +38663,7 @@ }, /area/station/hallway/primary/aft/west) "fLp" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -38443,7 +38685,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 1; d2 = 8; @@ -38811,8 +39053,8 @@ /turf/simulated/wall, /area/station/public/locker) "fQs" = ( -/obj/effect/landmark/burnturf, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/mech_bay_recharge_port, /turf/simulated/floor/plasteel{ dir = 10; @@ -38908,7 +39150,7 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) "fRI" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/closet/firecloset/full, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -39026,7 +39268,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, @@ -39071,6 +39313,11 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "fTR" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellow" @@ -39237,6 +39484,11 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "fWQ" = ( @@ -39384,9 +39636,13 @@ /area/station/public/arcade) "fYk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) +"fYw" = ( +/obj/structure/sign/radiation/rad_area, +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "fYy" = ( /obj/item/storage/bible, /obj/structure/table/wood/fancy/red, @@ -39420,11 +39676,6 @@ /turf/simulated/floor/plasteel, /area/station/security/lobby) "fYW" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -39465,7 +39716,7 @@ /area/station/supply/lobby) "fZC" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) "fZO" = ( @@ -39582,7 +39833,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "gbC" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port2) "gbF" = ( @@ -39803,7 +40054,7 @@ /area/station/hallway/secondary/exit) "geK" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/central/east) "gfb" = ( @@ -39868,20 +40119,6 @@ /obj/effect/spawner/window/reinforced/plasma/grilled, /turf/simulated/floor/plating, /area/station/science/toxins/mixing) -"ghk" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 32 - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, -/obj/effect/spawner/random_spawners/dirt_often, -/turf/simulated/floor/plating, -/area/station/hallway/primary/central/north) "ghv" = ( /obj/machinery/light{ dir = 1 @@ -40166,7 +40403,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "glQ" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/light/small{ dir = 4 }, @@ -40178,6 +40415,18 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/disposal) +"gmx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "gmy" = ( /obj/structure/sign/clown, /turf/simulated/wall, @@ -40191,7 +40440,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/apmaint) "gnh" = ( @@ -40204,6 +40453,20 @@ icon_state = "cafeteria" }, /area/station/supply/break_room) +"gnt" = ( +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "gnu" = ( /turf/simulated/mineral/ancient, /area/station/maintenance/disposal/west) @@ -40347,6 +40610,11 @@ /obj/structure/disposalpipe/segment/corner{ dir = 8 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -40355,7 +40623,7 @@ /obj/item/gun/projectile/automatic/toy/pistol, /obj/structure/rack, /obj/item/toy/sword, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/sign/poster/contraband/grey_tide{ pixel_y = 32 }, @@ -40404,7 +40672,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "gpZ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "gqQ" = ( @@ -40440,6 +40708,19 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/central/east) +"grh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/primary/fore/north) "grv" = ( /obj/machinery/light{ dir = 8 @@ -40532,7 +40813,7 @@ /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port2) "gtz" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -40557,7 +40838,7 @@ /area/station/hallway/primary/aft/west) "gtZ" = ( /obj/effect/spawner/random/fungus/probably, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/apmaint) "gub" = ( @@ -40646,18 +40927,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/fore/west) -"gvo" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" - }, -/area/station/maintenance/maintcentral) "gvC" = ( /obj/structure/railing{ dir = 8 @@ -40752,7 +41021,7 @@ /area/station/service/library) "gxa" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -40760,7 +41029,7 @@ /area/station/maintenance/port2) "gxk" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/central/west) "gxo" = ( @@ -40849,7 +41118,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_regular_floor = "yellowsiding"; icon_state = "tranquillite" @@ -40963,9 +41232,34 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fpmaint) +"gAg" = ( +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "bluecorner" + }, +/area/station/hallway/primary/fore/north) "gAh" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) "gAq" = ( @@ -40974,6 +41268,25 @@ icon_state = "bar" }, /area/station/service/theatre) +"gAr" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + color = "#954535" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/fore/north) "gAv" = ( /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/plating{ @@ -41340,7 +41653,7 @@ /area/station/hallway/spacebridge/scidock) "gGb" = ( /obj/machinery/light/small, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -41360,12 +41673,26 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/light{ dir = 8 }, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) +"gGz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "gGB" = ( /turf/simulated/mineral/ancient/outer, /area/station/public/sleep/secondary) @@ -41385,6 +41712,11 @@ icon_state = "whitepurplecorner" }, /area/station/science/test_chamber) +"gGQ" = ( +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/disposal/northeast) "gGU" = ( /obj/machinery/mineral/stacking_unit_console{ pixel_x = 32; @@ -41636,7 +41968,7 @@ }, /area/station/medical/surgery/secondary) "gLg" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -41676,7 +42008,7 @@ pixel_x = -32; random_basetype = /obj/structure/sign/poster/official }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/chair/stool, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/west) @@ -41700,7 +42032,7 @@ }, /area/station/public/sleep/secondary) "gLG" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, @@ -41910,11 +42242,11 @@ }, /area/station/command/vault) "gOh" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/public/storefront) "gOm" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/rack, /obj/item/pen, /turf/simulated/floor/plating, @@ -42027,6 +42359,11 @@ dir = 5; level = 2 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "gPT" = ( @@ -42115,7 +42452,7 @@ }, /area/station/hallway/primary/port/north) "gSN" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/port) "gSP" = ( @@ -42161,7 +42498,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/southeast) "gTe" = ( @@ -42318,6 +42655,11 @@ pixel_x = -28; name = "custom placement" }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42410,7 +42752,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 }, @@ -42834,7 +43176,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -43042,7 +43384,7 @@ /turf/simulated/floor/wood, /area/station/command/office/ntrep) "hhV" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/flashlight/seclite, /obj/structure/table, /turf/simulated/floor/plating, @@ -43141,7 +43483,7 @@ }, /area/station/science/test_chamber) "hjp" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "escape" @@ -43184,6 +43526,11 @@ pixel_x = -28; name = "custom placement" }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -43422,7 +43769,7 @@ /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior/secondary) "hnP" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -43777,7 +44124,7 @@ /turf/simulated/floor/carpet/royalblack, /area/station/service/bar) "htz" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "darkgreenfull" }, @@ -43913,7 +44260,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -44117,7 +44464,7 @@ }, /area/station/science/robotics) "hxE" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/maintcentral) "hxM" = ( @@ -44445,6 +44792,18 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/west) +"hDc" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance{ + name = "Command SMES Access" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/simulated/floor/plating, +/area/station/hallway/primary/fore/north) "hDf" = ( /obj/item/kirbyplants/plant25, /turf/simulated/floor/plasteel{ @@ -44503,7 +44862,7 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/aft/west) "hDB" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/mirror{ icon_state = "mirror_broke"; pixel_y = 28 @@ -44583,7 +44942,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/apmaint) "hEQ" = ( @@ -44593,10 +44952,37 @@ }, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/west) +"hES" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/spawner/random/dirt/often, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/hallway/primary/central/north) "hEU" = ( /obj/structure/closet/firecloset/full, /turf/simulated/floor/plating/asteroid/ancient, /area/station/hallway/primary/fore/west) +"hEZ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "hFb" = ( /obj/structure/cable{ d1 = 4; @@ -44764,7 +45150,7 @@ dir = 5; level = 2 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) "hHD" = ( @@ -44808,7 +45194,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/service/hydroponics, /obj/effect/mapping_helpers/airlock/access/any/service/kitchen, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/port2) "hIa" = ( @@ -44888,15 +45274,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/turbine) "hIC" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -45159,6 +45540,15 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/port2) +"hLv" = ( +/obj/machinery/conveyor/auto{ + dir = 1 + }, +/obj/machinery/conveyor/auto{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/disposal/northeast) "hLx" = ( /obj/effect/spawner/random/fungus/maybe, /turf/simulated/wall, @@ -45218,7 +45608,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "hMW" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/chair/wood, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -45256,7 +45646,7 @@ }, /area/station/service/hydroponics) "hNo" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/scalpel, /turf/simulated/floor/plasteel/freezer, /area/station/maintenance/starboard) @@ -45293,7 +45683,7 @@ /turf/simulated/floor/plasteel, /area/station/public/quantum/service) "hNJ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/kitchenspike, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -45346,7 +45736,7 @@ /turf/simulated/floor/wood, /area/station/service/theatre) "hOG" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -45400,7 +45790,7 @@ /area/station/service/hydroponics) "hPj" = ( /obj/effect/turf_decal/stripes/line, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/southeast) "hPp" = ( @@ -45506,7 +45896,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "darkyellow"; dir = 1 @@ -45528,7 +45918,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 1; d2 = 4; @@ -45677,21 +46067,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "escape" }, /area/station/hallway/secondary/exit) -"hRN" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/station/maintenance/maintcentral) "hRO" = ( /obj/machinery/light{ dir = 1 @@ -45839,7 +46220,7 @@ /area/station/turret_protected/aisat/interior/secondary) "hTT" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -46071,6 +46452,12 @@ icon_state = "darkpurple" }, /area/station/science/robotics) +"hXG" = ( +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "hYb" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -46106,7 +46493,7 @@ /obj/item/clothing/head/cone, /obj/item/clothing/head/cone, /obj/item/clothing/head/cone, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "hYu" = ( @@ -46145,7 +46532,7 @@ }, /area/station/public/sleep/secondary) "hYH" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/spawner/grouped_spawner{ group_id = "tunnelbats"; max_per_spawner = 1; @@ -46158,10 +46545,13 @@ }, /area/station/maintenance/apmaint) "hYI" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) +"hYQ" = ( +/turf/simulated/mineral/ancient/outer, +/area/station/maintenance/fore) "hYW" = ( /turf/simulated/mineral/ancient, /area/station/medical/paramedic) @@ -46267,7 +46657,7 @@ }, /area/station/service/chapel/office) "hZS" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/grille/broken, /obj/item/stack/rods, /turf/simulated/floor/plating, @@ -46621,6 +47011,7 @@ /area/station/service/mime) "ieC" = ( /obj/machinery/atmospherics/pipe/simple/visible, +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "ieJ" = ( @@ -46737,7 +47128,7 @@ /area/station/engineering/solar/aft) "igx" = ( /obj/machinery/optable, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/toy/plushie/robo_corgi, /turf/simulated/floor/plasteel{ icon_state = "darkpurple" @@ -46763,7 +47154,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/fpmaint) "ihn" = ( @@ -46849,6 +47240,11 @@ pixel_x = 1; pixel_y = 5 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -47013,21 +47409,6 @@ /obj/item/gavelhammer, /turf/simulated/floor/carpet, /area/station/legal/courtroom) -"ilj" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 32 - }, -/obj/effect/spawner/random_spawners/dirt_often, -/turf/simulated/floor/plating, -/area/station/hallway/primary/fore/north) "ilR" = ( /obj/docking_port/stationary/whiteship{ dir = 8; @@ -47088,7 +47469,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/fpmaint) "imr" = ( @@ -47150,7 +47531,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/central/east) "imO" = ( @@ -47291,6 +47672,11 @@ /turf/simulated/floor/plating, /area/station/command/office/hop) "iow" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) "iox" = ( @@ -47308,7 +47694,7 @@ }, /area/station/security/checkpoint/secondary) "ioJ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/hallway/primary/fore/west) "ipn" = ( @@ -47634,14 +48020,14 @@ }, /area/station/hallway/primary/fore/west) "irS" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, /area/station/maintenance/starboard) "irU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -47690,7 +48076,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -47703,6 +48089,25 @@ icon_state = "cafeteria" }, /area/station/medical/break_room) +"isQ" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/binary/pump{ + dir = 1; + name = "Mix To Turbine" + }, +/obj/effect/spawner/random/dirt/frequent, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellow"; + dir = 1 + }, +/area/station/engineering/atmos) "itf" = ( /turf/simulated/mineral/ancient, /area/station/maintenance/starboard) @@ -47757,7 +48162,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/north) "iuC" = ( @@ -47765,9 +48170,13 @@ name = "Central Asteroid Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) +"iuD" = ( +/obj/effect/mapping_helpers/turfs/rust, +/turf/simulated/floor/plating, +/area/station/maintenance/disposal/northeast) "iuE" = ( /obj/structure/cable{ d1 = 1; @@ -48099,7 +48508,7 @@ name = "External Airlock Access" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/port2) "iyK" = ( @@ -48126,7 +48535,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -48404,7 +48813,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -48439,6 +48848,27 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating/airless, /area/station/maintenance/disposal/external/north) +"iDF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/fore) +"iDW" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plating/asteroid/ancient, +/area/station/maintenance/fore) "iDY" = ( /obj/machinery/economy/vending/bardrobe, /obj/structure/sign/poster/contraband/random{ @@ -48580,6 +49010,11 @@ /area/station/hallway/primary/port/north) "iFR" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "iFS" = ( @@ -48673,6 +49108,11 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "iGX" = ( @@ -48739,6 +49179,14 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/fore/north) +"iIH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/station/maintenance/port2) "iIK" = ( /turf/simulated/wall, /area/station/supply/qm) @@ -48750,7 +49198,6 @@ }, /area/station/medical/storage/secondary) "iIS" = ( -/obj/item/trash/spentcasing/bullet, /obj/effect/decal/cleanable/blood/splatter, /turf/simulated/floor/plating{ icon_state = "asteroidplating" @@ -48866,10 +49313,19 @@ }, /area/station/hallway/primary/fore/east) "iJM" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard) +"iJS" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "iJY" = ( /obj/machinery/light_switch{ dir = 4; @@ -49173,7 +49629,7 @@ /area/station/hallway/primary/aft/east) "iON" = ( /obj/structure/closet, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkbrown" @@ -49195,7 +49651,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/station/maintenance/fore) +/area/station/maintenance/disposal/northeast) "iOU" = ( /obj/structure/table/wood, /obj/effect/spawner/random/maintenance, @@ -49208,6 +49664,19 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/central/north) +"iPd" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Fore Asteroid Maintenance Access" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/spawner/random/dirt/frequent, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/station/hallway/primary/fore/north) "iPe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -49432,7 +49901,7 @@ }, /area/station/hallway/secondary/entry/west) "iSn" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/mine/unexplored/cere/medical) "iSo" = ( @@ -49589,9 +50058,9 @@ }, /area/station/security/detective) "iTu" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, -/obj/effect/spawner/random_spawners/wall_rusted_always, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, +/obj/effect/mapping_helpers/turfs/rust, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/apmaint) "iTx" = ( @@ -49742,6 +50211,22 @@ icon_state = "dark" }, /area/station/service/chapel/office) +"iVV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "iWe" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -49904,7 +50389,7 @@ /turf/simulated/floor/plating, /area/station/science/storage) "iYg" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/station/maintenance/disposal/westalt) "iYi" = ( @@ -49938,7 +50423,7 @@ }, /area/station/hallway/primary/port/south) "iYL" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -50125,7 +50610,7 @@ }, /area/station/hallway/primary/fore/west) "jas" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/door/airlock/maintenance{ name = "Storefront Access" @@ -50163,7 +50648,7 @@ /obj/machinery/camera{ c_tag = "Cargo Delivery Office"; dir = 4; - network = list("SS13", "QM") + network = list("SS13","QM") }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -50267,7 +50752,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -50547,7 +51032,7 @@ /turf/simulated/mineral/ancient, /area/mine/unexplored/cere/orbiting) "jfS" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/closet/firecloset/full, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -50699,7 +51184,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) "jis" = ( @@ -50948,7 +51433,7 @@ pixel_x = -28; name = "custom placement" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/public/vacant_office) "jmh" = ( @@ -50971,7 +51456,7 @@ /area/station/maintenance/apmaint) "jmO" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -51220,6 +51705,18 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) +"jpD" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "jpH" = ( /obj/structure/table, /obj/structure/sign/electricshock{ @@ -51325,9 +51822,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -51336,6 +51830,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -51445,7 +51942,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) "jsB" = ( @@ -51506,7 +52003,7 @@ /area/station/supply/sorting) "jti" = ( /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -51610,6 +52107,11 @@ /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -51665,7 +52167,7 @@ }, /area/station/hallway/spacebridge/dockmed) "jvd" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -51696,7 +52198,7 @@ }, /area/station/hallway/secondary/exit) "jvu" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/table_frame/wood, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -51997,7 +52499,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -52084,7 +52586,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/extinguisher, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -52153,6 +52655,11 @@ dir = 9; level = 2 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "jAg" = ( @@ -52200,7 +52707,7 @@ "jAx" = ( /obj/effect/spawner/random/maintenance, /obj/structure/table, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/robotanalyzer, /turf/simulated/floor/plating, /area/station/maintenance/electrical_shop) @@ -52254,7 +52761,7 @@ /area/station/hallway/spacebridge/engmed) "jBh" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/starboard) "jBk" = ( @@ -52459,7 +52966,7 @@ /area/station/maintenance/port2) "jDw" = ( /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -52529,7 +53036,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -52549,7 +53056,7 @@ }, /area/station/hallway/primary/aft/west) "jED" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -52917,6 +53424,14 @@ icon_state = "redcorner" }, /area/station/hallway/secondary/entry/west) +"jJo" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "jJr" = ( /obj/structure/window/reinforced{ dir = 8 @@ -53001,7 +53516,7 @@ /obj/machinery/door/airlock/maintenance{ name = "Starboard Asteroid Maintenance Access" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "jKO" = ( @@ -53027,7 +53542,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -53222,7 +53737,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -53271,7 +53786,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/visible, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) "jPu" = ( @@ -53282,6 +53797,16 @@ icon_state = "asteroidplating" }, /area/station/maintenance/starboard) +"jPy" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/fore) "jPD" = ( /obj/structure/cable/orange{ d1 = 2; @@ -53773,6 +54298,22 @@ }, /turf/simulated/floor/plasteel/freezer, /area/station/public/locker) +"jVu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "browncorner" + }, +/area/station/engineering/transmission_laser) "jVB" = ( /obj/machinery/light, /obj/structure/cable{ @@ -53917,7 +54458,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 1; d2 = 4; @@ -53940,6 +54481,11 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "jZw" = ( @@ -54014,6 +54560,17 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/port2) +"kab" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/catwalk, +/area/station/engineering/transmission_laser) "kad" = ( /obj/effect/decal/cleanable/blood/tracks/mapped{ dir = 10 @@ -54501,14 +55058,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/secondary/entry/north) -"khM" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/maintcentral) "khN" = ( /obj/structure/cable/orange{ d1 = 1; @@ -54579,6 +55128,15 @@ }, /turf/simulated/floor/carpet/green, /area/station/service/library) +"kiG" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/mapping_helpers/turfs/rust, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "kjb" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -54660,7 +55218,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "kkD" = ( @@ -54688,6 +55246,11 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "klh" = ( @@ -54920,7 +55483,7 @@ /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "kol" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/stack/rods/ten, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -54997,7 +55560,6 @@ /area/station/maintenance/asmaint) "kpK" = ( /obj/effect/decal/cleanable/blood/drip, -/obj/item/trash/spentcasing/bullet, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -55038,7 +55600,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -55156,6 +55718,21 @@ "ksl" = ( /turf/simulated/floor/carpet, /area/station/public/locker) +"ksq" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Fore Asteroid Maintenance Access" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/spawner/random/dirt/frequent, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/station/hallway/primary/fore/north) "ksv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -55204,6 +55781,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "ksR" = ( @@ -55410,6 +55992,19 @@ }, /turf/simulated/wall, /area/station/public/quantum/security) +"kvL" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/fore) "kvU" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -55445,7 +56040,7 @@ /area/station/maintenance/apmaint) "kwq" = ( /obj/structure/chair/stool/bar, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "kwu" = ( @@ -55641,6 +56236,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 5 }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "kyQ" = ( @@ -55668,7 +56268,7 @@ }, /area/station/science/xenobiology) "kzf" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/storage) "kzh" = ( @@ -55682,6 +56282,23 @@ "kzq" = ( /turf/simulated/floor/wood, /area/station/maintenance/asmaint) +"kzw" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/spawner/random/dirt/often, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "kzK" = ( /obj/effect/spawner/random/fungus/maybe, /turf/simulated/wall, @@ -56247,6 +56864,11 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "kKp" = ( @@ -56551,7 +57173,7 @@ /obj/machinery/door/airlock/engineering{ name = "Science Asteroid Substation" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "kOk" = ( @@ -56614,14 +57236,6 @@ }, /turf/simulated/floor/plasteel/freezer, /area/station/service/kitchen) -"kPs" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Fore Asteroid Maintenance Access" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/spawner/random_spawners/dirt_frequent, -/turf/simulated/floor/plating, -/area/station/maintenance/fore) "kPx" = ( /obj/item/kirbyplants/plant21, /turf/simulated/floor/wood, @@ -56985,7 +57599,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -57060,12 +57674,16 @@ }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) +"kUW" = ( +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/engineering/transmission_laser) "kVh" = ( /obj/structure/chair/sofa/right{ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "kVq" = ( @@ -57228,7 +57846,7 @@ /obj/machinery/camera{ c_tag = "Cargo Bay Storage"; dir = 8; - network = list("SS13", "QM") + network = list("SS13","QM") }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -57315,7 +57933,7 @@ }, /area/station/supply/lobby) "kZs" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/disposal/east) "kZw" = ( @@ -57371,7 +57989,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) @@ -57429,7 +58047,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -57440,6 +58058,11 @@ icon_state = "redcorner" }, /area/station/hallway/primary/fore/west) +"lbU" = ( +/obj/effect/mapping_helpers/turfs/rust, +/obj/effect/spawner/random/dirt/often, +/turf/simulated/wall/r_wall, +/area/station/maintenance/fore) "lca" = ( /obj/structure/chair{ dir = 4 @@ -57561,7 +58184,7 @@ }, /area/station/science/toxins/launch) "ldR" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /obj/structure/sign/poster/contraband/random, /turf/simulated/wall, /area/station/maintenance/electrical_shop) @@ -57649,6 +58272,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -57703,7 +58331,7 @@ }, /area/station/supply/break_room) "lgd" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -57844,7 +58472,7 @@ /turf/space, /area/space/nearstation) "lif" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/flashlight/lantern, /obj/effect/turf_decal/box, /turf/simulated/floor/plating, @@ -58009,7 +58637,7 @@ name = "Quarantine Lockdown"; opacity = 0 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "ljP" = ( @@ -58250,7 +58878,7 @@ }, /area/station/service/chapel/office) "lmt" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -58434,7 +59062,7 @@ /area/station/medical/medbay) "lnJ" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "lnN" = ( @@ -58620,7 +59248,7 @@ }, /area/station/hallway/primary/starboard/south) "lrS" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/mine/unexplored/cere/engineering) "lrW" = ( @@ -58709,6 +59337,19 @@ icon_state = "red" }, /area/station/hallway/secondary/exit) +"ltw" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/item/assembly/mousetrap/armed, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/fore) "ltP" = ( /obj/machinery/door/firedoor, /obj/structure/cable/orange{ @@ -58793,7 +59434,7 @@ /turf/simulated/floor/carpet/royalblack, /area/station/service/bar) "luZ" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/disposalpipe/segment/corner{ dir = 1 }, @@ -58863,6 +59504,21 @@ icon_state = "dark" }, /area/station/maintenance/electrical_shop) +"lvG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/firealarm/directional/west, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "lvL" = ( /obj/structure/cable/orange{ d2 = 2; @@ -59132,11 +59788,6 @@ icon_state = "4-8" }, /obj/machinery/firealarm/directional/north, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -59235,7 +59886,7 @@ /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior/secondary) "lzz" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -59295,6 +59946,11 @@ dir = 10 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "lAi" = ( @@ -59481,7 +60137,7 @@ }, /area/station/hallway/primary/port/south) "lEv" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -59654,7 +60310,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "lGj" = ( @@ -59791,7 +60447,7 @@ /turf/simulated/floor/plasteel, /area/station/service/janitor) "lJm" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/decal/cleanable/cobweb2, /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -59806,7 +60462,7 @@ /area/station/hallway/primary/starboard/south) "lJE" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "lJM" = ( @@ -59903,7 +60559,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -59952,7 +60608,7 @@ }, /area/station/service/chapel) "lMN" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/disposal) "lMW" = ( @@ -59988,6 +60644,11 @@ /area/station/supply/storage) "lNw" = ( /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -60024,7 +60685,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port2) "lOy" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -60081,6 +60742,11 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = 32 }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -60160,6 +60826,11 @@ }, /area/station/hallway/spacebridge/sercom) "lQT" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -60192,7 +60863,7 @@ }, /area/station/maintenance/port) "lRc" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/clothing/suit/chef/classic, /obj/item/clothing/head/chefhat, /obj/effect/decal/cleanable/dirt, @@ -60225,7 +60896,7 @@ dir = 4; pixel_y = -8 }, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/port2) "lRI" = ( @@ -60254,7 +60925,7 @@ }, /area/station/security/permabrig) "lRL" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/trash/cheesie, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -60337,6 +61008,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) "lSE" = ( @@ -60437,7 +61113,7 @@ }, /area/station/maintenance/electrical_shop) "lTP" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -60590,6 +61266,12 @@ icon_state = "cafeteria" }, /area/station/service/kitchen) +"lVz" = ( +/obj/structure/bookcase{ + name = "bookcase (Religious)" + }, +/turf/simulated/floor/wood, +/area/station/service/library) "lVB" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -60629,7 +61311,7 @@ }, /area/station/hallway/primary/port/north) "lVV" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/port) "lVX" = ( @@ -60827,7 +61509,7 @@ /turf/simulated/floor/plasteel, /area/station/public/fitness) "lZH" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/camera{ c_tag = "Cargo Hallway" }, @@ -61055,7 +61737,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "mcB" = ( @@ -61109,7 +61791,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "mdl" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "mdm" = ( @@ -61281,16 +61963,9 @@ /area/station/service/bar) "mfS" = ( /obj/effect/decal/cleanable/blood/tracks/mapped, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port) -"mgq" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel{ - icon_state = "darkgreenfull" - }, -/area/station/service/hydroponics) "mgu" = ( /obj/docking_port/stationary{ dir = 4; @@ -61765,22 +62440,6 @@ icon_state = "neutralfull" }, /area/station/hallway/spacebridge/scidock) -"mnU" = ( -/obj/machinery/driver_button{ - id_tag = "trash"; - pixel_x = 24; - pixel_y = -8 - }, -/obj/machinery/door_control{ - id = "Disposal Exit"; - name = "Dispossal Vent Control"; - pixel_x = 24; - pixel_y = 8; - req_access = list(12) - }, -/obj/effect/spawner/random_spawners/dirt_frequent, -/turf/simulated/floor/plating, -/area/station/maintenance/disposal) "mob" = ( /obj/structure/grille/broken, /obj/structure/cable/orange{ @@ -61808,7 +62467,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/southwest) "moQ" = ( @@ -62031,7 +62690,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) "mrt" = ( @@ -62055,6 +62714,17 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/supply/lobby) +"mrS" = ( +/obj/machinery/camera{ + c_tag = "AI Satellite Service Bay"; + dir = 8; + network = list("SS13","MiniSat") + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "mrU" = ( /obj/structure/closet/secure_closet/miner, /obj/machinery/light_switch{ @@ -62085,7 +62755,7 @@ /obj/machinery/floodlight{ light_power = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "msv" = ( @@ -62106,7 +62776,7 @@ name = "Storefront Shutters Control"; pixel_x = 24 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -62190,7 +62860,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -62331,7 +63001,7 @@ }, /area/station/turret_protected/aisat/interior) "mvD" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /obj/effect/spawner/random/fungus/maybe, /turf/simulated/wall, /area/station/maintenance/apmaint) @@ -62406,7 +63076,7 @@ /obj/machinery/atmospherics/binary/valve/open{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) "mws" = ( @@ -62434,7 +63104,7 @@ pixel_x = -28 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/port) "mwy" = ( @@ -62620,7 +63290,7 @@ /area/station/security/permabrig) "mAb" = ( /obj/machinery/light/small, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/freezer, /area/station/maintenance/gambling_den) "mAc" = ( @@ -62671,11 +63341,11 @@ d2 = 4; icon_state = "0-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/fpmaint) "mAq" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "mAH" = ( @@ -62911,6 +63581,7 @@ name = "south bump"; pixel_y = -28 }, +/obj/structure/bookcase/random, /turf/simulated/floor/wood, /area/station/service/library) "mEc" = ( @@ -62939,8 +63610,8 @@ /turf/simulated/wall, /area/station/maintenance/port2) "mEr" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/dirt/frequent, +/obj/effect/spawner/random/blood/often, /obj/machinery/alarm/directional/east, /turf/simulated/floor/plating, /area/station/public/storefront) @@ -62962,7 +63633,7 @@ }, /area/station/engineering/control) "mFJ" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -62972,7 +63643,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/station/security/range) "mFM" = ( @@ -63113,7 +63784,7 @@ name = "Bathroom" }, /obj/machinery/door/firedoor, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "mHH" = ( @@ -63178,7 +63849,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -63298,7 +63969,7 @@ }, /area/station/medical/chemistry) "mKo" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -63315,6 +63986,12 @@ }, /turf/simulated/floor/wood, /area/station/service/library) +"mKF" = ( +/obj/structure/bookcase{ + name = "bookcase (Romance)" + }, +/turf/simulated/floor/wood, +/area/station/service/library) "mKI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63345,6 +64022,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -63406,7 +64088,7 @@ }, /area/station/maintenance/starboard) "mMx" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -63437,7 +64119,7 @@ }, /area/station/turret_protected/ai_upload) "mNd" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "mNi" = ( @@ -63528,6 +64210,11 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "mOA" = ( @@ -63559,7 +64246,7 @@ /obj/structure/chair/stool{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port2) "mOX" = ( @@ -63854,7 +64541,7 @@ /turf/simulated/floor/plasteel, /area/station/command/office/ce) "mTc" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/port2) "mTo" = ( @@ -63901,7 +64588,7 @@ "mTK" = ( /obj/machinery/optable, /obj/effect/landmark/spawner/nukedisc_respawn, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -63912,7 +64599,7 @@ /turf/simulated/floor/wood, /area/station/public/vacant_office) "mTO" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/spawner/grouped_spawner{ group_id = "tunnelbats"; max_per_spawner = 1; @@ -63944,7 +64631,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/central/west) "mTR" = ( @@ -63979,7 +64666,7 @@ name = "EXTERNAL AIRLOCK"; pixel_x = -32 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) @@ -64014,7 +64701,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -64088,11 +64775,6 @@ }, /area/station/maintenance/port) "mVp" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, @@ -64140,7 +64822,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/supply/miningdock) "mWC" = ( @@ -64251,7 +64933,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -64344,7 +65026,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/north) "mZr" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -64450,7 +65132,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/fore) "nbl" = ( @@ -64495,6 +65177,20 @@ "ncn" = ( /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/port2) +"ncz" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "browncorner"; + dir = 1 + }, +/area/station/engineering/transmission_laser) "ncE" = ( /obj/machinery/conveyor/auto{ dir = 4 @@ -64682,7 +65378,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -64798,7 +65494,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "nhx" = ( @@ -65121,6 +65817,20 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/carpet/royalblack, /area/station/service/bar) +"nnR" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/disposal/northeast) "nnX" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ @@ -65156,7 +65866,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; @@ -65189,7 +65899,7 @@ dir = 4; color = "#954535" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/west) "noS" = ( @@ -65476,7 +66186,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_starboard) "ntW" = ( @@ -65644,7 +66354,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "nvU" = ( @@ -65876,7 +66586,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "nyX" = ( @@ -65919,6 +66629,19 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/station/security/warden) +"nAM" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Command SMES Access" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/spawner/random/dirt/frequent, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "nAT" = ( /obj/structure/closet/wardrobe/xenos, /turf/simulated/floor/mineral/titanium/blue, @@ -66153,7 +66876,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -66286,16 +67009,6 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/port/north) -"nGZ" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/effect/spawner/random_spawners/dirt_frequent, -/turf/simulated/floor/plating, -/area/station/engineering/atmos) "nHh" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -66346,13 +67059,6 @@ /obj/machinery/atmospherics/portable/canister/air, /turf/simulated/floor/plating, /area/station/maintenance/port) -"nHR" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/station/maintenance/fore) "nIh" = ( /obj/structure/chair/sofa/corp/right, /turf/simulated/floor/plasteel, @@ -66383,6 +67089,10 @@ }, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/apmaint) +"nIW" = ( +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plasteel, +/area/station/hallway/spacebridge/scidock) "nIZ" = ( /obj/effect/mapping_helpers/airlock/access/all/science/tox, /obj/machinery/door/airlock/research, @@ -66442,7 +67152,7 @@ /area/station/security/brig) "nJX" = ( /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 2; d2 = 4; @@ -66505,7 +67215,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/north) "nKD" = ( @@ -66641,7 +67351,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/disposalpipe/segment/corner, /turf/simulated/floor/plasteel, /area/station/public/locker) @@ -66975,7 +67685,7 @@ }, /area/station/public/quantum/security) "nRz" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "nRO" = ( @@ -67075,7 +67785,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -67090,7 +67800,7 @@ }, /area/station/science/toxins/launch) "nUg" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) "nUh" = ( @@ -67141,7 +67851,7 @@ }, /area/station/hallway/primary/port/south) "nUR" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -67186,6 +67896,14 @@ "nVW" = ( /turf/simulated/mineral/ancient, /area/station/maintenance/maintcentral) +"nWh" = ( +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/disposal/northeast) "nWj" = ( /obj/structure/cable{ d1 = 2; @@ -67249,7 +67967,7 @@ }, /area/station/security/permabrig) "nWX" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -67318,7 +68036,7 @@ /turf/simulated/floor/plating, /area/station/security/warden) "nYM" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -67446,7 +68164,7 @@ /turf/simulated/floor/plasteel/white, /area/station/maintenance/apmaint) "oaE" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/light/small{ dir = 4 }, @@ -67513,7 +68231,7 @@ }, /area/station/engineering/break_room/secondary) "obE" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/disposalpipe/segment/corner{ dir = 8 }, @@ -67599,7 +68317,7 @@ pixel_x = -3; pixel_y = 5 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/aft/west) "odu" = ( @@ -67873,16 +68591,15 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, /area/station/engineering/control) -"ohJ" = ( -/obj/item/trash/spentcasing/bullet, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" - }, -/area/station/maintenance/port) "ohL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -68110,7 +68827,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -68341,7 +69058,7 @@ /obj/effect/decal/cleanable/blood/tracks/mapped{ dir = 10 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port) "onO" = ( @@ -68533,7 +69250,7 @@ "opD" = ( /obj/machinery/kitchen_machine/microwave, /obj/structure/table, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "opP" = ( @@ -68579,15 +69296,6 @@ }, /turf/simulated/floor/plasteel, /area/station/security/prisonershuttle) -"oqB" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/station/maintenance/storage) "oqN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -68779,6 +69487,11 @@ }, /turf/simulated/wall, /area/station/hallway/primary/aft/west) +"osN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/turfs/rust, +/turf/simulated/floor/plating, +/area/station/maintenance/disposal/northeast) "osR" = ( /obj/structure/table/reinforced, /obj/structure/disposalpipe/segment{ @@ -68813,8 +69526,8 @@ }, /area/station/supply/office) "otb" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/apmaint) "oth" = ( @@ -68909,7 +69622,7 @@ }, /area/station/science/test_chamber) "ove" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /mob/living/simple_animal/mouse/gray, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -68938,7 +69651,7 @@ /obj/item/cigbutt/roach, /obj/item/cigbutt/roach, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "ovQ" = ( @@ -69011,7 +69724,7 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "owM" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/rack, /obj/effect/landmark/spawner/nukedisc_respawn, /turf/simulated/floor/plating, @@ -69099,7 +69812,7 @@ name = "Aft Asteroid Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "oxQ" = ( @@ -69149,11 +69862,35 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/disposal/south) +"oyu" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/spawner/random/dirt/often, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/primary/fore/north) "oyx" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/turret_protected/aisat/interior/secondary) +"oyJ" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/mapping_helpers/turfs/rust, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/fore) "oyN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -69226,11 +69963,6 @@ }, /area/station/hallway/primary/fore/east) "ozT" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -69239,8 +69971,8 @@ }, /obj/machinery/power/apc/directional/south, /obj/structure/cable{ - d2 = 4; - icon_state = "0-4" + d2 = 8; + icon_state = "0-8" }, /turf/simulated/floor/plating, /area/station/maintenance/storage) @@ -69248,6 +69980,13 @@ /obj/machinery/ai_status_display, /turf/simulated/wall, /area/station/service/kitchen) +"ozX" = ( +/obj/machinery/alarm/directional/west, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "oAs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -69266,7 +70005,7 @@ }, /area/station/maintenance/port2) "oAz" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/grille/broken, /obj/item/stack/ore/glass, /turf/simulated/floor/plating, @@ -69596,14 +70335,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, /area/station/hallway/primary/port/south) "oGI" = ( /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -69611,7 +70350,7 @@ "oGM" = ( /obj/structure/disposalpipe/segment/corner, /obj/item/clothing/head/ushanka, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/disposal/northeast) "oGZ" = ( @@ -69643,6 +70382,13 @@ /obj/machinery/economy/vending/cart, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) +"oIf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "oIs" = ( /obj/structure/table, /obj/item/storage/fancy/cigarettes/cigpack_robust{ @@ -69671,6 +70417,11 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -69819,6 +70570,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -69886,7 +70642,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/door/airlock/engineering{ name = "Aft Starboard Solar Access" }, @@ -69900,7 +70656,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/lobby) "oLP" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -69918,6 +70674,10 @@ icon_state = "dark" }, /area/station/command/office/cmo) +"oLU" = ( +/obj/effect/mapping_helpers/turfs/rust, +/turf/simulated/wall, +/area/station/maintenance/disposal/northeast) "oMr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/public/glass, @@ -70013,7 +70773,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel{ icon_state = "darkyellow"; dir = 1 @@ -70240,18 +71000,6 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/station/hallway/primary/central/east) -"oPQ" = ( -/obj/structure/cable/orange{ - d2 = 8; - icon_state = "0-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/disposal/northeast) "oPR" = ( /obj/structure/sign/custodian, /turf/simulated/wall, @@ -70342,7 +71090,7 @@ /turf/simulated/floor/plasteel, /area/station/public/fitness) "oRA" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/radio/intercom{ name = "west bump"; pixel_x = -28 @@ -70360,7 +71108,7 @@ /turf/simulated/floor/wood, /area/station/service/clown) "oRS" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -70521,7 +71269,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 2; d2 = 4; @@ -70698,15 +71446,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/east) -"oXd" = ( -/obj/machinery/conveyor/auto{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/disposal/northeast) "oXg" = ( /obj/structure/toilet{ dir = 4 @@ -70847,6 +71586,11 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -70901,7 +71645,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/central/west) "oZI" = ( @@ -71252,7 +71996,7 @@ }, /area/station/service/library) "pdP" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/door/airlock/freezer, /turf/simulated/floor/plasteel/freezer, /area/station/maintenance/starboard) @@ -71371,7 +72115,7 @@ /obj/structure/chair/wood{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "pfm" = ( @@ -71423,7 +72167,7 @@ /area/station/maintenance/port) "pga" = ( /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/disposal/northeast) "pge" = ( @@ -71453,7 +72197,7 @@ /turf/simulated/floor/carpet/green, /area/station/service/library) "pgK" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -71717,7 +72461,7 @@ /turf/simulated/floor/plating, /area/station/science/xenobiology) "pkM" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -71770,7 +72514,7 @@ name = "Quarantine Lockdown"; opacity = 0 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "plk" = ( @@ -71809,7 +72553,7 @@ }, /area/station/medical/medbay) "plQ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/solar_maintenance/aft_starboard) "pmb" = ( @@ -71931,6 +72675,23 @@ }, /turf/simulated/floor/plating, /area/station/service/hydroponics) +"pnu" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/sign/securearea{ + pixel_y = 32 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "pnO" = ( /obj/structure/sign/poster/contraband/random{ pixel_x = 32 @@ -72007,7 +72768,7 @@ /obj/machinery/computer/general_air_control{ dir = 8; name = "Distribution and Waste Monitor"; - autolink_sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop") + autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") }, /obj/item/radio/intercom{ pixel_x = 28; @@ -72016,7 +72777,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) "poY" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/freezer, /area/station/maintenance/gambling_den) "ppd" = ( @@ -72086,6 +72847,11 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -72103,7 +72869,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal) "ppV" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/solar_maintenance/fore_starboard) "pqc" = ( @@ -72115,6 +72881,7 @@ "pqi" = ( /obj/structure/disposalpipe/segment, /obj/machinery/hologram/holopad, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -72318,7 +73085,7 @@ /obj/structure/filingcabinet, /obj/machinery/camera{ c_tag = "Quartermaster's Office"; - network = list("SS13", "QM") + network = list("SS13","QM") }, /turf/simulated/floor/plasteel{ dir = 1; @@ -72342,7 +73109,7 @@ /turf/simulated/floor/grass, /area/station/science/genetics) "pts" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/public/vacant_office) "ptt" = ( @@ -72375,6 +73142,26 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/security/prison/cell_block/A) +"ptz" = ( +/obj/machinery/door/airlock/engineering{ + name = "Power Transmission Laser" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "ptA" = ( /obj/machinery/alarm/directional/south, /obj/machinery/camera{ @@ -72390,7 +73177,7 @@ }, /area/station/engineering/smes) "ptT" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/southeast) "ptZ" = ( @@ -72544,7 +73331,7 @@ }, /area/station/public/storage/tools) "pvf" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -72681,7 +73468,7 @@ "pxV" = ( /obj/structure/disposalpipe/segment/corner, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -72879,14 +73666,6 @@ icon_state = "asteroidplating" }, /area/station/maintenance/port) -"pBd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/station/maintenance/port2) "pBi" = ( /obj/structure/table/wood, /obj/item/storage/firstaid/brute, @@ -72910,7 +73689,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "pBH" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -73020,7 +73799,7 @@ }, /area/holodeck/alphadeck) "pDu" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/apmaint) "pDE" = ( @@ -73167,7 +73946,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment/corner, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/central/east) "pEN" = ( @@ -73268,7 +74047,7 @@ /area/space) "pFT" = ( /obj/machinery/firealarm/directional/east, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" @@ -73308,6 +74087,16 @@ icon_state = "dark" }, /area/station/command/bridge) +"pGx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/station/maintenance/storage) "pGD" = ( /obj/machinery/light/small{ dir = 4 @@ -73380,7 +74169,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "pIB" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -73566,7 +74355,7 @@ }, /area/station/maintenance/port2) "pLe" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbrown" @@ -73674,7 +74463,7 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/aft/west) "pMR" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/turbine) "pMT" = ( @@ -73701,7 +74490,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/carpet, /area/station/public/locker) "pNq" = ( @@ -73718,7 +74507,7 @@ }, /area/station/service/chapel) "pNE" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -74034,7 +74823,7 @@ "pQL" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) "pQM" = ( @@ -74079,7 +74868,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "pRa" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/assembly/mousetrap/armed, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -74088,7 +74877,7 @@ dir = 4; color = "#954535" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -74176,8 +74965,27 @@ }, /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) +"pRX" = ( +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "pSh" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/closet/firecloset, /obj/machinery/firealarm/directional/south, /obj/machinery/power/apc/directional/east, @@ -74194,7 +75002,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -74256,6 +75064,21 @@ icon_state = "dark" }, /area/station/turret_protected/ai) +"pTm" = ( +/obj/machinery/door/airlock/engineering{ + name = "Power Transmission Laser" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "pTr" = ( /obj/item/radio/intercom{ pixel_y = -28; @@ -74287,20 +75110,13 @@ }, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/storage) -"pTM" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/spawner/random_spawners/dirt_often, -/turf/simulated/floor/plating, -/area/station/hallway/primary/central/north) "pTT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/flasher{ id = "permaflash1"; pixel_x = 28 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -74317,6 +75133,11 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/north) "pUC" = ( @@ -74516,7 +75337,7 @@ /obj/item/poster/syndicate_recruitment, /obj/item/poster/syndicate_recruitment, /obj/item/poster/syndicate_recruitment, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "pWF" = ( @@ -74541,7 +75362,7 @@ /obj/structure/sink{ pixel_y = 24 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/freezer, /area/station/maintenance/gambling_den) "pWW" = ( @@ -74591,7 +75412,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) "pXv" = ( @@ -74826,14 +75647,14 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "qaJ" = ( /obj/machinery/light/small{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/central/east) "qba" = ( @@ -74897,26 +75718,13 @@ /obj/structure/disposalpipe/segment{ color = "#954535" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/station/hallway/primary/aft/west) -"qbE" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" - }, -/area/station/maintenance/fore) "qcb" = ( /obj/machinery/light/small{ dir = 8 @@ -74958,7 +75766,7 @@ /area/station/maintenance/port) "qcE" = ( /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel{ dir = 5; @@ -74994,7 +75802,7 @@ name = "Aft Asteroid Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -75054,7 +75862,7 @@ name = "EXTERNAL AIRLOCK"; pixel_x = 32 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) "qef" = ( @@ -75181,6 +75989,25 @@ icon_state = "asteroidplating" }, /area/station/maintenance/fsmaint) +"qga" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/engine{ + slowdown = -0.3 + }, +/area/station/hallway/spacebridge/scidock) "qgd" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=EngineeringEast2"; @@ -75207,7 +76034,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -75295,7 +76122,7 @@ /obj/machinery/door/airlock/maintenance{ name = "Storefront Access" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -75464,7 +76291,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/public/storefront) "qjv" = ( @@ -75524,6 +76351,15 @@ /obj/effect/landmark/spawner/xeno, /turf/simulated/floor/plating, /area/station/supply/miningdock) +"qkl" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "qkm" = ( /obj/structure/chair/sofa{ dir = 1 @@ -75696,6 +76532,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -75787,7 +76628,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -75972,7 +76813,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 2; d2 = 4; @@ -75993,7 +76834,7 @@ }, /area/station/maintenance/apmaint) "qpx" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /obj/effect/spawner/random/fungus/maybe, /turf/simulated/wall, /area/station/maintenance/port2) @@ -76179,7 +77020,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_regular_floor = "yellowsiding"; icon_state = "tranquillite" @@ -76194,7 +77035,7 @@ }, /obj/item/clothing/mask/facehugger/toy, /obj/item/clothing/mask/fakemoustache, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ icon_regular_floor = "yellowsiding"; @@ -76339,6 +77180,27 @@ icon_state = "darkbrowncorners" }, /area/station/maintenance/starboard) +"quP" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/effect/spawner/random/dirt/frequent, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance{ + name = "Atmospherics Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/simulated/floor/plating, +/area/station/engineering/atmos) +"quW" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "qva" = ( /obj/structure/cable/orange{ d1 = 4; @@ -76525,15 +77387,6 @@ icon_state = "whitepurple" }, /area/station/science/rnd) -"qxA" = ( -/obj/machinery/conveyor/auto/ccw{ - dir = 9 - }, -/obj/effect/decal/cleanable/cobweb{ - icon_state = "cobweb2" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/disposal/northeast) "qxB" = ( /obj/machinery/conveyor/auto, /obj/machinery/light/small{ @@ -76545,7 +77398,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -76559,7 +77412,7 @@ name = "south bump"; dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/closet/secure_closet/hydroponics, /turf/simulated/floor/plasteel{ icon_state = "darkgreenfull" @@ -76571,7 +77424,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -76903,7 +77756,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/sign/pods{ pixel_x = -32 }, @@ -76936,7 +77789,7 @@ /turf/simulated/floor/engine, /area/station/medical/chemistry) "qDR" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/gambling_den) "qDS" = ( @@ -76966,6 +77819,12 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/disposal/northwest) +"qEx" = ( +/obj/structure/bookcase{ + name = "bookcase (Fiction)" + }, +/turf/simulated/floor/wood, +/area/station/service/library) "qEA" = ( /obj/structure/cable{ d1 = 1; @@ -77085,6 +77944,20 @@ }, /turf/space, /area/station/hallway/spacebridge/sercom) +"qGM" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "qGR" = ( /obj/machinery/camera{ c_tag = "Security Lobby West" @@ -77123,7 +77996,7 @@ /turf/simulated/floor/wood/nitrogen, /area/station/maintenance/abandonedbar) "qHC" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/electrical_shop) "qHH" = ( @@ -77166,7 +78039,7 @@ /turf/simulated/floor/engine, /area/station/science/xenobiology) "qHO" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -77328,7 +78201,7 @@ }, /area/station/service/chapel/office) "qJQ" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/turf_decal/loading_area{ dir = 4 }, @@ -77563,7 +78436,7 @@ /turf/simulated/floor/plating, /area/station/hallway/spacebridge/dockmed) "qNj" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/aft/west) "qNu" = ( @@ -77748,7 +78621,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 1; d2 = 8; @@ -77907,7 +78780,7 @@ /turf/simulated/floor/grass, /area/station/science/genetics) "qSj" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -77970,7 +78843,7 @@ dir = 4; level = 2 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) "qTY" = ( @@ -78051,6 +78924,18 @@ }, /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) +"qUN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/disposal/northeast) "qUO" = ( /mob/living/simple_animal/bunny{ desc = "It's Spaghetti, the official bnuy of Atmospherics. Appropriately named after the jumbled mess of piping."; @@ -78084,7 +78969,7 @@ /area/shuttle/arrival/station) "qVx" = ( /obj/effect/spawner/random/fungus/maybe, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/electrical_shop) "qVy" = ( @@ -78368,7 +79253,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -78416,7 +79301,7 @@ }, /area/station/science/xenobiology) "raA" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -78484,6 +79369,21 @@ /obj/effect/turf_decal/stripes/red, /turf/simulated/floor/engine, /area/station/engineering/control) +"rbw" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 5 + }, +/obj/effect/spawner/random/dirt/often, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/atmos) "rbx" = ( /obj/structure/window/reinforced{ dir = 4 @@ -78600,7 +79500,7 @@ /area/station/maintenance/port2) "rdl" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/southeast) @@ -78616,7 +79516,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/southeast) "rdF" = ( @@ -78637,7 +79537,7 @@ network = list("Prison","SS13") }, /obj/item/bedsheet/patriot, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "rdM" = ( @@ -78731,16 +79631,6 @@ /obj/effect/landmark/start/chemist, /turf/simulated/floor/engine, /area/station/medical/chemistry) -"rgm" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" - }, -/area/station/maintenance/maintcentral) "rgy" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -78780,7 +79670,7 @@ }, /area/station/hallway/primary/port/south) "rho" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/port) "rhw" = ( @@ -78790,7 +79680,7 @@ }, /area/station/maintenance/apmaint) "ril" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/security/range) "riF" = ( @@ -78894,7 +79784,7 @@ /turf/simulated/wall/r_wall, /area/station/turret_protected/ai_upload) "rjx" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 2; d2 = 8; @@ -79071,7 +79961,7 @@ /area/station/hallway/secondary/entry/south) "rnP" = ( /obj/effect/spawner/random/fungus/probably, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/mine/unexplored/cere/civilian) "rnQ" = ( @@ -79136,7 +80026,7 @@ /turf/simulated/floor/carpet, /area/station/service/bar) "rot" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/public/locker) "roF" = ( @@ -79151,11 +80041,11 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "roL" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "rpg" = ( @@ -79425,7 +80315,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore2) "rte" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/closet/crate/can, /obj/effect/decal/cleanable/dirt, /obj/item/kitchen/knife, @@ -79471,6 +80361,12 @@ icon_state = "darkyellowcorners" }, /area/station/engineering/smes) +"rum" = ( +/obj/structure/bookcase{ + name = "bookcase (Non-Fiction)" + }, +/turf/simulated/floor/wood, +/area/station/service/library) "rux" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -79625,7 +80521,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -79700,7 +80596,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -79776,6 +80672,24 @@ "rza" = ( /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"rzv" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/mapping_helpers/turfs/rust, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/fore) "rzL" = ( /obj/structure/cable/orange{ d1 = 2; @@ -79825,7 +80739,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 2; d2 = 8; @@ -79868,7 +80782,7 @@ }, /area/station/maintenance/port2) "rAT" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fore2) "rAX" = ( @@ -80060,14 +80974,14 @@ /area/station/science/xenobiology) "rDv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "rDF" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/security/range) "rEb" = ( @@ -80117,6 +81031,22 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/hallway/primary/central/west) +"rFa" = ( +/obj/machinery/driver_button{ + id_tag = "trash"; + pixel_x = 24; + pixel_y = -8 + }, +/obj/machinery/door_control{ + id = "Disposal Exit"; + name = "Dispossal Vent Control"; + pixel_x = 24; + pixel_y = 8; + req_access = list(12) + }, +/obj/effect/spawner/random/dirt/frequent, +/turf/simulated/floor/plating, +/area/station/maintenance/disposal) "rFb" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/portables_connector{ @@ -80229,7 +81159,7 @@ dir = 10; level = 2 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) "rGY" = ( @@ -80274,7 +81204,7 @@ /obj/machinery/conveyor_switch/oneway{ id = "CargoWaste" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "rHA" = ( @@ -80287,15 +81217,6 @@ /obj/structure/sign/security, /turf/simulated/wall, /area/station/hallway/primary/central/north) -"rHT" = ( -/obj/machinery/camera{ - c_tag = "Bridge Exterior"; - dir = 8; - network = list("RD","SS13"); - pixel_y = -22 - }, -/turf/space, -/area/station/maintenance/fore) "rIb" = ( /obj/effect/turf_decal/woodsiding{ dir = 1 @@ -80409,7 +81330,7 @@ /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior) "rJg" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/closet/emcloset, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/starboard) @@ -80531,7 +81452,7 @@ /obj/machinery/camera{ c_tag = "Mining Dock"; dir = 10; - network = list("SS13", "QM") + network = list("SS13","QM") }, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) @@ -80562,20 +81483,6 @@ /obj/item/storage/firstaid/regular, /turf/simulated/floor/mineral/titanium, /area/shuttle/arrival/station) -"rLu" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Fore Asteroid Maintenance Access" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/dirt_frequent, -/turf/simulated/floor/plating, -/area/station/maintenance/fore) "rLz" = ( /obj/structure/closet/secure_closet/explorer, /obj/machinery/alarm/directional/south, @@ -80765,7 +81672,7 @@ layer = 2.9 }, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "rNC" = ( @@ -80797,7 +81704,7 @@ dir = 8 }, /obj/machinery/atmospherics/portable/canister/air, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) "rNT" = ( @@ -80969,7 +81876,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/door/airlock/maintenance{ name = "Storefront Access" @@ -81142,7 +82049,7 @@ }, /area/station/maintenance/apmaint) "rTa" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/light/small, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -81223,7 +82130,7 @@ /turf/space, /area/station/engineering/solar/port) "rUd" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/southeast) @@ -81451,8 +82358,8 @@ /turf/simulated/floor/plating, /area/station/service/hydroponics) "rXJ" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "rXS" = ( @@ -81694,6 +82601,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -81703,7 +82615,7 @@ name = "Fore Asteroid Maintenance Access" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -81797,7 +82709,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -81823,7 +82735,7 @@ c_tag = "Disposals"; dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "sct" = ( @@ -81861,7 +82773,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -82339,7 +83251,7 @@ /turf/simulated/mineral/ancient/outer, /area/station/maintenance/disposal/north) "shX" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "shZ" = ( @@ -82700,17 +83612,6 @@ }, /turf/space, /area/station/engineering/solar/aft) -"snX" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" - }, -/area/station/maintenance/fore) "sok" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -82836,7 +83737,7 @@ }, /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/security/range) "srv" = ( @@ -83118,7 +84019,7 @@ /area/station/maintenance/electrical_shop) "stP" = ( /obj/item/reagent_containers/glass/bucket, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "darkgreenfull" }, @@ -83133,7 +84034,7 @@ /obj/structure/computerframe{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -83339,11 +84240,6 @@ /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "swL" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -83354,7 +84250,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "swN" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/cigbutt, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -83373,7 +84269,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/gambling_den) "sxa" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/mine/unexplored/cere/command) "sxb" = ( @@ -83443,12 +84339,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fore2) -"syo" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/hallway/primary/fore/north) "syt" = ( /obj/structure/cable/orange{ d1 = 4; @@ -83745,7 +84635,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel{ icon_state = "darkyellow"; dir = 1 @@ -83754,7 +84644,7 @@ "sCt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) "sCy" = ( @@ -83976,7 +84866,7 @@ }, /area/station/medical/surgery/secondary) "sFd" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -84044,7 +84934,7 @@ "sGa" = ( /obj/structure/reagent_dispensers/watertank, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) "sGd" = ( @@ -84115,7 +85005,7 @@ /turf/simulated/wall, /area/station/hallway/primary/central/north) "sIr" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -84422,7 +85312,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -84559,7 +85449,7 @@ /area/station/maintenance/port) "sOk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/disposalpipe/segment{ dir = 4; color = "#954535" @@ -84664,7 +85554,7 @@ }, /area/station/hallway/primary/starboard/south) "sPm" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /obj/effect/spawner/random/fungus/probably, /turf/simulated/wall, /area/station/maintenance/apmaint) @@ -84830,7 +85720,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -84841,19 +85731,6 @@ icon_state = "escape" }, /area/station/hallway/secondary/entry/east) -"sSq" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance{ - name = "Command SMES Access" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/spawner/random_spawners/dirt_frequent, -/turf/simulated/floor/plating, -/area/station/maintenance/fore) "sSv" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/engineering/glass{ @@ -85007,7 +85884,7 @@ /area/station/hallway/primary/starboard/south) "sUB" = ( /obj/item/chair/stool/bar, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/gambling_den) "sUD" = ( @@ -85216,7 +86093,7 @@ dir = 8 }, /obj/item/kirbyplants/plant21, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkyellow" @@ -85233,6 +86110,15 @@ icon_state = "barber" }, /area/station/service/barber) +"sYd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "sYg" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -85271,7 +86157,7 @@ "sYE" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/extinguisher, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "sZd" = ( @@ -85436,7 +86322,7 @@ /obj/machinery/door/airlock/maintenance{ name = "Port Asteroid Maintenance" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/port) "taT" = ( @@ -85558,7 +86444,7 @@ }, /area/station/hallway/secondary/entry/west) "tbU" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/machinery/light/small{ dir = 1 }, @@ -85569,7 +86455,7 @@ /area/station/maintenance/electrical_shop) "tcs" = ( /obj/item/chair, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/public/vacant_office) "tcx" = ( @@ -85607,7 +86493,7 @@ /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior/secondary) "tdk" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/orange{ @@ -85632,7 +86518,7 @@ }, /area/station/hallway/spacebridge/dockmed) "tet" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -85737,7 +86623,7 @@ pixel_y = 9 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "tfR" = ( @@ -85788,6 +86674,36 @@ icon_state = "cafeteria" }, /area/station/service/bar) +"tgd" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/control) +"tgp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/sign/electricshock{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "tgq" = ( /obj/structure/table/wood, /turf/simulated/floor/wood, @@ -85797,7 +86713,7 @@ /turf/space, /area/station/engineering/solar/aft_starboard) "tgU" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/disposalpipe/segment/corner{ dir = 8 }, @@ -85886,7 +86802,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, @@ -85937,6 +86853,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) +"tiu" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/primary/fore/north) "tiv" = ( /obj/machinery/light{ dir = 1 @@ -85950,7 +86876,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/port) "tiG" = ( @@ -86036,7 +86962,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -86068,7 +86994,7 @@ name = "External Airlock Access" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -86095,7 +87021,7 @@ /area/station/supply/lobby) "tjU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "tkd" = ( @@ -86234,7 +87160,7 @@ /area/station/hallway/spacebridge/sercom) "tmg" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "tmM" = ( @@ -86265,7 +87191,7 @@ }, /area/station/security/lobby) "tmT" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/disposal/external/southwest) "tnb" = ( @@ -86534,12 +87460,23 @@ icon_state = "dark" }, /area/station/engineering/control) +"trF" = ( +/obj/machinery/light, +/obj/machinery/camera{ + c_tag = "Engineering Power Storage 2"; + dir = 1; + network = list("SS13","CE") + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellow" + }, +/area/station/engineering/smes) "trN" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 }, /obj/machinery/atmospherics/portable/canister/air, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "trR" = ( @@ -86584,11 +87521,29 @@ icon_state = "redcorner" }, /area/station/security/lobby) +"tsn" = ( +/obj/item/stack/cable_coil{ + color = "#FFFF00" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/item/storage/toolbox/mechanical, +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/multitool, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "tsp" = ( /obj/structure/sign/poster/official/do_not_question{ pixel_y = -32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/nitrogen, /area/station/maintenance/abandonedbar) "tst" = ( @@ -86629,7 +87584,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) "tsS" = ( @@ -86654,7 +87609,7 @@ /turf/simulated/floor/engine, /area/station/medical/chemistry) "ttn" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkbrown" @@ -86918,23 +87873,6 @@ /obj/effect/landmark/start/shaft_miner, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) -"twg" = ( -/obj/machinery/light, -/obj/machinery/camera{ - c_tag = "Engineering Power Storage 2"; - dir = 1; - network = list("SS13","CE") - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/spawner/random_spawners/dirt_often, -/turf/simulated/floor/plasteel{ - icon_state = "darkyellow" - }, -/area/station/engineering/smes) "twk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm/directional/west, @@ -87121,7 +88059,7 @@ dir = 4 }, /obj/structure/fans/tiny, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "tyT" = ( @@ -87239,7 +88177,7 @@ /turf/simulated/floor/carpet/green, /area/station/service/library) "tAw" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/west) "tAJ" = ( @@ -87299,6 +88237,11 @@ "tBG" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/engineering/break_room/secondary) "tBR" = ( @@ -87368,7 +88311,7 @@ }, /area/station/engineering/gravitygenerator) "tCG" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/solar_maintenance/fore_starboard) "tCX" = ( @@ -87461,14 +88404,6 @@ /obj/item/storage/fancy/candle_box/eternal, /turf/simulated/floor/carpet/black, /area/station/service/chapel/office) -"tDU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" - }, -/area/station/maintenance/fore) "tDY" = ( /obj/structure/grille, /turf/simulated/floor/plating, @@ -87609,6 +88544,11 @@ /obj/structure/reagent_dispensers/water_cooler, /obj/structure/disposalpipe/segment, /obj/machinery/firealarm/directional/west, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -87835,7 +88775,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -88043,16 +88983,16 @@ }, /area/station/hallway/primary/aft/east) "tNQ" = ( -/obj/structure/cable/orange{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/disposal/northeast) "tNT" = ( @@ -88183,7 +89123,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/nitrogen, /area/station/maintenance/abandonedbar) "tQI" = ( @@ -88368,7 +89308,7 @@ /turf/simulated/floor/wood, /area/station/service/library) "tTF" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/power/apc/directional/north, /obj/structure/cable/orange{ d2 = 8; @@ -88473,7 +89413,7 @@ opacity = 0 }, /obj/effect/mapping_helpers/airlock/unres, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "tVf" = ( @@ -88757,7 +89697,7 @@ }, /area/station/public/quantum/security) "tYm" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/abandonedbar) "tYn" = ( @@ -88850,7 +89790,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel/freezer, /area/station/maintenance/starboard) "tZl" = ( @@ -88885,7 +89825,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -88914,7 +89854,7 @@ }, /area/mine/unexplored/cere/civilian) "tZI" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/southwest) "tZL" = ( @@ -88947,6 +89887,15 @@ icon_state = "dark" }, /area/station/security/brig) +"tZW" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/station/maintenance/disposal/northeast) "tZZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -89112,6 +90061,14 @@ icon_state = "darkredcorners" }, /area/station/command/bridge) +"ubX" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating/asteroid/ancient, +/area/station/maintenance/fore) "ubY" = ( /obj/structure/cable/orange{ d1 = 1; @@ -89160,15 +90117,19 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/starboard/south) +"ucv" = ( +/obj/structure/sign/securearea, +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "ucE" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/disposal/west) "uda" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "udb" = ( @@ -89268,7 +90229,7 @@ /turf/simulated/mineral/ancient, /area/station/service/hydroponics) "ueH" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/disposal/northwest) "ueQ" = ( @@ -89533,6 +90494,11 @@ "uio" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "uir" = ( @@ -89540,7 +90506,7 @@ /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/asmaint) "uix" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/public/vacant_office) "uiD" = ( @@ -89814,7 +90780,7 @@ /turf/simulated/floor/wood, /area/station/legal/courtroom) "ull" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -89847,7 +90813,7 @@ }, /area/station/science/toxins/mixing) "umz" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "umL" = ( @@ -89963,7 +90929,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "unU" = ( -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fsmaint) "uob" = ( @@ -90354,7 +91320,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "uuj" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fpmaint) "uut" = ( @@ -90473,7 +91439,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "uwc" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/radio/intercom{ name = "south bump"; pixel_y = -28 @@ -90639,7 +91605,7 @@ /area/station/engineering/atmos/control) "uxM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -90670,7 +91636,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, @@ -90715,7 +91681,7 @@ /area/station/hallway/primary/port/south) "uyi" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -90842,7 +91808,7 @@ /obj/machinery/camera{ c_tag = "Expedition Access"; dir = 8; - network = list("SS13", "QM") + network = list("SS13","QM") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -91089,7 +92055,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/central/west) "uCy" = ( @@ -91218,9 +92184,19 @@ /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "uEU" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/disposal/north) +"uFg" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/primary/central/north) "uFq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -91288,7 +92264,7 @@ "uGz" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -91379,6 +92355,12 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/central/north) +"uIg" = ( +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "uIh" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/stripes/corner{ @@ -91639,7 +92621,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light{ dir = 1 }, @@ -91677,6 +92659,36 @@ /obj/effect/spawner/airlock/s_to_n, /turf/simulated/mineral/ancient, /area/station/maintenance/port) +"uLC" = ( +/obj/structure/grille, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/mapping_helpers/turfs/rust, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) +"uLG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/sign/radiation/rad_area{ + pixel_x = 32 + }, +/obj/effect/mapping_helpers/turfs/rust, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "uMd" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -91924,7 +92936,7 @@ }, /area/station/hallway/spacebridge/dockmed) "uPU" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -92114,27 +93126,6 @@ icon_state = "dark" }, /area/station/engineering/control) -"uRS" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/random_spawners/dirt_often, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "bluecorner" - }, -/area/station/hallway/primary/fore/north) "uSa" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable/orange{ @@ -92204,7 +93195,7 @@ name = "custom placement" }, /obj/machinery/economy/vending/cigarette, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "escape" @@ -92385,6 +93376,9 @@ icon_state = "whitepurple" }, /area/station/science/genetics) +"uVK" = ( +/turf/simulated/mineral/ancient, +/area/station/engineering/transmission_laser) "uWc" = ( /obj/machinery/light/small{ dir = 8 @@ -92416,7 +93410,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/access/any/science/research, /turf/simulated/floor/plasteel/white, @@ -92434,7 +93428,7 @@ }, /area/station/supply/break_room) "uWP" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -92510,9 +93504,9 @@ /turf/simulated/wall/r_wall, /area/station/engineering/engine/supermatter) "uYr" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/space_heater, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "uYv" = ( @@ -92594,7 +93588,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "uZB" = ( @@ -92635,7 +93629,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/southeast) "vaz" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -92791,7 +93785,7 @@ /area/station/medical/cloning) "vcp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/port) "vcs" = ( @@ -92880,18 +93874,6 @@ icon_state = "dark" }, /area/station/telecomms/computer) -"vdv" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/station/maintenance/fore) "vdU" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -92920,7 +93902,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -92976,7 +93958,7 @@ name = "Security Blast Door"; opacity = 0 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "vfi" = ( @@ -93022,7 +94004,7 @@ }, /area/station/hallway/primary/aft/west) "vfN" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -93059,7 +94041,7 @@ }, /area/station/hallway/primary/aft/west) "vgP" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -93074,7 +94056,7 @@ name = "Central Access" }, /obj/effect/turf_decal/stripes/line, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; @@ -93140,7 +94122,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 1; d2 = 4; @@ -93213,7 +94195,7 @@ /area/station/service/bar) "vjB" = ( /obj/structure/chair/wood, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "vjI" = ( @@ -93260,6 +94242,15 @@ icon_state = "dark" }, /area/station/public/fitness) +"vkd" = ( +/obj/machinery/camera{ + c_tag = "Bridge Exterior"; + dir = 8; + network = list("RD","SS13"); + pixel_y = -22 + }, +/turf/space, +/area/space) "vkk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -93390,7 +94381,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -93424,7 +94415,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "vmQ" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/closet/crate/miningcar, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -93466,7 +94457,7 @@ /turf/simulated/floor/plating, /area/station/public/storefront) "vnw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /obj/effect/spawner/airlock/s_to_n, /turf/simulated/wall, /area/station/maintenance/disposal/external/southwest) @@ -93606,7 +94597,7 @@ }, /area/station/supply/storage) "vpe" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fsmaint) "vpg" = ( @@ -93817,7 +94808,7 @@ /turf/space, /area/space/nearstation) "vrl" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/light/small{ dir = 4 }, @@ -93865,7 +94856,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore2) "vrR" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_switch{ pixel_y = 24; name = "north bump" @@ -93952,7 +94943,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc/directional/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/southwest) "vtg" = ( @@ -94296,7 +95287,7 @@ /turf/simulated/floor/plasteel/white, /area/station/command/office/rd) "vxp" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/electrical_shop) "vxH" = ( @@ -94432,6 +95423,28 @@ /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plating, /area/station/hallway/primary/central/east) +"vyR" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/random/dirt/often, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "bluecorner" + }, +/area/station/hallway/primary/fore/north) "vyU" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -94724,7 +95737,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/port) "vEs" = ( @@ -94871,7 +95884,7 @@ /turf/simulated/wall, /area/station/legal/magistrate) "vFD" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/ore_box, /obj/effect/turf_decal/box, /turf/simulated/floor/plating, @@ -94955,7 +95968,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_regular_floor = "yellowsiding"; icon_state = "tranquillite" @@ -95142,7 +96155,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/fpmaint) "vKQ" = ( @@ -95195,7 +96208,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -95238,13 +96251,18 @@ /obj/structure/disposalpipe/segment/corner{ dir = 8 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/engineering/break_room/secondary) "vLS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 2; d2 = 8; @@ -95260,7 +96278,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -95335,11 +96353,6 @@ /turf/simulated/floor/wood, /area/station/service/bar) "vME" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, @@ -95401,6 +96414,13 @@ icon_state = "dark" }, /area/station/telecomms/chamber) +"vNz" = ( +/obj/effect/spawner/random/dirt/often, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + icon_state = "darkgreenfull" + }, +/area/station/service/hydroponics) "vNJ" = ( /turf/simulated/floor/plasteel/white, /area/station/medical/virology) @@ -95503,6 +96523,21 @@ /obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"vPg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4; + color = "#954535" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/fore/north) "vPj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -95576,6 +96611,27 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/port/north) +"vPY" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/fore) "vQk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -95669,7 +96725,7 @@ /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "vRb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/disposal/southwest) "vRf" = ( @@ -95836,7 +96892,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) "vTo" = ( @@ -95877,7 +96933,7 @@ /obj/structure/urinal{ pixel_y = 32 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/freezer, /area/station/maintenance/gambling_den) "vUb" = ( @@ -95935,7 +96991,7 @@ }, /area/station/maintenance/apmaint) "vVP" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -96242,6 +97298,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 9 }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -96262,7 +97323,7 @@ name = "Hydroponics" }, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -96749,7 +97810,7 @@ }, /area/station/hallway/primary/fore/west) "wiu" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/disposal/south) "wix" = ( @@ -96843,6 +97904,15 @@ icon_state = "white" }, /area/station/medical/cloning) +"wjr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "wjy" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/orange{ @@ -96939,6 +98009,16 @@ /obj/item/flashlight/lamp, /turf/simulated/floor/carpet/royalblack, /area/station/command/office/captain) +"wkK" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/spawner/random/dirt/frequent, +/obj/machinery/door/airlock/maintenance{ + name = "Central Asteroid Maintenance" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/station/maintenance/maintcentral) "wkN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -97028,7 +98108,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -97042,6 +98122,16 @@ icon_state = "neutralcorner" }, /area/station/hallway/secondary/entry/north) +"wlG" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "wlV" = ( /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/engine, @@ -97056,7 +98146,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -97449,7 +98539,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port2) "wqx" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/mine/unexplored/cere/research) "wqE" = ( @@ -97692,7 +98782,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "wsV" = ( @@ -98048,7 +99138,7 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "wwn" = ( @@ -98059,15 +99149,10 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/west) "wwy" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /turf/simulated/floor/plating{ @@ -98094,7 +99179,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) "wxd" = ( @@ -98172,25 +99257,6 @@ icon_state = "whiteblue" }, /area/station/medical/paramedic) -"wyo" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - color = "#954535" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/station/hallway/primary/fore/north) "wyu" = ( /turf/simulated/mineral/ancient, /area/station/supply/break_room) @@ -98290,7 +99356,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "wzC" = ( @@ -98625,7 +99691,7 @@ /turf/simulated/floor/wood, /area/station/service/bar) "wEb" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) @@ -98931,24 +99997,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) -"wJe" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/spawner/random_spawners/dirt_often, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkyellow" - }, -/area/station/engineering/smes) "wJk" = ( /obj/machinery/camera{ c_tag = "Research Director's Office"; @@ -98989,8 +100037,8 @@ /turf/simulated/wall, /area/station/hallway/primary/central/east) "wJQ" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/dirt/frequent, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "wJY" = ( @@ -99005,7 +100053,7 @@ name = "External Airlock Access" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/hallway/primary/central/west) "wKe" = ( @@ -99108,7 +100156,7 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "wLr" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/asmaint) "wLu" = ( @@ -99385,7 +100433,7 @@ }, /area/station/service/chapel) "wPc" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "wPj" = ( @@ -99707,6 +100755,17 @@ }, /turf/simulated/wall, /area/station/turret_protected/aisat/interior) +"wUI" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "wUO" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable/orange, @@ -99964,6 +101023,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/station/hallway/primary/central/north) +"wZq" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "wZv" = ( /turf/simulated/wall, /area/station/medical/paramedic) @@ -100312,7 +101379,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) "xcH" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -100324,7 +101391,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/port) "xcV" = ( @@ -100366,7 +101433,7 @@ /area/station/hallway/primary/starboard/south) "xdi" = ( /obj/structure/grille/broken, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "xdk" = ( @@ -100432,6 +101499,17 @@ }, /turf/simulated/floor/plating, /area/station/medical/patients_rooms) +"xdO" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/turfs/rust, +/turf/simulated/floor/plating, +/area/station/maintenance/disposal/northeast) "xdT" = ( /obj/effect/landmark/start/doctor, /turf/simulated/floor/plasteel{ @@ -100499,11 +101577,11 @@ }, /area/station/engineering/break_room) "xeQ" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/central/east) "xfI" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -100646,7 +101724,7 @@ icon_state = "0-8" }, /obj/structure/closet/crate/trashcart, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/public/storefront) "xhW" = ( @@ -100857,7 +101935,7 @@ /area/station/hallway/primary/aft/west) "xmz" = ( /obj/effect/spawner/random/fungus/probably, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/port) "xmL" = ( @@ -100867,11 +101945,30 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/station/science/genetics) +"xmU" = ( +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/spawner/random/dirt/often, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment/corner, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "bluecorner" + }, +/area/station/hallway/primary/fore/north) "xnc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -100886,6 +101983,13 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/port) +"xnq" = ( +/obj/effect/turf_decal/caution/stand_clear, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "xnz" = ( /obj/structure/flora/ausbushes/ywflowers, /mob/living/simple_animal/cow/betsy, @@ -100986,6 +102090,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "xpg" = ( @@ -101022,7 +102131,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "xpu" = ( @@ -101071,6 +102180,18 @@ icon_state = "cafeteria" }, /area/station/service/kitchen) +"xqE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_x = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/station/engineering/transmission_laser) "xqN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -101093,7 +102214,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_starboard) "xrn" = ( @@ -101217,7 +102338,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -101327,11 +102448,14 @@ icon_state = "white" }, /area/station/maintenance/apmaint) +"xvu" = ( +/turf/simulated/wall/r_wall, +/area/station/hallway/secondary/entry/west) "xvv" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -101388,7 +102512,7 @@ pixel_x = 9 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "xwy" = ( @@ -101627,7 +102751,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) "xyT" = ( @@ -101654,6 +102778,22 @@ icon_state = "white" }, /area/station/medical/patients_rooms) +"xyW" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/fore) "xza" = ( /obj/machinery/camera{ c_tag = "Xenobiology Chamber 7"; @@ -101702,7 +102842,7 @@ name = "Fore Asteroid Maintenance Access" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "xzA" = ( @@ -101846,7 +102986,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/white, /area/station/science/hallway) "xAV" = ( @@ -101915,6 +103055,11 @@ location = "EngineeringMiddle"; name = "navigation beacon (Engineering-Middle)" }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -101949,6 +103094,10 @@ icon_state = "dark" }, /area/station/engineering/control) +"xCh" = ( +/obj/structure/sign/electricshock, +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "xCu" = ( /obj/machinery/door/airlock/public/glass{ name = "Walkway" @@ -102129,6 +103278,9 @@ "xEp" = ( /turf/space, /area/shuttle/gamma/station) +"xEE" = ( +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "xEJ" = ( /obj/effect/turf_decal/delivery/hollow, /obj/machinery/shieldwallgen, @@ -102221,18 +103373,6 @@ }, /turf/simulated/floor/plasteel, /area/station/public/fitness) -"xGd" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating{ - icon_state = "asteroidplating" - }, -/area/station/maintenance/maintcentral) "xGs" = ( /obj/item/radio/intercom{ name = "east bump"; @@ -102285,7 +103425,7 @@ "xGC" = ( /obj/structure/closet/crate/internals, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkbrown" @@ -102403,28 +103543,6 @@ "xIa" = ( /turf/simulated/wall, /area/station/science/xenobiology) -"xIm" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment/corner, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/spawner/random_spawners/dirt_frequent, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "bluecorner" - }, -/area/station/hallway/primary/fore/north) "xIr" = ( /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt, @@ -102435,7 +103553,7 @@ /turf/simulated/floor/plating, /area/station/engineering/control) "xIB" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -102626,7 +103744,7 @@ dir = 8 }, /obj/machinery/firealarm/directional/west, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/public/locker) "xLj" = ( @@ -102712,7 +103830,7 @@ }, /area/station/medical/storage/secondary) "xNu" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -102945,11 +104063,11 @@ /turf/simulated/wall, /area/station/hallway/primary/central/west) "xQM" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "xQR" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -102964,7 +104082,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/power/apc/directional/north, /obj/structure/cable/orange{ d2 = 8; @@ -103133,7 +104251,7 @@ /obj/item/stack/ore/iron, /obj/item/stack/ore/iron, /obj/item/stack/ore/gold, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "xTb" = ( @@ -103376,7 +104494,7 @@ /area/station/security/prison/cell_block/A) "xWe" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "xWf" = ( @@ -103458,7 +104576,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -103499,7 +104617,7 @@ /area/station/hallway/primary/port/south) "xXu" = ( /obj/machinery/light, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -103593,6 +104711,11 @@ /area/shuttle/pod_1) "xYQ" = ( /obj/machinery/firealarm/directional/east, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -103723,6 +104846,11 @@ /area/station/security/lobby) "yaP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -103922,7 +105050,7 @@ /area/station/maintenance/asmaint) "yer" = ( /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -104005,7 +105133,7 @@ }, /area/station/supply/storage) "yfF" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/girder, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -104120,19 +105248,6 @@ icon_state = "white" }, /area/station/medical/patients_rooms) -"ygI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door_control{ - id = "medeva"; - name = "Medical EVA shutter control"; - pixel_y = 24; - req_one_access = list(19,41) - }, -/obj/effect/spawner/random_spawners/dirt_often, -/turf/simulated/floor/plating, -/area/station/hallway/primary/starboard/south) "ygS" = ( /obj/structure/table, /obj/machinery/light{ @@ -104202,7 +105317,7 @@ /area/station/hallway/primary/central/east) "yhM" = ( /obj/structure/closet, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -104506,6 +105621,19 @@ }, /turf/simulated/floor/plating, /area/station/hallway/primary/central/east) +"yll" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 10; + level = 2 + }, +/obj/effect/spawner/random/dirt/often, +/turf/simulated/floor/plating, +/area/station/hallway/primary/fore/north) "ylx" = ( /obj/machinery/door_control{ id = "MechbayShutters"; @@ -104546,7 +105674,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/public/locker) "ylX" = ( @@ -104570,7 +105698,7 @@ "ymf" = ( /obj/machinery/power/terminal, /obj/structure/cable, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_starboard) @@ -114510,7 +115638,7 @@ lrW whg gUw eHn -ohJ +eCI gUw xZV ljz @@ -117552,11 +118680,11 @@ vjL xaR lhM aEe -dsc +mKF kiv -dsc +rum kiv -dsc +qEx kiv dsc bHZ @@ -117809,11 +118937,11 @@ wzC eCI aXn xOy -dsc +lVz ybP -dsc +rum ybP -dsc +qEx ybP dsc bHZ @@ -124529,7 +125657,7 @@ lJR lJR btd pNE -mgq +vNz btd cEM eQC @@ -127032,7 +128160,7 @@ rNK hUU aXn bYq -pBd +iIH fuZ dQZ lHU @@ -133236,9 +134364,9 @@ aXR ozA cUl uio -nGZ -aZY -fms +quP +isQ +rbw jUL rRD bKz @@ -133752,7 +134880,7 @@ sgp gwb bDR bFa -bIi +nBK bIi bIi aCP @@ -135831,7 +136959,7 @@ bDR bDR bDR bHt -jgF +pGx ojN ojN ojN @@ -136345,7 +137473,7 @@ bXA bYe bDR kyo -oqB +bHt cRo kzf aXR @@ -137555,10 +138683,10 @@ aVd aVS duJ lfg -uOz +vPg fWE gPS -aFp +yll iFR jAb jZe @@ -137818,10 +138946,10 @@ aFp jZE iGc tjU -ilj +aZy ksP kKk -lmZ +ddm cHz cHz cHz @@ -137833,8 +138961,8 @@ cHz lSw aZk iow -ghk -pTM +foa +hES bbU uep aYJ @@ -138068,7 +139196,7 @@ cUa djc dmo dvR -ugQ +grh sGY aKp aKp @@ -138606,7 +139734,7 @@ mTR mTR mTR mTR -mTR +aZp mTR dqx mTR @@ -138644,8 +139772,8 @@ dgX bVT bPE aJc -wJe -coU +dEi +wkK cUm mVp mVp @@ -138654,8 +139782,8 @@ vME vME cUm mVp -gvo -xGd +wxd +wxd ppp wxd wxd @@ -138839,7 +139967,7 @@ aUH tpA eMh dwE -vuY +tiu ykC cWn gXb @@ -138899,9 +140027,9 @@ mlM cQf bNx lyF -bPF +bPG bQF -twg +trF bND bND bND @@ -138912,11 +140040,11 @@ fLT fLT dkk aQR -cUr -rgm -rgm -khM -hRN +eAS +eAS +eAS +mkk +fLT mJM mJM woy @@ -139125,7 +140253,7 @@ aYJ aYJ aYJ brf -bgf +aGc czV aYJ bhQ @@ -139353,7 +140481,7 @@ aVS aVS aVS aVA -vuY +tiu sGY aKp gXl @@ -139382,7 +140510,7 @@ kbl pKj aYJ lmP -bgf +aGc nQu trR bhQ @@ -139583,10 +140711,10 @@ rNK rNK rNK rNK -rNK -rNK -rNK -rNK +cTG +cCu +cTG +cTG rNK rNK rNK @@ -139639,7 +140767,7 @@ pXq bbu bdx emX -bgf +aGc buQ hCd bhQ @@ -139830,20 +140958,20 @@ rNK rNK rNK rNK -lez -fwi -rNK -rNK -rNK -rNK -rNK -rNK +oAO +dhy +oAO rNK rNK rNK rNK rNK rNK +vkd +hYQ +hYQ +hYQ +hYQ rNK rNK rNK @@ -139867,7 +140995,7 @@ abW abW aKp dxj -vuY +tiu qtB aKp gXL @@ -139896,7 +141024,7 @@ gIt bcH aYJ cLz -bgf +aGc buQ fBC bhQ @@ -139921,7 +141049,7 @@ bCX bhd bFo gbH -nOF +tgd nOF qMs ksU @@ -140088,19 +141216,19 @@ rNK rNK rNK oAO -dhy +oMU oAO +xkY +oAO +xkY +oAO +cRv rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK +xkY +wSn +wSn +wSn +pls cRv cRv cRv @@ -140118,13 +141246,13 @@ aVS aVS aVS abW -abW -abW -abW -abW -aKp +cMz +cMz +cMz +cMz +dmA dwg -vuY +tiu qtB aKp npV @@ -140153,7 +141281,7 @@ baR baR cmW fzb -bgf +aGc buQ aYJ bhQ @@ -140345,24 +141473,20 @@ rNK rNK rNK oAO -oMU -oAO +amt +anz +aof +aoE +apw +xkY xkY oAO -oAO -oAO -cRv -rNK -rHT -abE -cRv -abE -abE -cRv -abW -abW -abW -abW +xkY +gGQ +gGQ +arm +gKc +bcf abW abW abW @@ -140379,10 +141503,14 @@ abW abW abW abW -aKp +cMz +cRI +aBI +cVX +hDc dxt dQg -qtB +gAr fXC fXC fXC @@ -140410,7 +141538,7 @@ lCO tHC baR eQQ -bgf +aGc buQ aYJ bhQ @@ -140492,7 +141620,7 @@ hKz oeQ ayb ayb -xcc +rNK rNK rNK ayb @@ -140602,20 +141730,20 @@ rNK rNK rNK oAO -amt -anz -aof -aoE -apw -aqT -cMH -cRv -ivS -cRv -cRv -cRv -cRv -cRv +sDk +obB +aog +vYQ +nWh +iuD +osN +xkY +gGQ +cIe +nnR +aru +rBk +kvL abW abW abW @@ -140633,10 +141761,10 @@ abW abW abW cMz -cMz -cMz -cMz -cMz +cRT +bIl +bIl +dmA dxw dTI qtB @@ -140667,7 +141795,7 @@ kok dqp baR eQQ -bgf +aGc bgg aYJ dcG @@ -140692,7 +141820,7 @@ bhd bhd bFy bHe -nOF +tgd nOF nOF bMk @@ -140749,19 +141877,6 @@ hKz oeQ ayb rNK -xcc -rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK rNK rNK rNK @@ -140778,22 +141893,35 @@ rNK rNK rNK rNK -lez -fwi -rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK -rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +lez +fwi +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK rNK rNK rNK @@ -140859,44 +141987,44 @@ rNK rNK rNK oAO -sDk -obB -aog -vYQ -aog -arm -dQr -cDp -cMH -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW +mco +anB +wUc +vIp +tNQ +tZW +iOP +atC +xdO +qUN +cMh +oLU +aWH +iDF +bvB +bqj +bvD +rBk +rUq +uPs +rBk +rBk +vPY +wlG +wUI +wlG +wUI +qGM abW abW cMz -cRI -aBI -cVX -dmC -dxx -dTM -wyo +cRT +aTb +rjd +dmA +dyD +tiu +qtB hli gZI hVQ @@ -140924,7 +142052,7 @@ eOx gJw uNN tfR -bgf +aGc buQ aYJ bhR @@ -140949,7 +142077,7 @@ lzH bhd bFz bHe -nOF +tgd nOF nOF eWS @@ -141006,7 +142134,7 @@ hKz uVb rNK rNK -xcc +rNK rNK rNK rNK @@ -141116,40 +142244,40 @@ rNK rNK rNK oAO -mco -anB -wUc -vIp -tNQ -aru -iOP -atC -uPs -vdv -uBs -cMH -aWH -bcf -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW +aoH +anC +hLv +anC +qtu +anC +anC +anC +anC +anC +anC +oAO abW +lEk +bVM +aWv +bjY +gKc +aQq +gKc +oIf +dQr +gGz +gKc +gKc +gKc +dQr +gnt +mJn abW cMz -cRT -bIl -bIl +dGA +eDi +djn dmA dyC dWE @@ -141181,7 +142309,7 @@ dqp ube baR eQQ -bgf +aGc buQ aYJ dwz @@ -141260,10 +142388,10 @@ oeQ hrd qyP hKz -oeQ +nIW +rNK rNK rNK -xcc rNK rNK rNK @@ -141372,44 +142500,44 @@ rNK rNK rNK rNK +xkY +qKz +qKz +xkY +oAO +ivS +cRv +cRv +cRv +cRv +cRv +apW oAO -aoH -anC -anC -aoF -oPQ -aqT -cMH -atD -gKc -axj -rBk -aNP -aTL -cmN -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW abW -cMz -cRT -aTb -rjd +uBs +aWH +bqQ +aMj +vpg +aMj +bjY +amB +ubX +atv +dtN +jPy +iDW +czt +axi +xyW +cMH +flF +cSh +naY +djv dmA dyD -vuY +tiu qtB nXZ hbW @@ -141438,7 +142566,7 @@ vQV vRp baR eQQ -bgf +uFg bgi eHf dDR @@ -141514,13 +142642,13 @@ rNK rNK rNK oeQ -hrd +qga qyP hKz -oeQ +nIW +rNK rNK rNK -xcc rNK rNK rNK @@ -141629,44 +142757,44 @@ rNK rNK rNK rNK -xkY -qKz -qKz -aqT -amu -anB -acK -wSn -aqT -aqT -qKz +lzH +lzH +lzH qKz -aqT -tDU -snX -bvB -bqj -bvD -rBk -rUq -uPs -rBk -rBk -rBk -rUq -uPs -rUq -uPs -axi -abW +oAO +cRv +cRv +lzH +cRv +rNK +rNK +oMU +oAO abW +cDp +cMH +uBs +pls +pls +bNM +atD +cJJ +dRN +ptz +dCr +cpQ +fce +czu +jPy +pRX +sYd +flF +lbU +nAM cMz -dGA -eDi -djn dmA eua -vuY +tiu pwc fXC hbZ @@ -141774,10 +142902,10 @@ oeQ hrd qyP hKz -oeQ +nIW +rNK rNK rNK -xcc rNK rNK rNK @@ -141886,44 +143014,44 @@ rNK rNK rNK rNK +rNK +rNK lzH +oAO lzH +rNK +rNK lzH -qKz -qxA -qtu -anC -anC -anC -oXd -anC -anC +ivS +rNK +rNK +apX oAO -vpg -lEk -bVM -aWv -bjY -gKc -dQr -gKc -dQr -dQr -aQq -gKc -gKc -gKc -dQr -aRc -mJn +abW +abW +xEE +xEE +xEE +xEE +xEE +xEE +xEE +pnu +iVV +pls +pls cMH -flF -cSh -naY -djv -dmA -uRS -vuY +cDp +pls +eUJ +rzv +oyJ +ltw +kzw +wlG +ksq +vyR +tiu qtB gch gch @@ -142031,10 +143159,10 @@ uwf vWN rOM xBI -uwf +uVb +rNK rNK rNK -xcc rNK rNK rNK @@ -142146,41 +143274,41 @@ rNK rNK rNK lzH -oAO -oAO -ivS -cRv -cRv -cRv -cRv -cRv -apW -oAO +lzH +lzH +rNK +rNK +rNK +rNK +rNK +aRh +fwi +rNK +rNK +xEE +uIg +xqE +ozX +iJS +hEZ +lvG +pTm +ncz +iVV +pls abW -uBs -aWH -bqQ -aMj -vpg -vpg -bjY -cDp -czu -aMj -vpg -gKc -vpg -czt -qbE -gKc -dQr -flF -flF -sSq -cMz -dmA -dwg -syo +abW +abW +abW +pls +jJo +kiG +uLC +jpD +wjr +iPd +gAg +oyu eJV gch hdE @@ -142288,10 +143416,10 @@ qHn jqW koo mqR -qHn -lzH -lzH -xcc +xvu +rNK +rNK +rNK rNK rNK rNK @@ -142402,41 +143530,41 @@ rNK rNK rNK rNK -lzH -lzH -oAO +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +aRh +fwi +rNK +rNK +fYw +quW +cPS +fDs +fDs +wZq +jVu +bmG +uLG +tgp +cRv +cRv cRv cRv -lzH cRv -rNK -rNK -oMU -oAO -abW cDp -cMH -uBs -pls -pls -bNM -atD -pls -cMH -pls -pls -cpQ -vpg -czu -axj -rUq -rBk -rBk -bvD -aKC -rUq -rLu -xIm +cDp +cDp +cDp +cDp +cDp +aKp +xmU pqi oPw ldo @@ -142545,10 +143673,10 @@ qHn abZ dbg mqR -qHn +xvu +rNK rNK rNK -xcc rNK rNK rNK @@ -142660,39 +143788,39 @@ dcv rNK rNK rNK -lzH -lzH rNK rNK -lzH -ivS rNK rNK -apX -oAO -abW -abW -abW -abW -abW -pls -pls -pls -abW -abW -abW -pls -pls -cMH -cDp -pls -cDp -aWH -aQq -bjY -nHR -dQr -kPs +rNK +rNK +rNK +hiC +tah +rNK +rNK +kUW +xnq +fDs +fDs +fDs +wZq +cac +xEE +uVK +uVK +cRv +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +aKp vml cwJ gDe @@ -142927,26 +144055,26 @@ rNK aRh fwi rNK -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -pls -cMH -cMH -pls +rNK +xCh +quW +cPS +fDs +dRV +kab +tsn +xEE +cRv +cRv +cRv +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK npV aKp aKp @@ -143184,26 +144312,26 @@ rNK aRh fwi rNK +rNK +xEE +hXG +gmx +mrS +qkl +clv +xEE cRv cRv -cRv -cRv -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -abW -rBH -abW +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +dmA +npV npV djH dmY @@ -143442,23 +144570,23 @@ aRh fwi rNK rNK -vva -vva -cRv +xEE +xEE +xEE +ucv +xEE +xEE +xEE cRv -cRv -abW -abW -abW -abW -abW -abW -cRv -cRv -cRv -cRv -abW -abW +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK dmA npV npV @@ -143700,22 +144828,22 @@ fwi rNK rNK rNK -vva -vva -vva -cRv -cRv -abW -cRv -cRv -cRv -cRv -cRv rNK -vva -cRv -cRv -abW +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK dmA cSi cSj @@ -143958,21 +145086,21 @@ rNK rNK rNK rNK -vva -vva -vva -cRv -cRv -cRv rNK -abW -abW rNK rNK -vva -vva -cRv -abW +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK +rNK dmA cSp cWx @@ -144209,8 +145337,11 @@ rNK rNK rNK rNK -hiC -tah +aRh +fwi +rNK +rNK +rNK rNK rNK rNK @@ -144227,11 +145358,8 @@ rNK rNK rNK rNK -vva -cRv -cRv dmA -cSk +cWz cWz uZw aKp @@ -144484,9 +145612,9 @@ rNK rNK rNK rNK -vva -vva -cRv +rNK +rNK +rNK dmA cSm ckx @@ -144742,8 +145870,8 @@ rNK rNK rNK rNK -vva -cRv +rNK +rNK dmA uts ieC @@ -145503,7 +146631,7 @@ rNK ahF ahF ahF -ahF +rNK rNK rNK rNK @@ -146536,7 +147664,7 @@ rRM aaf aaf aaf -ahF +rNK rNK rNK rNK @@ -148404,7 +149532,7 @@ ybZ qGg ljb wZv -ygI +eGK kNw rcX mTZ @@ -161429,9 +162557,9 @@ rNK rNK rNK aoR -aqT -aqT -aqT +oLU +oLU +oLU aoR aoR xBm @@ -162757,7 +163885,7 @@ gGU hbP mDp siF -mnU +rFa scq oaE lCC diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index fbdb6239c85f5..76bf74be618b9 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -215,9 +215,6 @@ icon_state = "dark" }, /area/station/security/execution) -"adb" = ( -/turf/simulated/wall, -/area/station/hallway/secondary/entry/west) "add" = ( /turf/simulated/wall/mineral/titanium, /area/shuttle/pod_1) @@ -248,49 +245,64 @@ }, /area/station/hallway/primary/central) "adt" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/effect/spawner/airlock/s_to_n, +/turf/simulated/wall, +/area/station/hallway/secondary/entry/south) "adu" = ( -/obj/machinery/atmospherics/portable/canister/air, -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) -"adx" = ( -/obj/machinery/status_display{ - pixel_x = 32 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/chair/comfy/shuttle{ +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/ai_status_display{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/south) +"adx" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_1) +/obj/item/radio/intercom{ + name = "south bump"; + pixel_y = -28 + }, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/north) "adL" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/wall/mineral/titanium, -/area/shuttle/pod_1) +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/east) "adN" = ( -/turf/simulated/wall/r_wall, -/area/station/hallway/secondary/entry/north) -"adO" = ( -/obj/item/radio/intercom{ - name = "east bump"; - pixel_x = 28 +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/chair/comfy/shuttle{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_1) +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/north) +"adO" = ( +/obj/structure/marker_beacon/dock_marker, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "adU" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -308,60 +320,51 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/virology) "adZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/firealarm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/south) "aea" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, /area/station/hallway/secondary/entry/lounge) "aeb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/north) "aec" = ( -/obj/item/kirbyplants, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/closet/crate, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "brown" }, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "aed" = ( -/obj/docking_port/mobile/pod{ - id = "pod1"; - name = "escape pod 1" - }, -/obj/machinery/door/airlock/titanium{ - id_tag = "s_docking_airlock"; - name = "Escape Pod Hatch" - }, -/obj/structure/fans/tiny, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/pod_1) +/obj/structure/table, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry/east) "aee" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1 +/obj/structure/window/basic{ + dir = 8 }, -/turf/simulated/floor/plating/airless, -/area/shuttle/arrival/station) +/obj/structure/window/basic, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/ausbushes/reedbush, +/obj/structure/flora/ausbushes/grassybush, +/turf/simulated/floor/grass/no_creep, +/area/station/hallway/secondary/entry/north) "aef" = ( -/obj/machinery/door/airlock/external{ - id_tag = "admin_home"; - locked = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/east) "aek" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave, @@ -375,29 +378,32 @@ /turf/space, /area/space/nearstation) "aey" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" }, -/turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) "aez" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/station/hallway/secondary/entry/north) -"aeA" = ( -/obj/machinery/light/small{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, -/turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) +"aeA" = ( +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/wood, +/area/station/hallway/secondary/entry/east) "aeC" = ( /obj/machinery/light/small{ dir = 1 @@ -410,13 +416,17 @@ /turf/simulated/floor/wood, /area/station/medical/psych) "aeI" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ +/obj/structure/window/basic{ + dir = 1 + }, +/obj/structure/window/basic{ dir = 8 }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/ausbushes/pointybush, +/turf/simulated/floor/grass/no_creep, +/area/station/hallway/secondary/entry/north) "aeJ" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -438,25 +448,48 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/east) "aeN" = ( -/turf/simulated/floor/plating, -/area/station/hallway/secondary/entry/west) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/south) "aeO" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/atmospherics/unary/portables_connector{ dir = 4 }, -/obj/item/radio/intercom{ - name = "east bump"; - pixel_x = 28 +/obj/machinery/atmospherics/portable/canister/air, +/obj/structure/sign/vacuum/external{ + pixel_y = 32 }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/south) "aeP" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/external, -/obj/effect/turf_decal/stripes/line, -/turf/simulated/floor/plasteel, +/obj/structure/sign/vacuum/external{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, /area/station/hallway/secondary/entry/north) "aeQ" = ( /obj/docking_port/mobile/pod{ @@ -490,18 +523,21 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_4) "afb" = ( -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/north) -"afc" = ( -/obj/structure/sign/pods{ - pixel_x = -32 +/obj/machinery/door/airlock/external, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, /obj/effect/turf_decal/stripes/line{ - dir = 9 + dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) +"afc" = ( +/obj/machinery/alarm/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/south) "afd" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -528,21 +564,15 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/solar_maintenance/fore_starboard) "afh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/east) "afj" = ( -/obj/item/kirbyplants, -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/structure/chair/sofa/bench/left{ + dir = 1 }, -/obj/item/radio/intercom{ - name = "east bump"; - pixel_x = 28 +/turf/simulated/floor/plasteel{ + icon_state = "barber" }, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) "afk" = ( /obj/item/kirbyplants, @@ -641,14 +671,13 @@ }, /area/station/hallway/secondary/entry/east) "afJ" = ( -/obj/machinery/status_display{ - pixel_x = -32 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/south) "afL" = ( /turf/simulated/floor/plasteel/white, /area/station/science/misc_lab) @@ -693,62 +722,44 @@ /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_starboard) "agd" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/chair/sofa/bench, +/obj/effect/landmark/start/assistant, +/turf/simulated/floor/plasteel{ + icon_state = "barber" }, -/obj/machinery/alarm/directional/west, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/north) "age" = ( -/obj/structure/sign/vacuum{ - pixel_x = -32 +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/light{ + dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/south) "agg" = ( -/obj/machinery/status_display{ - pixel_x = -32 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/north) "agh" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Arrivals Center Fore"; - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/docking_port/stationary{ + dwidth = 2; + height = 11; + id = "specops_home"; + name = "port bay 2"; + width = 5 }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/north) +/turf/space, +/area/space) "agk" = ( -/obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "arrival" }, -/turf/simulated/floor/plating/airless, -/area/shuttle/arrival/station) +/area/station/hallway/secondary/entry/north) "ago" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, @@ -782,34 +793,34 @@ }, /area/station/hallway/secondary/entry/east) "agA" = ( -/obj/structure/sign/vacuum{ - pixel_x = -32 +/obj/structure/chair{ + dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/assistant, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" }, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "agB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/structure/chair{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/effect/landmark/start/assistant, +/turf/simulated/floor/plasteel{ + icon_state = "barber" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/south) "agC" = ( -/obj/structure/sign/vacuum{ - pixel_x = 32 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/item/radio/intercom{ + name = "north bump"; + pixel_y = 28 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" }, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) "agD" = ( /turf/simulated/wall/mineral/titanium/nodiagonal, @@ -828,45 +839,71 @@ }, /area/station/hallway/secondary/entry/east) "agJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/ai_status_display{ + pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/north) +"agT" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, /area/station/hallway/secondary/entry/north) -"agT" = ( -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/hardhat/orange, -/obj/item/clothing/head/hardhat/orange, -/obj/structure/closet/crate/internals, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) "agU" = ( -/obj/structure/closet/wardrobe/mixed, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/north) "agV" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/emergency, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) +/obj/structure/sign/pods, +/turf/simulated/wall, +/area/station/maintenance/fore2) "agW" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/north) "agX" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, +/obj/machinery/ai_status_display{ + pixel_x = 32 + }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "agZ" = ( @@ -886,12 +923,15 @@ }, /area/station/medical/storage/secondary) "ahg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/area/station/hallway/secondary/entry/west) +/obj/machinery/door/airlock/external{ + id_tag = "admin_home"; + locked = 1 + }, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/north) "ahh" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -899,59 +939,49 @@ }, /area/station/maintenance/fsmaint) "ahi" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, +/obj/machinery/economy/vending/cola, +/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ - icon_state = "neutralfull" + dir = 8; + icon_state = "arrival" }, -/area/station/hallway/secondary/entry/east) +/area/station/hallway/secondary/entry/north) "ahm" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop, /turf/simulated/floor/plasteel/dark, /area/station/command/office/cmo) -"ahz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +"ahn" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/door/airlock/external{ - id_tag = "ferry_home"; - locked = 1 +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/north) +/area/station/engineering/control) +"ahz" = ( +/obj/structure/sign/nanotrasen, +/obj/effect/mapping_helpers/turfs/rust, +/turf/simulated/wall, +/area/station/hallway/secondary/entry/east) "ahA" = ( -/obj/machinery/door/airlock/external{ - name = "Arrival Airlock" +/obj/structure/chair{ + dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/newscaster{ + dir = 8; + name = "east bump"; + pixel_x = 28 + }, +/obj/effect/landmark/start/assistant, +/turf/simulated/floor/plasteel{ + icon_state = "barber" }, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) "ahB" = ( -/obj/machinery/door/airlock/titanium{ - id_tag = "s_docking_airlock" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/fans/tiny, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/mineral/titanium, /area/shuttle/arrival/station) "ahC" = ( /turf/simulated/floor/mineral/titanium/blue, @@ -972,56 +1002,54 @@ /turf/simulated/floor/engine, /area/station/engineering/controlroom) "ahE" = ( -/obj/machinery/door/airlock/titanium{ - id_tag = "s_docking_airlock" +/obj/machinery/camera{ + c_tag = "Arrivals Fore Central"; + dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "arrival" }, -/obj/structure/fans/tiny, -/turf/simulated/floor/plasteel, -/area/shuttle/arrival/station) +/area/station/hallway/secondary/entry/north) "ahF" = ( -/obj/machinery/door/airlock/external{ - name = "Arrival Airlock" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/east) +/area/station/hallway/secondary/entry/north) "ahQ" = ( -/obj/machinery/airlock_controller/air_cycler{ - pixel_y = -25; - vent_link_id = "enginen_vent"; - ext_door_link_id = "enginen_door_ext"; - int_door_link_id = "enginen_door_int"; - ext_button_link_id = "enginen_btn_ext"; - int_button_link_id = "enginen_btn_int" - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - autolink_id = "enginen_vent" +/obj/structure/chair/sofa/bench/right, +/turf/simulated/floor/plasteel{ + icon_state = "barber" }, -/turf/simulated/floor/plating, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/south) "ahV" = ( -/obj/item/kirbyplants, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) +/obj/structure/window/basic, +/obj/structure/window/basic{ + dir = 4 + }, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/flora/ausbushes/leafybush, +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/grass/no_creep, +/area/station/hallway/secondary/entry/north) "ahW" = ( -/obj/machinery/light, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) -"aik" = ( -/obj/machinery/light{ +/obj/structure/chair/sofa/bench{ dir = 1 }, -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/turf/simulated/floor/plasteel{ + icon_state = "barber" + }, +/area/station/hallway/secondary/entry/north) +"aik" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/closet/crate, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/station/hallway/secondary/entry/east) "ail" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -1030,33 +1058,18 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aim" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/effect/landmark/spawner/late/crew, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) -"aio" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/item/kirbyplants, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/north) -"aip" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/effect/turf_decal/delivery/hollow, +/obj/effect/spawner/random/storage, +/obj/item/storage/box/donkpockets, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) -"ait" = ( -/obj/machinery/economy/atm/directional/south, +"aio" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /obj/structure/cable{ d1 = 4; @@ -1064,43 +1077,77 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/south) +"aip" = ( +/obj/machinery/ai_status_display{ + pixel_y = 32 + }, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/closet/emcloset, +/obj/structure/sign/vacuum/external{ + pixel_x = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 9; icon_state = "arrival" }, +/area/station/hallway/secondary/entry/north) +"ait" = ( +/obj/structure/chair/sofa/bench, +/obj/effect/landmark/start/assistant, +/turf/simulated/floor/plasteel{ + icon_state = "barber" + }, /area/station/hallway/secondary/entry/south) "aiE" = ( -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock" + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/arrival/station) "aiF" = ( /obj/structure/chair{ - dir = 8 + dir = 4 }, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "brown" + }, +/area/station/hallway/secondary/entry/east) "aiG" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/stalkybush, -/obj/structure/window/full/shuttle, -/turf/simulated/floor/grass/no_creep, -/area/shuttle/arrival/station) -"aiH" = ( /obj/structure/chair{ dir = 4 }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/north) +/obj/machinery/newscaster{ + dir = 4; + name = "west bump"; + pixel_x = -28 + }, +/turf/simulated/floor/plasteel{ + icon_state = "barber" + }, +/area/station/hallway/secondary/entry/south) +"aiH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/south) "aiI" = ( -/obj/structure/chair{ - dir = 8 +/obj/machinery/ai_status_display{ + pixel_y = 32 }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/south) "aiL" = ( /obj/structure/chair{ dir = 4 @@ -1112,23 +1159,19 @@ /turf/simulated/floor/carpet/black, /area/station/service/chapel) "aiX" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/north) +/obj/structure/closet/wardrobe/mixed, +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/arrival/station) "ajd" = ( -/obj/item/beacon, -/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "ajf" = ( -/obj/structure/closet/firecloset, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/south) "ajq" = ( /obj/structure/cable{ d2 = 4; @@ -1143,22 +1186,22 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) "ajy" = ( -/obj/item/kirbyplants, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/north) +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/rack, +/obj/item/storage/secure/briefcase, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/arrival/station) "ajD" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/toy/figure/crew/assistant, +/obj/structure/computerframe{ + dir = 8 + }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "ajF" = ( -/obj/structure/table/reinforced, -/obj/item/folder, -/obj/item/storage/bag/dice, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) +/obj/structure/table, +/obj/effect/spawner/random/food_trash, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry/east) "ajI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1206,16 +1249,21 @@ }, /area/station/maintenance/fore2) "ajX" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 11; - id = "specops_home"; - name = "port bay 2"; - width = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/turf/space, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/east) "ajY" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1225,33 +1273,36 @@ }, /area/station/maintenance/fore2) "ajZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/chair{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "neutralfull" + icon_state = "barber" }, /area/station/hallway/secondary/entry/north) "aka" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) +/obj/structure/chair/stool, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/east) "akb" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/alarm/directional/east, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "arrival" }, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "akw" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) +/area/shuttle/pod_1) "akx" = ( /obj/structure/closet/wardrobe/black, /turf/simulated/floor/mineral/titanium/blue, @@ -1265,20 +1316,16 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "akA" = ( -/obj/structure/table/reinforced, -/obj/item/storage/secure/briefcase, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) +/obj/effect/mapping_helpers/turfs/rust, +/turf/simulated/wall, +/area/station/hallway/secondary/entry/east) "akB" = ( /turf/simulated/wall/r_wall, /area/station/maintenance/fore2) "akG" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "arrival" - }, -/area/station/hallway/secondary/entry/south) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry/east) "akQ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -1288,130 +1335,120 @@ /turf/simulated/floor/plating, /area/station/supply/break_room) "akY" = ( -/obj/machinery/status_display, -/turf/simulated/wall/mineral/titanium, -/area/shuttle/arrival/station) -"akZ" = ( -/obj/machinery/door/airlock/titanium{ - id_tag = "s_docking_airlock" +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/closet/firecloset, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) -"ala" = ( -/obj/machinery/ai_status_display, -/turf/simulated/wall/mineral/titanium, -/area/shuttle/arrival/station) -"alk" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/area/station/hallway/secondary/entry/east) +"akZ" = ( +/obj/structure/sign/pods, /turf/simulated/wall, -/area/station/maintenance/fore2) -"alm" = ( +/area/station/hallway/secondary/entry/east) +"ala" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, +/area/station/hallway/secondary/entry/south) +"alk" = ( +/obj/effect/mapping_helpers/turfs/rust/maybe, +/turf/simulated/wall, +/area/station/maintenance/fore2) +"alm" = ( /obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "arrival" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/south) "als" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/camera{ + c_tag = "Arrivals Aft Starboard"; + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, -/area/station/hallway/secondary/entry/south) +/area/station/hallway/secondary/entry/east) "alt" = ( -/obj/structure/sign/vacuum{ - pixel_x = 32 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/north) -"alv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /obj/machinery/light/small{ - dir = 1 + dir = 8 }, -/turf/simulated/floor/mineral/titanium/blue, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/east) +"alv" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/turf/simulated/floor/plating, /area/shuttle/arrival/station) "alw" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) -"alx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel{ + icon_state = "arrivalcorner"; + dir = 4 }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/area/station/hallway/secondary/entry/north) +"alx" = ( +/obj/machinery/status_display{ + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, /area/station/hallway/secondary/entry/south) "aly" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Arrivals Center Aft"; +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) "alG" = ( -/obj/machinery/status_display{ - pixel_x = -32 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/camera{ - c_tag = "Arrivals Aft Starboard"; - dir = 4; - pixel_y = -22 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "alH" = ( -/obj/structure/computerframe, -/turf/simulated/floor/mineral/titanium/blue, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/closet/crate/internals, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest, +/turf/simulated/floor/mineral/titanium, /area/shuttle/arrival/station) "alJ" = ( /obj/structure/closet/emcloset, @@ -1561,27 +1598,35 @@ }, /area/station/medical/morgue) "amz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "arrival" }, -/obj/machinery/power/apc/important/directional/west, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "amA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/north) "amB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/firealarm/directional/east, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "arrival" + }, /area/station/hallway/secondary/entry/east) "amC" = ( /obj/machinery/light/small, @@ -1637,21 +1682,16 @@ }, /area/station/maintenance/fore2) "amL" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/south) +/turf/simulated/floor/plasteel{ + icon_state = "arrivalcorner"; + dir = 1 + }, +/area/station/hallway/secondary/entry/east) "amM" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/delivery, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/chair/sofa/bench, +/turf/simulated/floor/plasteel{ + icon_state = "barber" }, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/south) "amN" = ( /obj/structure/sign/pods, @@ -1735,10 +1775,14 @@ }, /area/station/maintenance/fore2) "ani" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - dir = 9; + dir = 1; icon_state = "arrival" }, /area/station/hallway/secondary/entry/south) @@ -1748,10 +1792,29 @@ }, /area/station/hallway/primary/aft/south) "anl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "arrival" + icon_state = "neutralfull" }, /area/station/hallway/secondary/entry/south) "ann" = ( @@ -1764,17 +1827,22 @@ }, /area/station/hallway/secondary/entry/south) "anp" = ( -/obj/machinery/camera{ - c_tag = "Arrivals Hall Center" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/structure/cable{ - d2 = 2; - icon_state = "0-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/power/apc/important/directional/north, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "arrival" + icon_state = "neutralfull" }, /area/station/hallway/secondary/entry/south) "anr" = ( @@ -1788,18 +1856,9 @@ /turf/simulated/floor/plating, /area/station/supply/qm) "ans" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 28 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "arrival" - }, -/area/station/hallway/secondary/entry/south) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/catwalk, +/area/station/hallway/secondary/entry/east) "ant" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -1807,23 +1866,16 @@ }, /area/station/hallway/secondary/entry/south) "anu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/south) +/obj/structure/marker_beacon/dock_marker/collision, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space/nearstation) "anv" = ( /turf/simulated/floor/plasteel{ dir = 5; icon_state = "arrival" }, -/area/station/hallway/secondary/entry/south) +/area/station/hallway/secondary/entry/east) "any" = ( /turf/simulated/wall/r_wall, /area/station/science/explab/chamber) @@ -1833,8 +1885,10 @@ dir = 4 }, /obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/south) +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/east) "anA" = ( /obj/structure/table/reinforced, /obj/item/food/meat/slab{ @@ -1874,128 +1928,53 @@ /turf/simulated/floor/plasteel/white, /area/station/science/rnd) "anJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "arrival" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/south) "anK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/item/radio/intercom{ - name = "south bump"; - pixel_y = -28 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "arrival" +/obj/structure/window/basic{ + dir = 8 }, +/obj/structure/window/basic, +/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/pointybush, +/turf/simulated/floor/grass/no_creep, /area/station/hallway/secondary/entry/south) "anL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, /area/station/hallway/secondary/entry/south) "anO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "arrival" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/south) "anP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/firealarm/directional/south, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, /area/station/hallway/secondary/entry/south) "anQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel/white/corner{ +/turf/simulated/floor/plasteel{ + icon_state = "arrivalcorner"; dir = 8 }, /area/station/hallway/secondary/entry/south) "anR" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/hallway/secondary/entry/south) +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/east) "anT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2013,63 +1992,25 @@ }, /area/station/hallway/secondary/entry/south) "anU" = ( -/obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/landmark/lightsout, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/area/station/hallway/secondary/entry/south) +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/north) "anW" = ( -/obj/machinery/camera{ - c_tag = "Arrivals Hall Starboard"; - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, -/area/station/hallway/secondary/entry/south) +/area/station/hallway/secondary/entry/east) "anX" = ( /obj/structure/extinguisher_cabinet{ name = "south bump"; pixel_y = -30 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, -/area/station/hallway/secondary/entry/south) +/area/station/hallway/secondary/entry/east) "anY" = ( /turf/simulated/floor/plasteel{ icon_state = "arrival" @@ -2080,7 +2021,7 @@ dir = 6; icon_state = "arrival" }, -/area/station/hallway/secondary/entry/south) +/area/station/hallway/secondary/entry/east) "aoa" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/condiment/saltshaker, @@ -2119,8 +2060,10 @@ pixel_x = 28 }, /obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/south) +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/east) "aof" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/white/side, @@ -2203,8 +2146,7 @@ "aoA" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" + icon_state = "arrival" }, /area/station/hallway/secondary/entry/south) "aoB" = ( @@ -2371,10 +2313,6 @@ "apg" = ( /obj/item/kirbyplants, /obj/machinery/firealarm/directional/north, -/obj/machinery/keycard_auth{ - pixel_x = 24; - pixel_y = 24 - }, /obj/machinery/light_switch{ dir = 8; name = "east bump"; @@ -2392,13 +2330,17 @@ /turf/simulated/floor/plasteel/white, /area/station/maintenance/fore2) "api" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "bluecorner" + icon_state = "neutralfull" }, -/area/station/hallway/secondary/entry/south) +/area/station/hallway/secondary/entry/north) "apj" = ( /obj/machinery/ai_status_display, /turf/simulated/wall, @@ -2508,12 +2450,11 @@ }, /area/station/hallway/secondary/entry/lounge) "apv" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel{ - icon_state = "redcorner" +/obj/structure/shuttle/engine/propulsion{ + dir = 8 }, -/area/station/hallway/secondary/entry/south) +/turf/simulated/floor/plating, +/area/shuttle/arrival/station) "apw" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -2552,6 +2493,15 @@ dir = 1 }, /area/station/maintenance/fore2) +"apB" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "caution" + }, +/area/station/engineering/transmission_laser) "apF" = ( /obj/machinery/power/tracker, /obj/structure/cable{ @@ -2877,7 +2827,7 @@ /obj/structure/table/wood, /obj/item/storage/briefcase, /obj/item/taperecorder, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/electrical_shop) "aqC" = ( @@ -3115,7 +3065,7 @@ }, /area/station/maintenance/fore2) "are" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fore2) "arf" = ( @@ -3173,7 +3123,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/electrical_shop) "arr" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/electrical_shop) "ars" = ( @@ -3183,7 +3133,7 @@ /obj/structure/chair/comfy/brown{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/electrical_shop) "aru" = ( @@ -3212,7 +3162,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/electrical_shop) "arw" = ( @@ -3918,7 +3868,7 @@ /area/station/maintenance/electrical_shop) "ath" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/electrical_shop) "ati" = ( @@ -3972,7 +3922,7 @@ /area/station/maintenance/fore) "atr" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fore) "ats" = ( @@ -3982,7 +3932,7 @@ "att" = ( /obj/structure/table/wood, /obj/item/reagent_containers/drinks/drinkingglass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fore) "atu" = ( @@ -3991,7 +3941,7 @@ }, /obj/effect/decal/cleanable/cobweb, /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fore) "atv" = ( @@ -4489,7 +4439,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/disposal) "auE" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/disposal) "auF" = ( @@ -4532,7 +4482,7 @@ /turf/simulated/floor/plating, /area/station/engineering/controlroom) "auL" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/electrical_shop) "auM" = ( @@ -4550,7 +4500,7 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fore) "auP" = ( @@ -5299,7 +5249,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fore2) "awx" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/security/checkpoint/secondary) "awA" = ( @@ -5412,7 +5362,7 @@ /area/station/maintenance/fore) "awW" = ( /obj/effect/spawner/random/fungus/frequent, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fore) "awX" = ( @@ -5435,7 +5385,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fore2) "awZ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/service/janitor) "axb" = ( @@ -5885,7 +5835,7 @@ /obj/item/camera_film, /obj/structure/table/wood, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fore) "ayh" = ( @@ -6091,7 +6041,7 @@ /turf/simulated/floor/engine, /area/station/engineering/controlroom) "ayW" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fore) "ayX" = ( @@ -6592,7 +6542,7 @@ /obj/structure/chair/comfy/brown{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fore) "aAq" = ( @@ -7428,7 +7378,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fore) "aCu" = ( @@ -7905,7 +7855,7 @@ }, /area/station/service/chapel) "aDH" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fore) "aDI" = ( @@ -8499,16 +8449,11 @@ /turf/simulated/wall, /area/station/service/bar) "aFB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/area/station/hallway/secondary/entry/east) +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/north) "aFC" = ( /obj/structure/extinguisher_cabinet{ name = "east bump"; @@ -11246,7 +11191,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/bar) "aMY" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/gambling_den) "aMZ" = ( @@ -11688,7 +11633,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/gambling_den) "aOu" = ( @@ -12198,7 +12143,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/gambling_den) "aPN" = ( @@ -12239,7 +12184,7 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/art) "aPT" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/space/nearstation) "aPU" = ( @@ -12867,7 +12812,7 @@ "aRu" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ dir = 10; icon_state = "darkblue" @@ -13326,14 +13271,14 @@ /turf/simulated/floor/plating, /area/station/maintenance/gambling_den) "aSP" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/gambling_den) "aSQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/gambling_den) "aSR" = ( @@ -14055,7 +14000,7 @@ /area/station/maintenance/gambling_den) "aUq" = ( /obj/structure/chair/stool, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/gambling_den) "aUs" = ( @@ -14679,7 +14624,7 @@ }, /area/station/engineering/atmos) "aVK" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/fore) "aVN" = ( @@ -16119,7 +16064,7 @@ }, /area/station/supply/storage) "aZu" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/maintenance/fsmaint) "aZv" = ( @@ -17166,7 +17111,7 @@ /area/station/engineering/atmos) "bcb" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fore) "bcc" = ( @@ -18404,7 +18349,7 @@ /area/station/supply/miningdock) "bfL" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/grass/jungle, /area/station/maintenance/fsmaint) "bfN" = ( @@ -18598,7 +18543,7 @@ /turf/simulated/wall, /area/station/maintenance/starboard2) "bgt" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/starboard2) "bgv" = ( @@ -20429,16 +20374,24 @@ /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "blc" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, /area/station/hallway/secondary/entry/north) "bld" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/status_display{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "arrival" }, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "ble" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -22706,7 +22659,7 @@ /turf/simulated/wall, /area/station/maintenance/starboard) "bqC" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/starboard) "bqK" = ( @@ -26064,7 +26017,7 @@ dir = 8; level = 3; name = "Distribution and Waste Monitor"; - autolink_sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop") + autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -30538,6 +30491,15 @@ icon_state = "bot" }, /area/station/hallway/primary/central/west) +"bKE" = ( +/obj/structure/girder, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "bKF" = ( /obj/structure/table/wood, /obj/item/clothing/mask/cigarette/cigar{ @@ -30968,6 +30930,13 @@ /area/space/nearstation) "bLN" = ( /obj/effect/spawner/random/barrier/grille_maybe, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/station/maintenance/port) "bLO" = ( @@ -31643,7 +31612,7 @@ }, /area/station/hallway/primary/starboard/north) "bNy" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bNz" = ( @@ -31707,7 +31676,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -33164,6 +33133,14 @@ icon_state = "grimy" }, /area/station/turret_protected/aisat) +"bRC" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/landmark/spawner/late/crew, +/obj/machinery/light, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/arrival/station) "bRD" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -35042,7 +35019,7 @@ /area/station/hallway/primary/port/west) "bWI" = ( /obj/machinery/alarm/directional/east, -/obj/machinery/suit_storage_unit/ce/secure, +/obj/machinery/suit_storage_unit/industrial/ce/secure, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -35981,7 +35958,7 @@ /area/station/engineering/smes) "bZG" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "neutral" @@ -36398,9 +36375,7 @@ /turf/simulated/floor/wood, /area/station/legal/lawoffice) "caM" = ( -/obj/machinery/computer/prisoner{ - req_access = list(2) - }, +/obj/machinery/computer/prisoner, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -38024,6 +37999,11 @@ /obj/machinery/door/window/classic/reversed{ name = "Engineering Delivery" }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/engineering/control) "ceT" = ( @@ -38827,7 +38807,7 @@ /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "chv" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/command/teleporter) "chx" = ( @@ -39147,8 +39127,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "ciq" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust/maybe, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/port) "ciu" = ( @@ -40266,7 +40246,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/smes) "clw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/station/engineering/equipmentstorage) "clx" = ( @@ -40307,7 +40287,9 @@ /turf/simulated/floor/plasteel/grimy, /area/station/service/library) "clC" = ( -/obj/structure/bookcase, +/obj/structure/bookcase{ + name = "bookcase (Romance)" + }, /turf/simulated/floor/wood, /area/station/service/library) "clD" = ( @@ -40749,7 +40731,7 @@ /turf/simulated/floor/plating, /area/station/security/range) "cmI" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/security/range) "cmL" = ( @@ -41388,10 +41370,12 @@ /turf/simulated/floor/plating, /area/station/engineering/equipmentstorage) "cow" = ( -/obj/structure/bookcase, /obj/machinery/light{ dir = 8 }, +/obj/structure/bookcase{ + name = "bookcase (Fiction)" + }, /turf/simulated/floor/wood, /area/station/service/library) "cox" = ( @@ -42557,6 +42541,13 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/central/sw) +"crt" = ( +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "yellow" + }, +/area/station/engineering/transmission_laser) "cru" = ( /obj/structure/cable{ d1 = 1; @@ -43323,7 +43314,7 @@ /area/station/ai_monitored/storage/eva) "ctS" = ( /obj/structure/grille/broken, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/port) "ctU" = ( @@ -43840,14 +43831,14 @@ name = "north bump"; pixel_y = 24 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" }, /area/station/supply/expedition) "cuY" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/machinery/ai_status_display{ pixel_y = 32 }, @@ -43860,7 +43851,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/item/radio/intercom{ name = "north bump"; pixel_y = 28 @@ -43869,7 +43860,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "cva" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/machinery/status_display{ pixel_y = 32 }, @@ -44154,7 +44145,7 @@ }, /area/station/hallway/primary/starboard/south) "cvY" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/suit_storage_unit/expedition, /turf/simulated/floor/plasteel{ dir = 4; @@ -44562,7 +44553,7 @@ }, /area/station/supply/expedition) "cxh" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/supply/expedition) "cxk" = ( @@ -44792,7 +44783,7 @@ }, /area/station/hallway/primary/central) "cxP" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/port) "cxQ" = ( @@ -44994,7 +44985,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/supply/expedition) "cys" = ( @@ -45124,7 +45115,7 @@ name = "east bump"; pixel_x = 28 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/suit_storage_unit/expedition, /turf/simulated/floor/plasteel, /area/station/supply/expedition) @@ -45289,6 +45280,13 @@ icon_state = "freezerfloor" }, /area/station/public/sleep) +"czb" = ( +/obj/machinery/alarm/directional/east, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "caution" + }, +/area/station/engineering/transmission_laser) "cze" = ( /turf/simulated/floor/plasteel/dark, /area/station/public/fitness) @@ -45474,7 +45472,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery/hollow, @@ -45657,7 +45655,7 @@ }, /area/station/supply/expedition) "czW" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 8; @@ -46164,7 +46162,7 @@ "cBv" = ( /obj/structure/table/reinforced, /obj/item/pizzabox/firecracker, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/supply/expedition) "cBw" = ( @@ -46184,7 +46182,7 @@ }, /obj/structure/chair/stool/bar, /obj/effect/landmark/start/explorer, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/supply/expedition) "cBC" = ( @@ -46396,6 +46394,11 @@ d2 = 8; icon_state = "1-8" }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -46464,7 +46467,7 @@ }, /area/station/maintenance/port) "cCx" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/port) "cCy" = ( @@ -46659,7 +46662,7 @@ }, /area/station/hallway/primary/central/sw) "cDe" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/public/toilet/lockerroom) "cDf" = ( @@ -46833,6 +46836,11 @@ /area/station/engineering/hardsuitstorage) "cDD" = ( /obj/effect/turf_decal/delivery, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/station/engineering/control) "cDE" = ( @@ -47073,7 +47081,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/public/fitness) "cEA" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/station/engineering/control) "cEB" = ( @@ -47509,6 +47517,11 @@ "cFO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/turf_decal/delivery, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -47521,8 +47534,16 @@ /area/station/security/brig) "cFR" = ( /obj/structure/grille/broken, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -47534,6 +47555,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/port) "cFT" = ( @@ -47545,17 +47571,10 @@ dir = 4 }, /obj/effect/spawner/random/maintenance, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/station/maintenance/port) -"cFU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -47570,6 +47589,11 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -47587,6 +47611,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -48221,10 +48250,20 @@ /area/station/command/bridge) "cHj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/port) "cHk" = ( /obj/machinery/light/small, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/port) "cHl" = ( @@ -48252,6 +48291,11 @@ "cHo" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -48260,11 +48304,21 @@ /obj/structure/rack, /obj/item/clothing/gloves/color/fyellow, /obj/effect/spawner/random/maintenance, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, /area/station/maintenance/port) "cHq" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -48566,7 +48620,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) "cIa" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/public/fitness) "cIb" = ( @@ -48739,7 +48793,7 @@ }, /area/station/maintenance/port) "cIw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/electrical) "cIx" = ( @@ -48818,7 +48872,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "cIP" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) @@ -49515,7 +49569,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) "cLz" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/maintenance/abandonedbar) "cLA" = ( @@ -49801,13 +49855,20 @@ /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) "cMP" = ( -/obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Arrivals Fore Starboard"; + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/north) "cMR" = ( /obj/structure/chair{ dir = 4 @@ -51636,8 +51697,22 @@ /area/station/maintenance/electrical) "cTi" = ( /obj/item/reagent_containers/glass/bucket, -/obj/item/bikehorn/rubberducky, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/item/bikehorn/rubberducky, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -52587,15 +52662,6 @@ icon_state = "neutral" }, /area/station/maintenance/port) -"cWw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "cWy" = ( /obj/machinery/light, /turf/simulated/floor/plasteel/dark, @@ -53063,6 +53129,12 @@ "cYP" = ( /turf/simulated/wall, /area/station/medical/psych) +"cYR" = ( +/turf/simulated/floor/plasteel{ + icon_state = "arrivalcorner"; + dir = 4 + }, +/area/station/hallway/secondary/entry/east) "cYU" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -53159,7 +53231,7 @@ }, /area/station/maintenance/starboard) "cZj" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -53239,7 +53311,7 @@ /turf/simulated/wall, /area/station/science/research) "cZw" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -53569,7 +53641,7 @@ /turf/space, /area/station/engineering/solar/aft_starboard) "daD" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/science/xenobiology) "daE" = ( @@ -53864,9 +53936,16 @@ /turf/simulated/floor/plating, /area/station/maintenance/port2) "dbM" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/port2) +"dbN" = ( +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock" + }, +/obj/structure/fans/tiny, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/arrival/station) "dbR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -54181,7 +54260,7 @@ /area/station/maintenance/apmaint) "dcR" = ( /obj/structure/chair/wood, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "dcS" = ( @@ -55021,11 +55100,11 @@ /turf/simulated/wall, /area/station/public/construction) "dfJ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/public/construction) "dfK" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/starboard) "dfM" = ( @@ -55065,7 +55144,7 @@ /obj/structure/chair/wood{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "dfR" = ( @@ -55075,7 +55154,7 @@ /turf/simulated/floor/plasteel, /area/station/science/research) "dfS" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil/random, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -55442,7 +55521,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "dhB" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil/random, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -55773,7 +55852,7 @@ /turf/simulated/floor/plating, /area/station/public/construction) "diT" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/public/construction) "diU" = ( @@ -55802,7 +55881,7 @@ /obj/structure/chair/wood{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "diZ" = ( @@ -56192,7 +56271,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "dku" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/apmaint) "dkv" = ( @@ -56807,7 +56886,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port2) "dmU" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil/random, /turf/simulated/floor/plating, /area/station/maintenance/port2) @@ -57554,6 +57633,12 @@ icon_state = "whiteyellow" }, /area/station/medical/chemistry) +"dqC" = ( +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/north) "dqL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -57662,7 +57747,7 @@ /area/station/maintenance/abandonedbar) "drc" = ( /obj/structure/table/wood/poker, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "drd" = ( @@ -57869,7 +57954,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "dsk" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/public/construction) "dsl" = ( @@ -57890,7 +57975,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) "dsn" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/circuitboard/cyborgrecharger, /turf/simulated/floor/plating, /area/station/maintenance/port2) @@ -58470,7 +58555,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port2) "duV" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/machinery/light/small, /obj/machinery/alarm/directional/south, /turf/simulated/floor/plating, @@ -58835,7 +58920,7 @@ /area/station/maintenance/theatre) "dwW" = ( /obj/item/kirbyplants, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/theatre) "dwX" = ( @@ -58843,14 +58928,14 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/theatre) "dwY" = ( /obj/structure/table/wood, /obj/item/instrument/guitar, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/theatre) "dwZ" = ( @@ -59047,7 +59132,7 @@ "dyj" = ( /obj/structure/table/wood, /obj/item/tape, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/theatre) "dyl" = ( @@ -59135,6 +59220,15 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/library) +"dzl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "cautioncorner" + }, +/area/station/engineering/transmission_laser) "dzo" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -59348,7 +59442,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/theatre) "dAF" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "dAH" = ( @@ -59472,7 +59566,7 @@ "dBu" = ( /obj/structure/table/wood, /obj/item/clothing/under/costume/jester, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/theatre) "dBv" = ( @@ -59705,7 +59799,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/theatre) "dCs" = ( @@ -59720,7 +59814,7 @@ }, /area/station/maintenance/theatre) "dCu" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/theatre) "dCv" = ( @@ -60104,7 +60198,7 @@ }, /area/station/maintenance/starboard) "dDG" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/theatre) "dDH" = ( @@ -60219,7 +60313,7 @@ /turf/simulated/wall, /area/station/maintenance/aft) "dEp" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/aft) "dEr" = ( @@ -61261,6 +61355,16 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) +"dKW" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/status_display{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/north) "dKX" = ( /obj/structure/cable{ d1 = 4; @@ -61384,6 +61488,17 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/central/south) +"dMg" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 1 + }, +/obj/machinery/atmospherics/portable/canister/air, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/north) "dMh" = ( /obj/effect/landmark/start/chaplain, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -61841,7 +61956,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dOR" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" @@ -61930,7 +62045,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -61942,7 +62057,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dPt" = ( @@ -62386,7 +62501,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dQS" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/station/maintenance/apmaint) "dQT" = ( @@ -63645,6 +63760,11 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -63756,10 +63876,12 @@ }, /area/station/hallway/primary/aft/south) "dWL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/effect/spawner/random/storage, +/obj/item/storage/box/survival, +/obj/item/flashlight/flare/glowstick/emergency, +/turf/simulated/floor/plasteel{ + icon_state = "barber" }, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) "dWP" = ( /turf/simulated/floor/plasteel/white, @@ -64119,7 +64241,7 @@ "dYz" = ( /obj/structure/chair/stool/bar, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "dYA" = ( @@ -64455,7 +64577,7 @@ /area/station/medical/virology) "ebU" = ( /obj/machinery/computer/general_air_control{ - autolink_sensors = list("burn_sensor" = "Burn Mix"); + autolink_sensors = list("burn_sensor"="Burn Mix"); dir = 1; name = "Bomb Mix Monitor" }, @@ -64557,6 +64679,27 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) +"eeP" = ( +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/transmission_laser/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "yellow" + }, +/area/station/engineering/transmission_laser) "eeX" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, @@ -64672,6 +64815,12 @@ }, /turf/simulated/floor/plating, /area/station/supply/qm) +"eiT" = ( +/obj/machinery/firealarm/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/south) "ejr" = ( /obj/machinery/newscaster/security_unit{ dir = 4; @@ -64897,6 +65046,13 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) +"eoc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/engineering{ + pixel_y = -32 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "eoh" = ( /obj/machinery/atmospherics/portable/scrubber/huge, /obj/effect/turf_decal{ @@ -65411,14 +65567,16 @@ /turf/simulated/floor/engine, /area/station/science/explab/chamber) "ezV" = ( -/obj/machinery/camera{ - c_tag = "Arrivals Hall Port" +/obj/machinery/door/airlock/titanium{ + id_tag = "s_docking_airlock" }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "arrival" +/obj/docking_port/mobile/pod{ + id = "pod1"; + name = "escape pod 1"; + dir = 8 }, -/area/station/hallway/secondary/entry/south) +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_1) "eAi" = ( /obj/structure/railing/corner, /turf/simulated/floor/plasteel{ @@ -65462,19 +65620,18 @@ /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) -"eCj" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Arrivals Port Fore"; - dir = 8 +"eBn" = ( +/obj/structure/table, +/obj/item/reagent_containers/drinks/coffee, +/turf/simulated/floor/plasteel{ + icon_state = "brown" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/east) +"eCj" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/east) "eCn" = ( /obj/structure/closet/secure_closet/medical3, /obj/effect/turf_decal/delivery/white/hollow, @@ -65671,6 +65828,16 @@ /obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/starboard) +"eHr" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/landmark/spawner/late/crew, +/obj/machinery/status_display{ + pixel_x = -32 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/arrival/station) "eHD" = ( /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ @@ -65738,14 +65905,11 @@ }, /area/station/public/fitness) "eKO" = ( -/obj/machinery/door/airlock/external{ - name = "Arrival Airlock" - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/structure/chair{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/station/hallway/secondary/entry/west) +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry/east) "eKP" = ( /obj/machinery/hologram/holopad, /obj/structure/disposalpipe/segment{ @@ -65839,6 +66003,12 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/medical/surgery/observation) +"eNh" = ( +/obj/structure/bookcase{ + name = "bookcase (Fiction)" + }, +/turf/simulated/floor/wood, +/area/station/service/library) "eNk" = ( /obj/structure/cable{ d1 = 1; @@ -66293,15 +66463,19 @@ }, /turf/simulated/floor/engine/o2, /area/station/engineering/atmos) -"eYW" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +"eYk" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "neutralfull" + dir = 4; + icon_state = "neutral" }, -/area/station/hallway/secondary/entry/west) +/area/station/maintenance/port) "eZE" = ( /obj/machinery/door/airlock, /obj/effect/mapping_helpers/airlock/autoname, @@ -66388,6 +66562,11 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/central/nw) +"fct" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "fcY" = ( /obj/machinery/light{ dir = 4 @@ -66486,7 +66665,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/lobby) "ffz" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -66510,13 +66689,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/aft_starboard) "ffG" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/alarm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" }, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) "ffJ" = ( /obj/structure/cable{ @@ -66643,9 +66820,10 @@ }, /area/station/maintenance/port) "fiu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table, +/obj/machinery/light, /turf/simulated/floor/plasteel{ - icon_state = "neutralfull" + icon_state = "brown" }, /area/station/hallway/secondary/entry/east) "fiV" = ( @@ -66831,7 +67009,7 @@ dir = 1 }, /obj/effect/landmark/spawner/xeno, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "fox" = ( @@ -66930,17 +67108,10 @@ }, /area/station/security/main) "fqF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/light, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/newscaster{ + dir = 1; + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "arrival" @@ -67260,16 +67431,12 @@ }, /area/station/medical/virology) "fCA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; + name = "KEEP CLEAR: DOCKING AREA" }, -/area/station/hallway/secondary/entry/west) +/turf/simulated/wall, +/area/station/hallway/secondary/entry/north) "fCT" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -67413,7 +67580,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) "fFE" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -67456,7 +67623,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "fHD" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/library) "fIk" = ( @@ -67476,7 +67643,7 @@ /obj/item/book/manual/wiki/security_space_law, /obj/item/book/manual/detective, /obj/item/camera/detective, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "fIv" = ( @@ -67594,6 +67761,12 @@ /obj/item/lighter/zippo/black, /turf/simulated/floor/plasteel/grimy, /area/station/service/chapel/office) +"fMh" = ( +/turf/simulated/floor/plasteel{ + icon_state = "arrivalcorner"; + dir = 1 + }, +/area/station/hallway/secondary/entry/north) "fMp" = ( /obj/structure/barricade/wooden, /obj/structure/cable, @@ -67605,7 +67778,7 @@ dir = 8 }, /obj/machinery/computer/general_air_control/large_tank_control{ - autolink_sensors = list("n2o_sensor" = "Tank"); + autolink_sensors = list("n2o_sensor"="Tank"); dir = 4; inlet_injector_autolink_id = "n2o_in"; name = "Nitrous Oxide Supply Control"; @@ -67807,23 +67980,23 @@ }, /area/station/hallway/primary/port/west) "fPG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "fPJ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -67873,6 +68046,15 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/station/medical/reception) +"fQI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/sign/engineering{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "fQU" = ( /obj/machinery/power/smes{ charge = 2e+006 @@ -68110,6 +68292,15 @@ /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) +"fZc" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/north) "fZU" = ( /obj/structure/chair/stool/bar{ dir = 1 @@ -68419,10 +68610,15 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/reception) "giE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -68553,6 +68749,27 @@ /obj/structure/flora/ausbushes/sunnybush, /turf/simulated/floor/grass, /area/station/medical/medbay) +"gnm" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/east) "gns" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -68579,7 +68796,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/electrical_shop) "gow" = ( @@ -68603,15 +68820,13 @@ }, /area/station/security/main) "gpy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-4" +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" }, -/obj/machinery/power/apc/important/directional/west, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) "gpU" = ( /turf/simulated/floor/plasteel{ @@ -68713,12 +68928,15 @@ }, /area/station/science/research) "gtZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/machinery/door/airlock/external{ + id_tag = "admin_home"; + locked = 1 + }, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/north) "gua" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel/dark, @@ -68887,12 +69105,22 @@ /turf/simulated/floor/engine, /area/station/engineering/controlroom) "gAL" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ dir = 5; icon_state = "darkblue" }, /area/space/nearstation) +"gAN" = ( +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "gAP" = ( /obj/structure/cable{ d1 = 4; @@ -68956,7 +69184,7 @@ pixel_y = 6 }, /obj/item/storage/bag/dice, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/library) "gDy" = ( @@ -68984,22 +69212,10 @@ /turf/simulated/floor/wood, /area/station/public/pet_store) "gEs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/light, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "arrival" - }, -/area/station/hallway/secondary/entry/south) +/obj/effect/turf_decal/delivery/hollow, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry/east) "gEy" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -69137,9 +69353,22 @@ }, /turf/simulated/floor/plating, /area/station/security/prison/cell_block) +"gHk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + locked = 1; + id_tag = "ferry_home" + }, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/north) "gHB" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "gHE" = ( @@ -69191,6 +69420,17 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/storage) +"gIF" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "caution" + }, +/area/station/engineering/transmission_laser) "gJC" = ( /obj/structure/window/reinforced{ dir = 4 @@ -69495,6 +69735,20 @@ icon_state = "purplecorner" }, /area/station/hallway/primary/central/south) +"gPK" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "gQe" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -69553,15 +69807,11 @@ }, /area/station/public/sleep) "gVk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/structure/chair/sofa/bench/right, +/obj/effect/landmark/start/assistant, +/turf/simulated/floor/plasteel{ + icon_state = "barber" }, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) "gVm" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -69583,6 +69833,13 @@ icon_state = "whitegreen" }, /area/station/medical/virology) +"gVr" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/station/hallway/secondary/entry/east) "gVE" = ( /obj/machinery/light{ dir = 1 @@ -69612,6 +69869,19 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) +"gWD" = ( +/obj/machinery/door/airlock/external{ + locked = 1; + id_tag = "ferry_home" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/north) "gXp" = ( /obj/machinery/door/airlock/security{ name = "Detective" @@ -69640,6 +69910,14 @@ icon_state = "red" }, /area/station/security/detective) +"gXQ" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "gYx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -69702,7 +69980,7 @@ /area/station/medical/reception) "haA" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -69776,16 +70054,21 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "hbv" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "arrival" + icon_state = "neutralfull" }, -/area/station/hallway/secondary/entry/south) +/area/station/hallway/secondary/entry/east) "hbB" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -69914,16 +70197,22 @@ /turf/simulated/floor/plating, /area/station/command/office/rd) "hhn" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/closet/crate/trashcart, +/obj/effect/spawner/random/trash, +/obj/effect/spawner/random/trash, +/obj/effect/spawner/random/trash, +/obj/effect/spawner/random/trash, +/obj/effect/spawner/random/trash, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/official/cleanliness{ + pixel_y = 32 }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" + }, +/area/station/hallway/secondary/entry/east) "hhz" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -70174,6 +70463,12 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/science/xenobiology) +"hnG" = ( +/obj/structure/bookcase{ + name = "bookcase (Reference)" + }, +/turf/simulated/floor/wood, +/area/station/service/library) "hnH" = ( /obj/structure/sign/nosmoking_1{ pixel_x = -30 @@ -70374,6 +70669,12 @@ /obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard) +"huz" = ( +/turf/simulated/floor/plasteel{ + icon_state = "arrivalcorner"; + dir = 4 + }, +/area/station/hallway/secondary/entry/south) "huN" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/cleanable/dirt, @@ -70401,7 +70702,7 @@ /area/station/aisat) "hwI" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" @@ -70493,10 +70794,14 @@ /turf/simulated/floor/plating, /area/station/supply/break_room) "hyL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random{ + pixel_y = 32 + }, +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/east) "hyX" = ( /obj/structure/transit_tube/curved/flipped{ dir = 4 @@ -70574,6 +70879,12 @@ /obj/machinery/economy/vending/shoedispenser, /turf/simulated/floor/plasteel, /area/station/public/storage/art) +"hAr" = ( +/turf/simulated/floor/plasteel{ + icon_state = "arrivalcorner"; + dir = 8 + }, +/area/station/hallway/secondary/entry/north) "hAD" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 @@ -70586,7 +70897,7 @@ dir = 4 }, /obj/machinery/computer/general_air_control/large_tank_control{ - autolink_sensors = list("air_sensor" = "Tank"); + autolink_sensors = list("air_sensor"="Tank"); dir = 8; inlet_injector_autolink_id = "air_in"; name = "Mixed Air Supply Control"; @@ -70619,6 +70930,13 @@ icon_state = "neutral" }, /area/station/hallway/primary/central/north) +"hBD" = ( +/obj/machinery/keycard_auth{ + pixel_x = 24; + pixel_y = 24 + }, +/turf/simulated/wall, +/area/station/command/customs) "hCU" = ( /obj/effect/turf_decal/delivery/partial, /obj/machinery/door/window/classic/normal{ @@ -70659,11 +70977,22 @@ /obj/structure/chair/office/dark{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/library) +"hDE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/lattice/catwalk, +/obj/structure/grille, +/turf/simulated/floor/plating/airless, +/area/space/nearstation) "hDF" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/science/break_room) "hDS" = ( @@ -70682,6 +71011,11 @@ }, /turf/space, /area/space) +"hEk" = ( +/obj/structure/closet/walllocker/emerglocker/west, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/arrival/station) "hEl" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -70882,6 +71216,18 @@ icon_state = "darkblue" }, /area/station/command/office/cmo) +"hLx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "yellow" + }, +/area/station/engineering/transmission_laser) "hLU" = ( /obj/machinery/airlock_controller/air_cycler{ ext_button_link_id = "enginen_btn_ext"; @@ -71185,6 +71531,15 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) +"hWd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellow" + }, +/area/station/engineering/transmission_laser) "hWu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -71694,6 +72049,10 @@ /obj/effect/landmark/spawner/rev, /turf/simulated/floor/plating, /area/station/medical/morgue) +"iiL" = ( +/obj/structure/sign/electricshock, +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "iiM" = ( /obj/structure/window/reinforced{ dir = 8 @@ -71817,13 +72176,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "inH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/structure/cable{ @@ -72069,20 +72425,18 @@ /turf/simulated/floor/engine, /area/station/science/toxins/mixing) "ivG" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, -/obj/machinery/light{ +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/status_display{ - pixel_x = 32 +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/east) +/area/station/hallway/secondary/entry/south) "ivR" = ( /obj/machinery/camera{ c_tag = "Supermatter Emitter Chamber"; @@ -72153,11 +72507,25 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/delivery, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, /area/station/maintenance/port) +"iwV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "ixb" = ( /turf/simulated/wall, /area/station/security/storage) @@ -72360,7 +72728,7 @@ }, /area/station/public/fitness) "iFl" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "iFr" = ( @@ -72626,6 +72994,15 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/central/east) +"iNM" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "caution"; + dir = 1 + }, +/area/station/engineering/transmission_laser) "iOh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -72737,7 +73114,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "iQO" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/library) "iRa" = ( @@ -72892,9 +73269,9 @@ }, /area/station/service/bar) "iUU" = ( -/obj/effect/spawner/window/reinforced/grilled, -/turf/simulated/floor/plating, -/area/station/hallway/secondary/entry/west) +/obj/effect/spawner/airlock/e_to_w, +/turf/simulated/wall, +/area/station/hallway/secondary/entry/north) "iUZ" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -73155,8 +73532,8 @@ }, /area/station/public/fitness) "jcP" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/aft) "jdb" = ( @@ -73323,6 +73700,12 @@ icon_state = "whitegreen" }, /area/station/medical/virology) +"jhz" = ( +/obj/structure/chair/sofa/bench/right, +/turf/simulated/floor/plasteel{ + icon_state = "barber" + }, +/area/station/hallway/secondary/entry/north) "jid" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -73515,7 +73898,7 @@ pixel_x = -12; pixel_y = 2 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "jnJ" = ( @@ -73530,6 +73913,22 @@ "jnS" = ( /turf/simulated/floor/wood, /area/station/public/pet_store) +"joa" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutral" + }, +/area/station/maintenance/port) "jou" = ( /obj/machinery/newscaster/security_unit{ dir = 1; @@ -73557,15 +73956,13 @@ /obj/machinery/economy/vending/cigarette, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ - icon_state = "neutral" + icon_state = "arrival" }, /area/station/hallway/secondary/entry/south) "jpa" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/north) +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/wood, +/area/station/hallway/secondary/entry/east) "jpk" = ( /obj/structure/cable{ d2 = 8; @@ -73590,6 +73987,12 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/central/north) +"jpA" = ( +/turf/simulated/floor/plasteel{ + icon_state = "arrivalcorner"; + dir = 1 + }, +/area/station/hallway/secondary/entry/south) "jpC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73641,7 +74044,7 @@ }, /area/station/security/execution) "jqI" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "jrB" = ( @@ -73701,6 +74104,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) +"jtL" = ( +/obj/machinery/door/airlock/engineering{ + name = "Power Transmission Laser" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "jtM" = ( /obj/effect/turf_decal, /obj/structure/cable{ @@ -74044,7 +74454,7 @@ dir = 4 }, /obj/machinery/computer/general_air_control/large_tank_control{ - autolink_sensors = list("n2_sensor" = "Tank"); + autolink_sensors = list("n2_sensor"="Tank"); dir = 8; inlet_injector_autolink_id = "n2_in"; name = "Nitrogen Supply Control"; @@ -74328,28 +74738,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/station/engineering/controlroom) +"jOE" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/landmark/spawner/late/crew, +/obj/machinery/ai_status_display{ + pixel_x = -32 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/arrival/station) "jOL" = ( /obj/machinery/ai_status_display, /turf/simulated/wall, /area/station/hallway/secondary/entry/lounge) "jOW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/camera{ + c_tag = "Arrivals Aft Port"; + dir = 1 }, -/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, @@ -74566,6 +74973,17 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) +"jUu" = ( +/obj/machinery/firealarm/directional/north, +/obj/item/storage/toolbox/mechanical, +/obj/structure/rack, +/obj/item/stack/cable_coil, +/obj/item/multitool, +/turf/simulated/floor/plasteel{ + icon_state = "caution"; + dir = 1 + }, +/area/station/engineering/transmission_laser) "jUH" = ( /obj/structure/cable{ d1 = 1; @@ -74674,23 +75092,35 @@ }, /area/station/engineering/atmos) "jWY" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 12; - id = "ferry_home"; - name = "port bay 3"; - width = 5 +/turf/simulated/floor/plasteel{ + icon_state = "arrival" }, -/turf/space, -/area/space) +/area/station/hallway/secondary/entry/north) "jXz" = ( /turf/simulated/floor/plating, /area/station/hallway/primary/aft/south) "jYi" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"jZc" = ( +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/landmark/lightsout, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/south) "jZh" = ( /obj/machinery/door/poddoor{ density = 0; @@ -75198,17 +75628,12 @@ }, /area/station/security/main) "knM" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 9; - height = 18; - id = "admin_home"; - name = "port bay 1"; - timid = 1; - width = 19 +/obj/structure/table, +/obj/item/storage/briefcase, +/turf/simulated/floor/plasteel{ + icon_state = "barber" }, -/turf/space, -/area/space) +/area/station/hallway/secondary/entry/north) "knY" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -75224,6 +75649,12 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/starboard) +"koD" = ( +/obj/structure/bookcase{ + name = "bookcase (Non-Fiction)" + }, +/turf/simulated/floor/wood, +/area/station/service/library) "koT" = ( /obj/machinery/door/poddoor{ density = 0; @@ -75312,7 +75743,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "ksE" = ( @@ -75401,6 +75832,12 @@ icon_state = "darkredfull" }, /area/station/security/prison/cell_block) +"ktI" = ( +/turf/simulated/floor/plasteel{ + icon_state = "arrivalcorner"; + dir = 4 + }, +/area/station/hallway/secondary/entry/north) "ktT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -75952,12 +76389,17 @@ }, /area/station/engineering/atmos) "kLd" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -75994,13 +76436,18 @@ /turf/simulated/floor/plasteel/white, /area/station/science/break_room) "kNa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -76041,6 +76488,15 @@ icon_state = "red" }, /area/station/security/permabrig) +"kOD" = ( +/obj/machinery/camera{ + c_tag = "Arrivals Aft Central"; + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/south) "kPl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -76266,7 +76722,9 @@ "kWK" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" + }, /area/station/hallway/secondary/entry/south) "kWL" = ( /obj/machinery/computer/med_data, @@ -76392,7 +76850,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "lad" = ( @@ -76480,7 +76938,7 @@ /obj/structure/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/library) "lcy" = ( @@ -76583,12 +77041,31 @@ /area/station/medical/reception) "lfd" = ( /obj/machinery/economy/slot_machine, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/gambling_den) "lfg" = ( /turf/simulated/wall, /area/station/public/pet_store) +"lfH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/south) +"lfT" = ( +/obj/effect/turf_decal/caution/stand_clear, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "caution" + }, +/area/station/engineering/transmission_laser) "lfU" = ( /obj/machinery/atmospherics/binary/pump{ dir = 1; @@ -76875,20 +77352,14 @@ /turf/simulated/wall, /area/station/medical/paramedic) "lpL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/door/airlock/external, +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "bluecorner" +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, +/turf/simulated/floor/plating, /area/station/hallway/secondary/entry/south) "lpX" = ( /obj/structure/disposalpipe/segment/corner{ @@ -77019,14 +77490,16 @@ }, /area/station/engineering/atmos) "ltw" = ( -/obj/machinery/light{ - dir = 4 +/obj/structure/table, +/obj/item/reagent_containers/drinks/cans/beer{ + pixel_x = 7; + pixel_y = 5 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/item/ashtray/plastic{ + pixel_x = -9 }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/turf/simulated/floor/wood, +/area/station/hallway/secondary/entry/east) "ltX" = ( /obj/structure/plasticflaps{ opacity = 1 @@ -77596,6 +78069,15 @@ /obj/machinery/atmospherics/portable/pump, /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) +"lKr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/north) "lKI" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, @@ -77646,7 +78128,7 @@ /obj/machinery/economy/vending/clothing, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ - icon_state = "neutral" + icon_state = "arrival" }, /area/station/hallway/secondary/entry/south) "lMM" = ( @@ -77782,6 +78264,18 @@ icon_state = "neutralfull" }, /area/station/public/locker) +"lQG" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/effect/spawner/random/storage, +/obj/effect/spawner/random/engineering/tools, +/obj/effect/spawner/random/engineering/toolbox, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/suit/storage/hazardvest, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" + }, +/area/station/hallway/secondary/entry/east) "lQN" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -77977,6 +78471,14 @@ /obj/structure/girder, /turf/simulated/floor/plating, /area/station/maintenance/aft) +"lXG" = ( +/obj/machinery/status_display{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/north) "lYp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -78025,10 +78527,23 @@ /turf/simulated/wall/r_wall, /area/station/engineering/controlroom) "maf" = ( -/obj/structure/mopbucket, -/obj/item/mop, -/turf/simulated/floor/plating, -/area/station/maintenance/port) +/obj/machinery/door/airlock/engineering{ + name = "Power Transmission Laser" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "map" = ( /obj/machinery/door/poddoor/impassable/gamma, /turf/simulated/floor/plasteel{ @@ -78140,6 +78655,14 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/detective) +"mej" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/south) "mek" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -78181,12 +78704,17 @@ }, /area/station/hallway/primary/starboard/north) "meH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/window/basic{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/structure/window/basic, +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/ausbushes/reedbush, +/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/grass/no_creep, +/area/station/hallway/secondary/entry/north) "meU" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -78364,6 +78892,24 @@ icon_state = "whiteblue" }, /area/station/medical/reception) +"mjt" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" + }, +/area/station/maintenance/port) +"mjz" = ( +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "caution" + }, +/area/station/engineering/transmission_laser) "mkp" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -78436,7 +78982,7 @@ dir = 4 }, /obj/machinery/economy/slot_machine, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/gambling_den) "mmt" = ( @@ -78475,7 +79021,7 @@ }, /area/station/security/storage) "mmC" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -78601,6 +79147,14 @@ /obj/machinery/suit_storage_unit/security/secure, /turf/simulated/floor/plasteel, /area/station/security/armory/secure) +"mra" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/south) "mrs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -79074,17 +79628,12 @@ }, /area/station/security/prison/cell_block) "mFy" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + initialize_directions = 10 }, /turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/north) "mFK" = ( /obj/machinery/light, /obj/machinery/economy/vending/bardrobe, @@ -79212,7 +79761,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "mMp" = ( @@ -79419,6 +79968,11 @@ icon_state = "neutralfull" }, /area/station/engineering/atmos) +"mQO" = ( +/obj/structure/lattice/catwalk, +/obj/structure/marker_beacon/dock_marker, +/turf/space, +/area/space/nearstation) "mRb" = ( /obj/machinery/airlock_controller/access_controller{ ext_button_link_id = "turbine_btn_ext"; @@ -79498,6 +80052,22 @@ icon_state = "redcorner" }, /area/station/hallway/primary/starboard/north) +"mSr" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/station/maintenance/port) +"mSB" = ( +/obj/structure/bookcase{ + name = "bookcase (Religious)" + }, +/turf/simulated/floor/wood, +/area/station/service/library) "mSF" = ( /obj/effect/turf_decal{ dir = 1 @@ -79655,6 +80225,18 @@ }, /turf/simulated/floor/wood, /area/station/command/office/ntrep) +"mUk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/north) "mUz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -79866,7 +80448,7 @@ dir = 8 }, /obj/machinery/computer/general_air_control/large_tank_control{ - autolink_sensors = list("tox_sensor" = "Tank"); + autolink_sensors = list("tox_sensor"="Tank"); dir = 4; inlet_injector_autolink_id = "tox_in"; name = "Toxin Supply Control"; @@ -79987,12 +80569,9 @@ }, /area/station/security/brig) "ndb" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/north) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/wood, +/area/station/hallway/secondary/entry/east) "neb" = ( /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ @@ -80213,6 +80792,26 @@ icon_state = "whitegreen" }, /area/station/medical/medbay) +"njt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" + }, +/area/station/maintenance/port) "njD" = ( /obj/structure/extinguisher_cabinet{ name = "east bump"; @@ -80449,6 +81048,12 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) +"noG" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "caution" + }, +/area/station/engineering/transmission_laser) "noW" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel/white, @@ -80614,7 +81219,7 @@ /area/station/medical/medbay) "nsD" = ( /obj/structure/chair/stool/bar, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -80799,6 +81404,13 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/central/se) +"nAP" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/south) "nBa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -80877,6 +81489,15 @@ /obj/item/paper/monitorkey, /turf/simulated/floor/plasteel/white, /area/station/command/office/rd) +"nCh" = ( +/obj/effect/spawner/random/storage, +/obj/structure/sign/securearea{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/station/maintenance/port) "nCu" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -80901,6 +81522,10 @@ icon_state = "whitepurple" }, /area/station/science/toxins/mixing) +"nDl" = ( +/obj/item/beacon, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry/south) "nDu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -80956,13 +81581,11 @@ /turf/simulated/floor/plasteel, /area/station/science/research) "nEp" = ( -/obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/area/station/hallway/secondary/entry/north) +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry/south) "nEq" = ( /obj/machinery/door/airlock/hatch{ name = "MiniSat Transit Tube" @@ -81244,6 +81867,10 @@ icon_state = "darkblue" }, /area/station/medical/morgue) +"nMD" = ( +/obj/structure/sign/securearea, +/turf/simulated/wall, +/area/station/maintenance/port) "nMR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -81320,7 +81947,7 @@ "nOO" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/library) "nPe" = ( @@ -81503,6 +82130,11 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/toxins/mixing) +"nWU" = ( +/obj/machinery/light/small, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/east) "nXf" = ( /obj/machinery/computer/security/wooden_tv, /turf/simulated/floor/carpet, @@ -81690,7 +82322,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "ocr" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -81983,7 +82615,7 @@ /area/station/supply/miningdock) "olZ" = ( /obj/machinery/computer/general_air_control/large_tank_control{ - autolink_sensors = list("waste_sensor" = "Tank"); + autolink_sensors = list("waste_sensor"="Tank"); dir = 4; inlet_injector_autolink_id = "waste_in"; name = "Gas Mix Tank Control"; @@ -82103,6 +82735,15 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/fore/south) +"onX" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/closet/emcloset, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" + }, +/area/station/hallway/secondary/entry/east) "ooc" = ( /obj/effect/spawner/window/reinforced/plasma/grilled, /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ @@ -82482,6 +83123,10 @@ icon_state = "darkblue" }, /area/station/medical/storage/secondary) +"oyF" = ( +/obj/structure/sign/securearea, +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "oyG" = ( /obj/structure/railing{ dir = 4 @@ -82605,6 +83250,13 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/medical/coldroom) +"oCh" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; + name = "KEEP CLEAR: DOCKING AREA" + }, +/turf/simulated/wall, +/area/station/hallway/secondary/entry/east) "oCp" = ( /obj/machinery/economy/vending/virodrobe, /turf/simulated/floor/plasteel{ @@ -82981,13 +83633,20 @@ /turf/simulated/wall/r_wall, /area/station/telecomms/chamber) "oMA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/structure/chair/sofa/bench/left, +/turf/simulated/floor/plasteel{ + icon_state = "barber" }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/firealarm/directional/west, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/north) +"oMB" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/firstaid/regular, +/obj/machinery/status_display{ + pixel_x = 32 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/arrival/station) "oMI" = ( /obj/structure/disposalpipe/segment/corner{ dir = 2 @@ -83015,6 +83674,10 @@ icon_state = "darkred" }, /area/station/security/brig) +"oND" = ( +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/engineering/transmission_laser) "oNV" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Storage" @@ -83060,6 +83723,18 @@ icon_state = "freezerfloor" }, /area/station/medical/cloning) +"oOV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/north) "oOW" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -83236,6 +83911,11 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/aisat) +"oSU" = ( +/turf/simulated/floor/plasteel{ + icon_state = "arrivalcorner" + }, +/area/station/hallway/secondary/entry/north) "oTa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -83543,6 +84223,19 @@ "paJ" = ( /turf/simulated/floor/engine, /area/station/science/explab/chamber) +"paO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Research Lobby"; + dir = 1; + network = list("Research","SS13") + }, +/turf/simulated/floor/plasteel{ + icon_state = "caution" + }, +/area/station/engineering/transmission_laser) "pbe" = ( /obj/structure/cable{ d1 = 4; @@ -83671,6 +84364,17 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/fore/north) +"peB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/station/maintenance/port) "peG" = ( /obj/machinery/light/small{ dir = 4 @@ -83702,16 +84406,13 @@ /turf/simulated/floor/carpet/black, /area/station/service/chapel/office) "pfO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/structure/closet/emcloset, +/obj/item/radio/intercom{ + name = "east bump"; + pixel_x = 28 }, -/area/station/hallway/secondary/entry/north) +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/south) "pgx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -83796,6 +84497,15 @@ icon_state = "darkred" }, /area/station/security/main) +"phH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "yellow" + }, +/area/station/engineering/transmission_laser) "pjk" = ( /turf/simulated/floor/engine, /area/station/science/test_chamber) @@ -83812,13 +84522,16 @@ /turf/simulated/floor/grass/jungle, /area/station/maintenance/fsmaint) "pjO" = ( -/obj/machinery/light{ - dir = 1 +/obj/docking_port/stationary{ + dir = 8; + dwidth = 4; + height = 11; + id = "trade_dock"; + name = "port bay 4 at Kerberos"; + width = 9 }, -/obj/item/kirbyplants, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/turf/space, +/area/space) "pkg" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ @@ -84006,7 +84719,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/flora/junglebush, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -84121,10 +84834,17 @@ /turf/simulated/floor/plasteel, /area/station/public/toilet/lockerroom) "pvf" = ( -/obj/item/kirbyplants, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/structure/sign/vacuum/external{ + pixel_y = 32 + }, +/obj/machinery/camera{ + c_tag = "Arrivals Fore Port" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/north) "pvg" = ( /obj/structure/cable{ d2 = 2; @@ -84166,17 +84886,24 @@ }, /area/station/security/main) "pvQ" = ( -/obj/machinery/status_display{ - pixel_x = -32 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/north) +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/south) "pwd" = ( /obj/machinery/door/airlock/maintenance{ name = "Science Maintenance" @@ -84311,13 +85038,6 @@ icon_state = "whitegreen" }, /area/station/medical/virology) -"pAC" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "pAZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -84406,14 +85126,14 @@ /turf/simulated/floor/plating, /area/station/command/office/rd) "pCM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/camera{ + c_tag = "Arrivals Hall Aft"; + dir = 8 }, -/obj/item/radio/intercom{ - name = "east bump"; - pixel_x = 28 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "arrival" }, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "pDw" = ( /obj/effect/turf_decal/stripes/line, @@ -84514,9 +85234,21 @@ }, /area/station/science/break_room) "pGg" = ( -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/east) "pGi" = ( /obj/structure/sign/electricshock{ pixel_y = -32 @@ -84589,15 +85321,9 @@ }, /area/station/security/permabrig) "pHg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/airlock/external{ - id_tag = "specops_home"; - locked = 1 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/north) +/obj/item/kirbyplants, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/arrival/station) "pIn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -84772,8 +85498,12 @@ /turf/simulated/floor/plasteel/white, /area/station/science/toxins/mixing) "pMq" = ( -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/rack, +/obj/item/clothing/head/welding, +/turf/simulated/floor/plasteel{ + icon_state = "brown" + }, /area/station/hallway/secondary/entry/east) "pMx" = ( /obj/machinery/door/firedoor, @@ -84952,6 +85682,12 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) +"pQv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry/south) "pRI" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -85003,7 +85739,7 @@ /obj/item/multitool, /obj/item/wrench, /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "pTv" = ( @@ -85080,11 +85816,11 @@ }, /area/station/science/toxins/mixing) "pUC" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/structure/shuttle/engine/propulsion{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/station/hallway/secondary/entry/west) +/turf/simulated/wall/mineral/titanium, +/area/shuttle/pod_1) "pVI" = ( /obj/structure/plasticflaps{ opacity = 1 @@ -85106,6 +85842,15 @@ }, /turf/simulated/floor/plasteel/grimy, /area/station/service/bar) +"pVK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" + }, +/area/station/maintenance/port) "pVN" = ( /obj/structure/window/reinforced{ dir = 4 @@ -85113,6 +85858,12 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) +"pVU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "pWh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -85138,18 +85889,22 @@ /turf/simulated/floor/plasteel/white, /area/station/science/explab) "pWt" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "pWw" = ( -/obj/machinery/economy/vending/snack, -/obj/machinery/light{ - dir = 1 +/obj/effect/turf_decal/delivery/hollow, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/newscaster{ + name = "north bump"; + pixel_y = 28 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "pWz" = ( /obj/machinery/optable, @@ -85294,7 +86049,7 @@ dir = 4 }, /obj/machinery/computer/general_air_control/large_tank_control{ - autolink_sensors = list("o2_sensor" = "Tank"); + autolink_sensors = list("o2_sensor"="Tank"); dir = 8; inlet_injector_autolink_id = "o2_in"; name = "Oxygen Supply Control"; @@ -85337,22 +86092,9 @@ }, /area/station/medical/break_room) "qcA" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 4; - height = 11; - id = "trade_dock"; - name = "port bay 4 at Kerberos"; - width = 9 - }, -/obj/machinery/access_button{ - autolink_id = "enginen_btn_ext"; - name = "exterior access button"; - pixel_x = 23; - pixel_y = -23 - }, -/turf/space, -/area/space) +/obj/effect/spawner/airlock, +/turf/simulated/wall, +/area/station/hallway/secondary/entry/north) "qcR" = ( /obj/machinery/door/airlock/medical, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -85574,11 +86316,14 @@ }, /area/station/hallway/primary/central/ne) "qke" = ( -/obj/machinery/door/airlock/external{ - name = "Arrival Airlock" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/newscaster{ + dir = 8; + name = "east bump"; + pixel_x = 28 }, /turf/simulated/floor/plating, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/east) "qkH" = ( /obj/structure/chair/sofa/corner{ color = "#A30FAF"; @@ -85733,12 +86478,27 @@ icon_state = "vault" }, /area/station/command/bridge) +"qtd" = ( +/obj/structure/sign/directions/engineering{ + pixel_y = 8 + }, +/obj/structure/sign/directions/science{ + pixel_y = 1 + }, +/obj/structure/sign/directions/evac{ + pixel_y = -8 + }, +/turf/simulated/wall, +/area/station/command/customs) "qtk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/south) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/north) "qtC" = ( /obj/machinery/atmospherics/unary/vent_pump{ autolink_id = "co2_out"; @@ -85940,6 +86700,21 @@ icon_state = "whiteblue" }, /area/station/medical/reception) +"qzl" = ( +/obj/structure/sign/directions/engineering{ + dir = 4; + pixel_y = 8 + }, +/obj/structure/sign/directions/medical{ + dir = 4; + pixel_y = 1 + }, +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_y = -6 + }, +/turf/simulated/wall, +/area/station/hallway/secondary/entry/east) "qzr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -86077,13 +86852,13 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "qDL" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/station/maintenance/apmaint) "qET" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fsmaint) "qFj" = ( @@ -86249,6 +87024,23 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/service/library) +"qKb" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutral" + }, +/area/station/maintenance/port) "qKk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -86336,6 +87128,18 @@ }, /turf/simulated/floor/engine, /area/station/engineering/controlroom) +"qNj" = ( +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "caution" + }, +/area/station/engineering/transmission_laser) "qNO" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -86388,6 +87192,14 @@ }, /turf/simulated/floor/plating, /area/station/engineering/atmos) +"qQv" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/north) "qQx" = ( /obj/machinery/economy/vending/plasmaresearch, /turf/simulated/floor/plasteel, @@ -86397,15 +87209,12 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/cryo) "qQS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Arrivals Port Aft"; - dir = 8 +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/north) "qRe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -86886,6 +87695,17 @@ icon_state = "darkredcorners" }, /area/station/security/brig) +"rbl" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "rbw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -86905,6 +87725,16 @@ icon_state = "whitegreen" }, /area/station/medical/virology) +"rbS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "rcq" = ( /obj/structure/cable{ d1 = 2; @@ -86985,6 +87815,9 @@ /obj/structure/flora/junglebush, /turf/simulated/floor/grass, /area/station/medical/medbay) +"reg" = ( +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "reo" = ( /obj/structure/sign/electricshock{ pixel_y = 32 @@ -87082,15 +87915,18 @@ }, /area/station/security/brig) "reW" = ( -/obj/item/radio/intercom{ - name = "east bump"; - pixel_x = 28 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + id_tag = "specops_home"; + locked = 1 + }, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/east) "rfw" = ( /obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ @@ -87162,6 +87998,14 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) +"rhX" = ( +/obj/machinery/economy/vending/snack, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/north) "riq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -87586,6 +88430,11 @@ icon_state = "neutral" }, /area/station/maintenance/fore) +"rrZ" = ( +/turf/simulated/floor/plasteel{ + icon_state = "arrivalcorner" + }, +/area/station/hallway/secondary/entry/south) "rsC" = ( /obj/effect/mapping_helpers/airlock/access/any/service/crematorium, /obj/machinery/door/firedoor, @@ -87718,14 +88567,11 @@ /turf/simulated/wall, /area/station/service/barber) "rwY" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/chair/sofa/bench, +/turf/simulated/floor/plasteel{ + icon_state = "barber" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/north) "rwZ" = ( /obj/structure/table/reinforced, /obj/item/desk_bell{ @@ -87802,14 +88648,14 @@ }, /area/station/hallway/primary/central/sw) "ryh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/chair/sofa/bench/right{ + dir = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/effect/landmark/start/assistant, +/turf/simulated/floor/plasteel{ + icon_state = "barber" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/north) "ryp" = ( /obj/effect/spawner/random/fungus/maybe, /turf/simulated/wall, @@ -87848,7 +88694,7 @@ /obj/structure/rack, /obj/item/wrench/medical, /obj/item/storage/box/bodybags, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -87881,18 +88727,7 @@ }, /area/station/medical/medbay) "rBP" = ( -/obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, @@ -88122,22 +88957,24 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "rJk" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; - name = "KEEP CLEAR: DOCKING AREA" +/obj/docking_port/stationary{ + dwidth = 9; + height = 18; + id = "admin_home"; + name = "port bay 1"; + timid = 1; + width = 19 }, -/turf/simulated/floor/plating, -/area/station/hallway/secondary/entry/west) +/turf/space, +/area/space) "rJF" = ( -/obj/structure/sign/vacuum{ - pixel_x = -32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/plasteel{ + icon_state = "barber" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/north) +/area/station/hallway/secondary/entry/south) "rKJ" = ( /obj/structure/cable{ d1 = 4; @@ -88359,16 +89196,16 @@ }, /area/station/medical/virology) "rPU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/south) "rQj" = ( /obj/machinery/firealarm/directional/west, /obj/structure/table/reinforced, @@ -88392,21 +89229,10 @@ }, /area/station/medical/reception) "rQS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "arrival" }, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "rRw" = ( /obj/structure/table, @@ -88537,6 +89363,16 @@ }, /turf/simulated/floor/plasteel, /area/station/service/kitchen) +"rVD" = ( +/obj/machinery/camera{ + c_tag = "Arrivals Hall Fore"; + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/east) "rVL" = ( /obj/machinery/economy/vending/coffee, /obj/effect/turf_decal/delivery, @@ -88691,7 +89527,7 @@ /area/station/medical/storage/secondary) "rYP" = ( /obj/structure/bookcase, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/library) "rYV" = ( @@ -88699,7 +89535,7 @@ dir = 8 }, /obj/machinery/computer/general_air_control/large_tank_control{ - autolink_sensors = list("co2_sensor" = "Tank"); + autolink_sensors = list("co2_sensor"="Tank"); dir = 4; inlet_injector_autolink_id = "co2_in"; name = "Carbon Dioxide Supply Control"; @@ -88784,13 +89620,13 @@ /area/station/security/processing) "san" = ( /obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/south) "saq" = ( /obj/machinery/atmospherics/portable/canister/air, /obj/machinery/atmospherics/unary/portables_connector{ @@ -88801,13 +89637,24 @@ icon_state = "vault" }, /area/station/aisat) +"sat" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "saC" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "saH" = ( @@ -88821,16 +89668,23 @@ /turf/simulated/floor/plating, /area/station/medical/virology) "saK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/structure/cable{ + d1 = 4; d2 = 8; - icon_state = "0-8" + icon_state = "4-8" }, -/obj/machinery/power/apc/important/directional/east, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/south) "sbe" = ( /obj/structure/extinguisher_cabinet{ name = "east bump"; @@ -88996,6 +89850,14 @@ }, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) +"seh" = ( +/obj/structure/closet/wardrobe/mixed, +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/arrival/station) "seH" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -89078,16 +89940,15 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "sgZ" = ( -/obj/machinery/newscaster{ - name = "north bump"; - pixel_y = 28 +/obj/structure/chair/comfy/shuttle{ + dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "arrival" +/obj/item/radio/intercom{ + name = "south bump"; + pixel_y = -28 }, -/area/station/hallway/secondary/entry/south) +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/pod_1) "shb" = ( /obj/machinery/light, /obj/machinery/light_switch{ @@ -89481,7 +90342,7 @@ /obj/structure/sink{ pixel_y = 25 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -89506,7 +90367,7 @@ }, /area/station/security/evidence) "sqj" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -89583,7 +90444,7 @@ /area/station/hallway/primary/central) "sqZ" = ( /obj/effect/landmark/spawner/xeno, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/library) "sre" = ( @@ -89645,6 +90506,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel/white, /area/station/science/storage) +"srS" = ( +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "sso" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -89695,7 +90559,7 @@ /turf/simulated/floor/grass, /area/station/science/genetics) "ssL" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/apmaint) "ssO" = ( @@ -89897,6 +90761,15 @@ icon_state = "whitepurple" }, /area/station/maintenance/apmaint) +"szc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "szf" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, @@ -90190,6 +91063,21 @@ icon_state = "dark" }, /area/station/service/chapel) +"sGT" = ( +/obj/structure/sign/directions/security{ + dir = 4; + pixel_y = 8 + }, +/obj/structure/sign/directions/science{ + dir = 4; + pixel_y = 1 + }, +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_y = -6 + }, +/turf/simulated/wall, +/area/station/hallway/secondary/entry/north) "sHa" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -90416,14 +91304,11 @@ }, /area/station/medical/storage) "sMV" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/effect/decal/cleanable/dirt, +/obj/item/kirbyplants, +/obj/effect/decal/cleanable/cobweb, +/turf/simulated/floor/wood, +/area/station/hallway/secondary/entry/east) "sNF" = ( /obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ @@ -90557,6 +91442,9 @@ /area/station/maintenance/starboard2) "sQr" = ( /mob/living/simple_animal/mouse, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/station/maintenance/port) "sQt" = ( @@ -90814,9 +91702,7 @@ /turf/simulated/wall, /area/station/engineering/ai_transit_tube) "sWI" = ( -/obj/item/kirbyplants, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/catwalk, /area/station/hallway/secondary/entry/east) "sXr" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ @@ -90936,8 +91822,32 @@ }, /turf/simulated/floor/plating, /area/station/aisat) +"sZg" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/catwalk, +/area/station/engineering/transmission_laser) "sZp" = ( -/obj/machinery/light/small, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -91325,10 +92235,23 @@ /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) "tnU" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/north) "tod" = ( /obj/machinery/door/airlock/maintenance{ name = "Internal Medbay Maintenance" @@ -91803,6 +92726,23 @@ icon_state = "yellowcorner" }, /area/station/hallway/primary/port/west) +"tEl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" + }, +/area/station/maintenance/port) "tEt" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -91848,6 +92788,12 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel/white, /area/station/medical/reception) +"tEQ" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/arrival/station) "tFK" = ( /obj/item/soap/nanotrasen, /obj/machinery/light/small{ @@ -92003,11 +92949,11 @@ }, /area/station/maintenance/port) "tIM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/machinery/firealarm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" }, -/obj/machinery/alarm/directional/east, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) "tIT" = ( /obj/machinery/door/firedoor, @@ -92253,10 +93199,12 @@ }, /area/station/medical/medbay) "tRa" = ( -/obj/machinery/economy/vending/cola, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/east) +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/north) "tRn" = ( /obj/machinery/light, /obj/structure/disposalpipe/segment{ @@ -92493,7 +93441,7 @@ }, /area/station/medical/storage) "tWj" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/maintenance/apmaint) "tWK" = ( @@ -92509,14 +93457,15 @@ }, /area/station/medical/cloning) "tXb" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/effect/turf_decal/delivery/hollow, +/obj/effect/spawner/random/storage, +/obj/item/storage/box/beakers, +/obj/item/storage/box/lights/mixed, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/east) "tXj" = ( /obj/machinery/cryopod/right, /obj/machinery/light_switch{ @@ -92570,7 +93519,7 @@ }, /area/station/medical/storage) "tYD" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "tYQ" = ( @@ -92671,6 +93620,22 @@ /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central) +"uaW" = ( +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "ubm" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -92741,10 +93706,16 @@ }, /area/station/service/chapel/office) "uci" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/effect/spawner/airlock/s_to_n, -/turf/simulated/floor/plating, -/area/station/hallway/secondary/entry/west) +/obj/machinery/power/apc/directional/north, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/south) "ucl" = ( /obj/machinery/economy/vending/cigarette, /turf/simulated/floor/plating, @@ -92863,6 +93834,9 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/port/east) +"ueF" = ( +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry/north) "ueI" = ( /obj/machinery/atmospherics/portable/canister/nitrogen, /turf/simulated/floor/plasteel, @@ -92969,6 +93943,16 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/aft/north) +"uhO" = ( +/obj/structure/sign/directions/security{ + pixel_y = 8 + }, +/obj/structure/sign/directions/medical, +/obj/structure/sign/directions/evac{ + pixel_y = -8 + }, +/turf/simulated/wall, +/area/station/security/checkpoint/secondary) "uic" = ( /obj/structure/cable{ d1 = 4; @@ -93040,6 +94024,14 @@ }, /turf/simulated/floor/plasteel, /area/station/security/armory/secure) +"uiL" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/firealarm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/south) "uje" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -93259,13 +94251,17 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/reception) "upw" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 28 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "arrival" + icon_state = "neutralfull" }, /area/station/hallway/secondary/entry/south) "upI" = ( @@ -93324,6 +94320,14 @@ icon_state = "neutral" }, /area/station/maintenance/starboard) +"urr" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/closet/emcloset, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/south) "usf" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -93404,6 +94408,18 @@ /obj/structure/barricade/wooden, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"utt" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "caution" + }, +/area/station/engineering/transmission_laser) "uud" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -93557,6 +94573,14 @@ /obj/machinery/mineral/stacking_unit_console, /turf/simulated/wall, /area/station/maintenance/disposal) +"uBY" = ( +/obj/structure/cable, +/obj/machinery/power/apc/directional/east, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "caution" + }, +/area/station/engineering/transmission_laser) "uCq" = ( /obj/machinery/door/airlock/maintenance{ name = "Library Maintenance" @@ -93673,6 +94697,17 @@ }, /turf/simulated/floor/plating, /area/station/security/interrogation) +"uFi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "caution" + }, +/area/station/engineering/transmission_laser) "uFz" = ( /obj/structure/window/reinforced{ dir = 4 @@ -94068,6 +95103,14 @@ icon_state = "neutralfull" }, /area/station/engineering/atmos) +"uQW" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/south) "uRn" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable, @@ -94085,6 +95128,14 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/command/customs) +"uSO" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/east) "uTw" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 @@ -94118,6 +95169,34 @@ icon_state = "whitebluecorner" }, /area/station/medical/reception) +"uTN" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/assistant, +/obj/machinery/newscaster{ + dir = 1; + name = "south bump"; + pixel_y = -28 + }, +/turf/simulated/floor/plasteel{ + icon_state = "brown" + }, +/area/station/hallway/secondary/entry/east) +"uTX" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 4 + }, +/obj/machinery/atmospherics/portable/canister/air, +/obj/structure/sign/vacuum/external{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/north) "uUk" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/classic/normal{ @@ -94203,7 +95282,7 @@ dir = 1 }, /obj/effect/landmark/spawner/xeno, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/theatre) "uWj" = ( @@ -94474,8 +95553,13 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/ai_transit_tube) "vcE" = ( -/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -94631,6 +95715,15 @@ icon_state = "redcorner" }, /area/station/hallway/primary/starboard/east) +"vjZ" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "vko" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -94733,11 +95826,13 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "vmP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/extinguisher_cabinet{ + name = "south bump"; + pixel_y = -30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" }, -/obj/machinery/firealarm/directional/east, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) "vnm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -94811,6 +95906,16 @@ }, /turf/simulated/floor/plating, /area/station/security/processing) +"voM" = ( +/obj/effect/spawner/random/storage, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/radiation/rad_area{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/station/maintenance/port) "vpa" = ( /obj/structure/cable{ d1 = 2; @@ -94830,6 +95935,10 @@ /obj/effect/landmark/start/coroner, /turf/simulated/floor/plasteel/dark, /area/station/medical/morgue) +"vrA" = ( +/obj/structure/sign/radiation/rad_area, +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "vrH" = ( /obj/structure/flora/junglebush, /obj/machinery/light/small{ @@ -94838,14 +95947,16 @@ /turf/simulated/floor/grass/jungle, /area/station/maintenance/fsmaint) "vrP" = ( -/obj/machinery/status_display{ - pixel_x = -32 - }, -/obj/effect/turf_decal/stripes/line{ +/obj/structure/window/basic{ dir = 8 }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/east) +/obj/structure/window/basic, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/grass/no_creep, +/area/station/hallway/secondary/entry/north) "vsw" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -94867,6 +95978,14 @@ icon_state = "dark" }, /area/station/security/execution) +"vsP" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "brown" + }, +/area/station/hallway/secondary/entry/east) "vtp" = ( /obj/structure/sign/electricshock{ pixel_y = -32 @@ -95113,6 +96232,16 @@ icon_state = "whiteblue" }, /area/station/medical/sleeper) +"vBL" = ( +/obj/structure/sink/kitchen/old{ + pixel_y = 25 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" + }, +/area/station/hallway/secondary/entry/east) "vBO" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 @@ -95409,6 +96538,15 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/port/west) +"vHl" = ( +/obj/structure/sign/vacuum/external{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/east) "vHE" = ( /obj/machinery/mass_driver{ dir = 8; @@ -95581,6 +96719,14 @@ icon_state = "neutral" }, /area/station/maintenance/starboard) +"vNK" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/north) "vNM" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/security/general, @@ -95780,12 +96926,11 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/virology) "vTw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/chair/sofa/bench/left, /turf/simulated/floor/plasteel{ - icon_state = "neutralfull" + icon_state = "barber" }, -/area/station/hallway/secondary/entry/west) +/area/station/hallway/secondary/entry/south) "vTx" = ( /obj/item/radio/intercom{ name = "north bump"; @@ -95931,11 +97076,13 @@ /turf/simulated/floor/engine/co2, /area/station/engineering/atmos) "vYz" = ( -/obj/item/kirbyplants, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" + dir = 1; + icon_state = "arrival" }, -/area/station/hallway/secondary/entry/south) +/area/station/hallway/secondary/entry/north) "vYF" = ( /obj/item/kirbyplants{ icon_state = "plant-18" @@ -95953,6 +97100,11 @@ icon_state = "whiteblue" }, /area/station/medical/reception) +"vZx" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/closet/walllocker/emerglocker/east, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/arrival/station) "vZC" = ( /obj/structure/cable{ d2 = 2; @@ -96265,14 +97417,12 @@ }, /area/station/hallway/secondary/exit) "whp" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/effect/turf_decal/delivery/hollow, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + icon_state = "brown" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/north) +/area/station/hallway/secondary/entry/east) "why" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -96351,6 +97501,21 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/central/ne) +"wjP" = ( +/obj/structure/sign/directions/engineering{ + dir = 4; + pixel_y = 8 + }, +/obj/structure/sign/directions/medical{ + dir = 4; + pixel_y = 1 + }, +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_y = -6 + }, +/turf/simulated/wall, +/area/station/hallway/secondary/entry/north) "wjY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ @@ -96660,14 +97825,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "wsg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/south) "wsl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -96859,18 +98018,21 @@ }, /area/station/hallway/primary/central/se) "wvH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /obj/structure/cable{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 8; + icon_state = "1-8" }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "arrival" + icon_state = "neutralfull" }, -/area/station/hallway/secondary/entry/south) +/area/station/hallway/secondary/entry/east) "wvM" = ( /obj/machinery/door/airlock{ name = "Internal Affairs Office" @@ -97127,7 +98289,7 @@ /obj/machinery/economy/vending/coffee, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ - icon_state = "neutral" + icon_state = "arrival" }, /area/station/hallway/secondary/entry/south) "wER" = ( @@ -97163,6 +98325,23 @@ icon_state = "whitepurple" }, /area/station/science/break_room) +"wGs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" + }, +/area/station/maintenance/port) "wGz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -97219,7 +98398,7 @@ }, /area/station/medical/cloning) "wIb" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/structure/closet/crate, /obj/machinery/light/small{ dir = 1 @@ -97433,6 +98612,12 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/central/se) +"wRJ" = ( +/turf/simulated/floor/plasteel{ + icon_state = "arrivalcorner"; + dir = 8 + }, +/area/station/hallway/secondary/entry/east) "wRN" = ( /obj/machinery/atmospherics/unary/outlet_injector/on{ autolink_id = "air_in"; @@ -97464,18 +98649,16 @@ /turf/simulated/floor/engine, /area/station/engineering/controlroom) "wSO" = ( -/obj/structure/sign/vacuum/external{ - pixel_y = -32 - }, -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 1 +/obj/machinery/power/apc/directional/north, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" }, -/obj/machinery/atmospherics/portable/canister/air, /turf/simulated/floor/plasteel{ - dir = 10; + dir = 1; icon_state = "arrival" }, -/area/station/hallway/secondary/entry/south) +/area/station/hallway/secondary/entry/north) "wSU" = ( /obj/structure/cable{ d1 = 1; @@ -97823,7 +99006,7 @@ /turf/simulated/floor/plating, /area/station/security/prison/cell_block) "xaR" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "xbI" = ( @@ -97848,6 +99031,12 @@ /obj/effect/spawner/random/fungus/frequent, /turf/simulated/wall, /area/station/maintenance/aft) +"xch" = ( +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "brown" + }, +/area/station/hallway/secondary/entry/east) "xcs" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -97889,21 +99078,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "xcL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/access_button{ - autolink_id = "engines_btn_int"; - name = "interior access button"; - pixel_x = -25; - pixel_y = -25 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - initialize_directions = 10 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry/west) +/obj/machinery/door/airlock/external, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry/south) "xcR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -97930,7 +99107,7 @@ }, /area/station/security/permabrig) "xdd" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/library) "xdN" = ( @@ -97978,6 +99155,16 @@ "xgm" = ( /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) +"xgt" = ( +/obj/docking_port/stationary{ + dwidth = 2; + height = 12; + id = "ferry_home"; + name = "port bay 3"; + width = 5 + }, +/turf/space, +/area/space) "xgF" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -98165,6 +99352,9 @@ icon_state = "vault" }, /area/station/turret_protected/ai) +"xlP" = ( +/turf/simulated/floor/wood, +/area/station/hallway/secondary/entry/east) "xlS" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/barricade/wooden, @@ -98294,9 +99484,20 @@ /obj/item/reagent_containers/drinks/cans/beer, /obj/item/reagent_containers/drinks/cans/beer, /obj/item/reagent_containers/drinks/cans/beer, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/supply/expedition) +"xpm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/north) "xpq" = ( /obj/machinery/economy/vending/snack, /turf/simulated/floor/plasteel{ @@ -98424,10 +99625,18 @@ /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plating, /area/station/supply/warehouse) -"xtS" = ( -/obj/structure/reagent_dispensers/fueltank, +"xty" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/station/maintenance/port) +/area/station/hallway/secondary/entry/south) "xtU" = ( /obj/machinery/door/airlock/virology{ name = "Virology Bedroom" @@ -98582,11 +99791,15 @@ }, /area/station/service/chapel) "xyI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/power/apc/directional/east, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "arrival" }, -/obj/machinery/alarm/directional/east, -/turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "xzp" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -98790,6 +100003,24 @@ temperature = 80 }, /area/station/science/xenobiology) +"xEL" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/engineering{ + name = "Power Transmission Laser" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/sign/electricshock{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" + }, +/area/station/maintenance/port) "xES" = ( /obj/machinery/smartfridge/secure/chemistry/virology/preloaded, /obj/structure/reagent_dispensers/virusfood{ @@ -98982,12 +100213,8 @@ /turf/simulated/floor/plating, /area/station/security/range) "xHN" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "xIm" = ( @@ -99086,6 +100313,16 @@ }, /turf/simulated/floor/plating, /area/station/engineering/gravitygenerator) +"xJy" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/landmark/spawner/late/crew, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/arrival/station) "xJD" = ( /obj/machinery/newscaster{ dir = 4; @@ -99253,6 +100490,15 @@ icon_state = "cult" }, /area/station/service/chapel/office) +"xOD" = ( +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/obj/structure/rack, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "caution" + }, +/area/station/engineering/transmission_laser) "xOG" = ( /obj/structure/table/glass, /obj/item/toy/figure/crew/virologist, @@ -99275,12 +100521,16 @@ /turf/simulated/floor/plating, /area/station/ai_monitored/storage/eva) "xPh" = ( -/obj/item/kirbyplants, -/obj/machinery/requests_console/directional/east, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) +/obj/item/radio/intercom{ + name = "south bump"; + pixel_y = -28 + }, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/south) "xPn" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/abandonedbar) "xPG" = ( @@ -99369,7 +100619,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "xRD" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/closet/firecloset, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, @@ -99491,6 +100741,15 @@ }, /turf/simulated/floor/plating, /area/station/aisat) +"xUy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "xUI" = ( /obj/machinery/suit_storage_unit/security/secure, /turf/simulated/floor/plasteel, @@ -99821,6 +101080,12 @@ /obj/effect/spawner/window/reinforced/plasma/grilled, /turf/simulated/floor/plating, /area/station/engineering/controlroom) +"yih" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "caution" + }, +/area/station/engineering/transmission_laser) "yis" = ( /obj/structure/table, /obj/item/storage/bag/dice, @@ -113534,27 +114799,233 @@ aaa aaa aaa aaa -"} -(54,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +"} +(54,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +adh +wts +qbl +bTU +niC +wts +abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +acF +abj +abj +dyn +dyn +dAY +dBF +dAH +dEv +dFU +dyn +dyn +abj +abj +acF +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -113585,6 +115056,8 @@ aaa aaa aaa aaa +"} +(55,1,1) = {" aaa aaa aaa @@ -113655,13 +115128,6 @@ aaa aaa aaa aaa -adh -wts -qbl -bTU -niC -wts -abj aaa aaa aaa @@ -113712,20 +115178,12 @@ aaa aaa aaa acF +hyX +dRi +fDd +xUq +uDs abj -abj -dyn -dyn -dAY -dBF -dAH -dEv -dFU -dyn -dyn -abj -abj -acF aaa aaa aaa @@ -113778,6 +115236,15 @@ aaa aaa aaa aaa +rLB +dzv +dAH +dAH +mtx +dAH +dAH +dFf +rLB aaa aaa aaa @@ -113791,8 +115258,6 @@ aaa aaa aaa aaa -"} -(55,1,1) = {" aaa aaa aaa @@ -113848,6 +115313,8 @@ aaa aaa aaa aaa +"} +(56,1,1) = {" aaa aaa aaa @@ -113912,13 +115379,6 @@ aaa aaa aaa aaa -acF -hyX -dRi -fDd -xUq -uDs -abj aaa aaa aaa @@ -113971,18 +115431,16 @@ aaa aaa aaa aaa -rLB -dzv -dAH -dAH -mtx -dAH -dAH -dFf -rLB aaa aaa aaa +kTj +vuY +hNW +qKQ +abj +nmF +abj aaa aaa aaa @@ -114032,6 +115490,21 @@ aaa aaa aaa aaa +acF +abj +abj +dyn +dyn +dAZ +dBG +dAH +dEw +dFV +dyn +dyn +abj +abj +acF aaa aaa aaa @@ -114048,8 +115521,6 @@ aaa aaa aaa aaa -"} -(56,1,1) = {" aaa aaa aaa @@ -114099,6 +115570,8 @@ aaa aaa aaa aaa +"} +(57,1,1) = {" aaa aaa aaa @@ -114169,13 +115642,6 @@ aaa aaa aaa aaa -kTj -vuY -hNW -qKQ -abj -nmF -abj aaa aaa aaa @@ -114225,21 +115691,12 @@ aaa aaa aaa aaa -acF -abj -abj -dyn -dyn -dAZ -dBG -dAH -dEw -dFV -dyn -dyn -abj -abj -acF +xqE +giK +xLV +xLV +xLV +pMI aaa aaa aaa @@ -114292,6 +115749,17 @@ aaa aaa aaa aaa +abj +abj +rLB +rLB +dCA +dAH +dEK +rLB +rLB +abj +abj aaa aaa aaa @@ -114305,8 +115773,6 @@ aaa aaa aaa aaa -"} -(57,1,1) = {" aaa aaa aaa @@ -114361,6 +115827,8 @@ aaa aaa aaa aaa +"} +(58,1,1) = {" aaa aaa aaa @@ -114426,12 +115894,6 @@ aaa aaa aaa aaa -xqE -giK -xLV -xLV -xLV -pMI aaa aaa aaa @@ -114484,16 +115946,13 @@ aaa aaa aaa aaa +aaa +aaa +xqE abj +bqP abj -rLB -rLB -dCA -dAH -dEK -rLB -rLB -abj +xMr abj aaa aaa @@ -114548,6 +116007,15 @@ aaa aaa aaa aaa +abj +abj +dyn +rLB +dAH +rLB +dyn +abj +abj aaa aaa aaa @@ -114562,8 +116030,6 @@ aaa aaa aaa aaa -"} -(58,1,1) = {" aaa aaa aaa @@ -114618,6 +116084,8 @@ aaa aaa aaa aaa +"} +(59,1,1) = {" aaa aaa aaa @@ -114683,12 +116151,6 @@ aaa aaa aaa aaa -xqE -abj -bqP -abj -xMr -abj aaa aaa aaa @@ -114698,6 +116160,7 @@ aaa aaa aaa aaa +aaZ aaa aaa aaa @@ -114742,14 +116205,11 @@ aaa aaa aaa aaa +xqE abj -abj -dyn -rLB -dAH -rLB -dyn -abj +xLV +fIk +xLV abj aaa aaa @@ -114805,6 +116265,13 @@ aaa aaa aaa aaa +abj +abj +rLB +dDP +rLB +abj +abj aaa aaa aaa @@ -114819,8 +116286,6 @@ aaa aaa aaa aaa -"} -(59,1,1) = {" aaa aaa aaa @@ -114876,6 +116341,8 @@ aaa aaa aaa aaa +"} +(60,1,1) = {" aaa aaa aaa @@ -114895,7 +116362,6 @@ aaa aaa aaa aaa -aaZ aaa aaa aaa @@ -114940,12 +116406,6 @@ aaa aaa aaa aaa -xqE -abj -xLV -fIk -xLV -abj aaa aaa aaa @@ -115000,11 +116460,12 @@ aaa aaa aaa aaa +aaa +aaa +bVf abj abj -rLB -dDP -rLB +hFE abj abj aaa @@ -115062,7 +116523,11 @@ aaa aaa aaa aaa +abj +abj aaa +abj +abj aaa aaa aaa @@ -115076,8 +116541,6 @@ aaa aaa aaa aaa -"} -(60,1,1) = {" aaa aaa aaa @@ -115135,6 +116598,9 @@ aaa aaa aaa aaa +"} +(61,1,1) = {" +aaa aaa aaa aaa @@ -115197,12 +116663,6 @@ aaa aaa aaa aaa -bVf -abj -abj -hFE -abj -abj aaa aaa aaa @@ -115258,10 +116718,12 @@ aaa aaa aaa aaa -abj -abj aaa +xqE abj +aaa +nmF +aaa abj aaa aaa @@ -115319,7 +116781,9 @@ aaa aaa aaa aaa +abj aaa +abj aaa aaa aaa @@ -115333,8 +116797,6 @@ aaa aaa aaa aaa -"} -(61,1,1) = {" aaa aaa aaa @@ -115393,6 +116855,8 @@ aaa aaa aaa aaa +"} +(62,1,1) = {" aaa aaa aaa @@ -115454,12 +116918,8 @@ aaa aaa aaa aaa -xqE -abj aaa -nmF aaa -abj aaa aaa aaa @@ -115516,8 +116976,11 @@ aaa aaa aaa aaa +xqE abj aaa +nmF +aaa abj aaa aaa @@ -115541,207 +117004,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(62,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -xqE -abj -aaa -nmF -aaa -abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaa +aaa +dZV aaa aaa aaa @@ -115995,7 +117260,7 @@ aaa aaa aaa aaa -aaZ +aaa aaa aaa aaa @@ -117779,10 +119044,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa aaZ aaa aaa @@ -117797,8 +119058,12 @@ aaa aaa aaa aaa -dZV -aaa +dmq +dmq +dmq +cHA +cHA +cHA aaa aaa aaa @@ -118048,21 +119313,21 @@ aaa aaa aaa aaa -aaa -aaa -dmq -dmq -dmq -cHA +cRD +cRD +cRD +xCC cHA +cXX +cXX cHA -aaa -aaa -aaa -aaa -aaa -aaa -aaa +reg +reg +vrA +oND +iiL +reg +reg aaa acF abj @@ -118305,21 +119570,21 @@ aaa aaa aaa aaa -cRD -cRD -cRD -xCC -cHA -cXX -cXX -cHA -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cUP +cUQ +vUu +cIu +elb +drn +drn +dmq +reg +mjz +yih +lfT +yih +utt +reg abj acF aaa @@ -118562,21 +119827,21 @@ aaa aaa aaa aaa -cUP -cUQ -vUu -cIu -elb -drn -drn +cRD +cRD +cRD +xCC cHA -abj -aaa -aaa -aaa -aaa -aaa -aaa +sPz +cXU +dmq +xOD +dzl +iwV +hWd +szc +uFi +reg aaa acF aaa @@ -118819,21 +120084,21 @@ aaa aaa aaa aaa -cRD -cRD -cRD -xCC -cHA -sPz -cXU -cHA -cHA -cHA -cHA +aaa +dmq +dmq cHA cHA -aaa -aaa +drn +slE +dmq +jUu +srS +phH +srS +crt +paO +reg abj acF abj @@ -119073,24 +120338,24 @@ abj abj abj abj +acF abj abj abj -abj -dmq -dmq -cHA -cHA -drn -slE -drn -pAC -dpX -cLA -dtU +aaa +aaa cHA +pVK +mjt +eoc cHA -aaa +iNM +srS +hLx +pVU +eeP +qNj +reg abj acF abj @@ -119330,24 +120595,24 @@ cie bXU cie cie -cie +hDE bXU cie cie cie bXU -xtS -cWn -drn -dhG -drn -drn -drn -dhG -drn -cCy -hkk -aaa +cHA +tEl +rbl +vjZ +xEL +gIF +uBY +czb +noG +sZg +apB +oyF abj acF cHA @@ -119594,17 +120859,17 @@ bXU bXU bXU iPQ -cWn +wGs drn +nMD cHA -cHA -cHA -cHA -cHA -drn +reg +reg +reg +jtL maf -hkk -aaa +iiL +reg cHA ddh wZD @@ -119844,24 +121109,24 @@ cie bXU cie cie -cie +hDE bXU cie cie cie bXU vys -drn +aYf dhG cHA cJP cLC rkV cHA -drn +fQI cTi -hkk -aaa +voM +cHA cHA drw cHA @@ -120108,7 +121373,7 @@ abj cbb bXU dmq -drn +aYf cXU cHA cWl @@ -120117,8 +121382,8 @@ lxh cHA sQr sZp +nCh cHA -aaa cHA drn cHA @@ -120365,15 +121630,15 @@ cda cbb cDx bXU -drn -dhG +aYf +fct cHA cHA pWT cHA cHA dtU -drn +gPK cHA cHA cHA @@ -120622,7 +121887,7 @@ cCg cbb cDx bXU -dhG +xFq drn cIv dhG @@ -120630,7 +121895,7 @@ cLA cIS cLA cQu -cLA +qKb cLA drn cWm @@ -120879,15 +122144,15 @@ cCg cDt dCx bXU -cWn -dhG +njt +sat bLN -cJO -cNh -cNh -cNh -drn -drs +joa +eYk +eYk +eYk +rbS +uaW cJO cNh dhG @@ -121136,8 +122401,8 @@ cCg cbb cDv bXU -drn -drn +aYf +gXQ cIw cIx cIx @@ -121393,8 +122658,8 @@ cCg cDu dUG bXU -drn -cXU +aYf +mSr cIx cKt cMU @@ -121650,8 +122915,8 @@ cbb cDv bXU bXU -cWn -cXU +wGs +mSr cIy cLx cOx @@ -122678,8 +123943,8 @@ cCg cbb cDv bXU -cFU -cXU +mAo +mSr cIx cIx cLG @@ -122935,8 +124200,8 @@ cCg cDt dUI bXU -cWw -cXU +mTg +mSr cIx cJS cLH @@ -123192,8 +124457,8 @@ cCg cbb cDv bXU -cFU -cXU +mAo +mSr cIx cJU cLI @@ -123450,7 +124715,7 @@ hhD dVy bXU cFV -drn +gXQ cIB cJV cLJ @@ -123706,8 +124971,8 @@ bXU tlz bXU bXU -cFU -dhG +mAo +xUy cIC cJW cLJ @@ -124221,7 +125486,7 @@ cbi jEI bQr cFY -dsr +peB cIx tJc cLM @@ -124478,7 +125743,7 @@ sYU cDA bQr cFY -dlM +bKE cIx cJZ cLM @@ -125245,11 +126510,11 @@ cbn czp czl cAF -cbo +ahn cdh bQr cWt -drs +gAN cIx cIx cIx @@ -125502,7 +126767,7 @@ cbn czr czl cAF -cbn +cbl cDD ceQ iwU @@ -130035,7 +131300,7 @@ aaa aaa aaa aaa -aaa +dZi aaa aaa aaa @@ -130534,7 +131799,6 @@ aaa aaa aaa aaa -knM aaa aaa aaa @@ -130551,7 +131815,8 @@ aaa aaa aaa aaa -qcA +aaa +aaa aaa aaa aaa @@ -130786,36 +132051,36 @@ aaa aaa aaa aaa -abj -abj -abj -iUU -aef -aef -iUU -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -iUU -qke -rJk -abj -abj -abj -abj -abj -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa abj abj uzN @@ -130887,11 +132152,11 @@ cfq cgW cgX cni -clC +eNh cnh cow cpH -clC +eNh bYj bZO cvh @@ -131042,38 +132307,38 @@ aaa aaa aaa aaa -abj -abj aaa aaa -iUU -pGg -pGg -iUU aaa aaa -abj aaa -iUU -iUU -iUU -iUU -iUU -iUU aaa aaa aaa -abj -iUU -ahQ -iUU aaa -abj aaa aaa aaa aaa -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +anu aaa uzN aqB @@ -131144,11 +132409,11 @@ cfr cgX ciu cni -clC +eNh cni -clC +eNh bvL -clC +eNh bYk ctH crn @@ -131267,11 +132532,47 @@ aaa aaa aaa aaa -"} -(123,1,1) = {" -aaa -aaa -aaa +"} +(123,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -131294,42 +132595,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -adb -iUU -adb -iUU -iUU -iUU -iUU -aef -aef -adb -iUU -iUU -adb -iUU -iUU -aik -aiE -pGg -ajf -iUU -iUU -iUU -iUU -adb -iUU -eKO -iUU -adb -adb -adb -aAr -aAr -aAr aAr aaa uzN @@ -131552,41 +132817,41 @@ aaa aaa aaa aaa -iUU -iUU -uci -pGg -tXb -adZ -san -adZ -aeI -adZ -adZ -afJ -adZ -adZ -agd -age -adZ -adZ -adZ -adZ -adZ -adZ -adZ -rwY -age -agg -adZ -xcL -gtZ -gtZ -meH -oMA -qtk -ani -wSO +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aAr aaa uzN @@ -131809,41 +133074,41 @@ aaa aaa aaa aaa -aeN -pUC -aeN -adt -afh -tnU -fCA -ahg -eYW -ahg -ahg -ahg -ahg -ahg -ahg -ahg -vTw -vTw -cMP -vTw -vTw -vTw -vTw -rPU -vTw -vTw -vTw -amA -amA -hyL -hyL -hhn -anu -wvH -gEs +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaZ +aaa +aaa +aaa +aaa +aaa +aaa +add +ade +add aAr aaa apG @@ -131915,9 +133180,9 @@ cfs crn ciz ckj -clC +hnG ckj -clC +mSB ckj clC bYk @@ -132066,41 +133331,41 @@ aaa aaa aaa aaa -iUU -iUU -iUU -adu -sMV -aeb -ryh -aeb -aeO -aeb -aeb -eCj -aeb -aeb -ltw -aeb -aeb -aeb -aeb -aeb -aeb -qQS -aeb -agB -aeb -mFy -aeb -reW -aeb -wsg -aeb -saK -kWK -ant -anL +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +add +akw +add aAr aaa uzN @@ -132172,9 +133437,9 @@ cft crn ciy ckj -clC +hnG ckj -clC +mSB ckj clC bYj @@ -132295,8 +133560,23 @@ aaa aaa aaa aaa -"} -(127,1,1) = {" +"} +(127,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -132325,39 +133605,24 @@ aaa aaa aaa aaa -adb -iUU -adb -iUU -iUU -iUU -adb -iUU -iUU -adb -iUU -iUU -adb -iUU -iUU pjO -aiF -aiI -pvf -iUU -iUU -iUU -iUU -adb -adb -adb -adb -adb -adb -adb +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aAr +add sgZ -anK +add aAr aaa uzN @@ -132584,37 +133849,37 @@ aaa aaa aaa aaa -abj -abj aaa aaa -abj aaa aaa -abj aaa aaa -abj aaa -iUU -iUU -iUU -iUU -iUU +aaa +aaa +aaa +aaa +aaa +ovL +tRa iUU aaa aaa aaa -abj aaa aaa aaa aaa -abj +aaa +aaa +aaa +aaa aaa aAr +pUC ezV -anL +pUC aAr abj abj @@ -132686,11 +133951,11 @@ cfv crn ciz ckj -clC +koD ckj -clC +koD ckj -clC +koD bYj ctL cvn @@ -132842,36 +134107,36 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +anu abj +doS +vNK +doS abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj -dGS -ant -anL +anu +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +anu +aAr +pfO +wsg +ajf aAr awX awX @@ -132943,11 +134208,11 @@ ckj crn ciz ckj -clC +koD ckj -clC +koD ckj -clC +koD bYj bYj bYj @@ -133102,19 +134367,19 @@ aaa aaa aaa aaa -aaa -acF -aaa +abj +abj abj aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +abj +ovL +ovL +tRa +ovL +ovL +abj aaa aaa aaa @@ -133125,10 +134390,10 @@ aaa aaa aaa abj -aaa -dGS -ant -anL +aAr +aAr +xcL +amN aAr aor aoR @@ -133357,22 +134622,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -acF -aaa -abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +adO +fCA +ovL +aeb +aeb +aeb +aeb +ovL +ovL +ovL +aip +mFy +dMg +ovL +anu aaa aaa aaa @@ -133381,10 +134645,11 @@ aaa aaa aaa aaa -abj aaa -dGS -ant +anu +aAr +urr +nEp anJ rxD apJ @@ -133617,18 +134882,18 @@ aaa aaa aaa aaa -acF -aaa -abj -aaa -aaa -aaa -aaa aaa aaa aaa aaa +abj aaa +doS +aey +qGl +uTX +ovL +abj aaa aaa aaa @@ -133639,10 +134904,10 @@ aaa aaa aaa abj -aaa -dGS -ant -anL +aAr +aeO +afJ +xPh aAr aoS apK @@ -133874,32 +135139,32 @@ aaa aaa aaa aaa -acF -abj -abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa aaa +ovL +doS +ovL +pvf +qGl +gpy +ovL +doS +qcA +abj aaa aaa aaa aaa aaa abj -aaa +aAr dGS -ant -anL +adt +ani +afJ +alx aoo aoo aoo @@ -134094,26 +135359,8 @@ aaa aaa aaa aaa -"} -(134,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +"} +(134,1,1) = {" aaa aaa aaa @@ -134131,9 +135378,7 @@ aaa aaa aaa aaa -acF aaa -abj aaa aaa aaa @@ -134142,6 +135387,7 @@ aaa aaa aaa aaa +aaZ aaa aaa aaa @@ -134152,11 +135398,30 @@ aaa aaa aaa aaa -abj aaa -dGS -ant -anL +xgt +gHk +mUk +gWD +ueF +qGl +mFy +qtk +mUk +qtk +acF +acF +acF +acF +acF +acF +acF +san +lfH +san +pQv +afJ +jOW aoo aoT apL @@ -134379,18 +135644,6 @@ aaa aaa aaa aaa -aaZ -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -acF -aaa -abj aaa aaa aaa @@ -134404,16 +135657,28 @@ aaa aaa aaa aaa +ovL +doS +ovL +vYz +xpm +adx +ovL +doS +ovL +abj aaa aaa aaa aaa aaa abj -aaa aAr -ant -anL +dGS +aAr +uiL +aiH +anP aoo imf apM @@ -134641,232 +135906,188 @@ aaa aaa aaa aaa -dZi -aaa -aaa -aaa -acF -aaa -abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -abj -aaa -aAr -ant -fqF -aoo -aoV -apM -aqL -arC -aoo -azb -axg -aDy -aES -aES -aES -aES -aES -aES -aES -awX -awX -awX -rpN -awX -lfg -wBO -bgq -wBO -lIH -lhu -lhu -aSY -lhu -lIH -awX -npQ -baF -baF -gtL -mPQ -baF -blb -ujL -pQf -baF -bol -bqm -sWn -fOV -ssu -uFJ -bxl -baG -hNh -bEa -bDR -bEp -bJd -bJd -bDR -bDR -bOD -vcb -byO -bUK -chc -bOW -bZT -bOW -lbc -caN -chc -eVz -bOW -twX -bOW -quu -tVa -bsf -bsf -vCM -cvs -bsf -jVv -bsf -bsf -shP -bsf -bst -rxU -cHB -bvV -any -mSQ -rXW -rLK -ezU -eTE -xPG -pLs -bKn -wew -ddi -dau -yid -cPn -hha -dgt -dif -djG -dkR -dsF -dsF -doL -hkY -drz -dsF -dtY -dff -dwi -dwi -dwi -dwi -dwi -wJr -iqc -iqc -iqc -iqc -iqc -iqc -dHE -dEi -dJx -dNK -dMU -dSi -sjQ -dSi -dNK -dMU -dOW -fMc -qFT -ane -djB -xGn -wRb -dIx -xOp -dUc -dUN -dIx -abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -rCT -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa aaa aaa -"} -(137,1,1) = {" +aaa +aaa +aaa +abj +aaa +doS +aey +blc +lXG +ovL +abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +abj +aAr +aiI +rPU +fqF +aoo +aoV +apM +aqL +arC +aoo +azb +axg +aDy +aES +aES +aES +aES +aES +aES +aES +awX +awX +awX +rpN +awX +lfg +wBO +bgq +wBO +lIH +lhu +lhu +aSY +lhu +lIH +awX +npQ +baF +baF +gtL +mPQ +baF +blb +ujL +pQf +baF +bol +bqm +sWn +fOV +ssu +uFJ +bxl +baG +hNh +bEa +bDR +bEp +bJd +bJd +bDR +bDR +bOD +vcb +byO +bUK +chc +bOW +bZT +bOW +lbc +caN +chc +eVz +bOW +twX +bOW +quu +tVa +bsf +bsf +vCM +cvs +bsf +jVv +bsf +bsf +shP +bsf +bst +rxU +cHB +bvV +any +mSQ +rXW +rLK +ezU +eTE +xPG +pLs +bKn +wew +ddi +dau +yid +cPn +hha +dgt +dif +djG +dkR +dsF +dsF +doL +hkY +drz +dsF +dtY +dff +dwi +dwi +dwi +dwi +dwi +wJr +iqc +iqc +iqc +iqc +iqc +iqc +dHE +dEi +dJx +dNK +dMU +dSi +sjQ +dSi +dNK +dMU +dOW +fMc +qFT +ane +djB +xGn +wRb +dIx +xOp +dUc +dUN +dIx +abj +aaa aaa aaa aaa @@ -134879,6 +136100,7 @@ aaa aaa aaa aaa +rCT aaa aaa aaa @@ -134902,14 +136124,14 @@ aaa aaa aaa aaa -acF aaa -abj aaa aaa aaa aaa aaa +"} +(137,1,1) = {" aaa aaa aaa @@ -134923,11 +136145,54 @@ aaa aaa aaa aaa -abj aaa -dGS -ant -anL +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +adO +fCA +ovL +aeb +aeb +aeb +aeb +aeb +aeb +aeb +ovL +ovL +sGT +qQv +adN +ahF +wjP +adO +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +adO +aAr +mej +ivG +kWK aoo vET apM @@ -135155,17 +136420,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -acF +abj abj abj aaa aaa aaa aaa +abj +abj +abj +ovL +fZc +blc +jWY +doS aaa aaa aaa @@ -135177,13 +136446,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa -abj -aaa dGS ant +rPU rBP aoo aoX @@ -135416,32 +136681,32 @@ aaa aaa aaa aaa -acF -aaa -abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa aaa +ovL +doS +ovL +tIM +blc +jWY +doS aaa aaa +apv +apv +apv +agE +apv +apv +apv aaa -abj aaa dGS ant -anL +rPU +eiT aoo aoY ast @@ -135673,31 +136938,31 @@ aaa aaa aaa aaa -acF -aaa -abj -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa aaa +doS +ahV +dqC +fMh +blc +jWY +doS aaa -abj +agE +agD +alv +alv +agE +alv +alv +agD +agE aaa dGS ant +ala alm nmr apQ @@ -135930,32 +137195,32 @@ aaa aaa aaa aaa -acF -aaa -abj -aaa -aaa aaa aaa aaa aaa +doS +jhz +fMh +qGl +blc jWY -aaa -aaa -aaa -aaa -aaa -aaa -ajX -aaa -aaa -aaa -aaa +doS +abj +agD +agE +agF +agF +agD +agF +agF +agE +agD abj -aaa dGS -akG -als +ant +anT +anY aoo apa apR @@ -136187,31 +137452,31 @@ aaa aaa aaa aaa -abj -abj -abj -abj -abj -abj -abj -abj -doS -ahz -doS -abj -abj -abj -abj +aaa +aaa +aaa +aaa doS -pHg +agd +ueF +qGl +cMP +ovL +ovL doS -abj -abj -abj -abj -abj +agE +eHr +ail +ail +hEk +ail +ail +jOE +agE dGS -ant +aAr +aAr +pvQ anL aoo apb @@ -136443,33 +137708,33 @@ aaa aaa aaa aaa -abj -abj aaa aaa -abj aaa aaa -abj aaa doS +oMA +ktI +qGl +blc afb -doS -doS -doS -doS -doS -doS +mUk afb -doS -aaa -abj -aaa -aaa -aaa -aAr -upw -fqF +dbN +ahB +ahB +ahB +ahB +ahB +ahB +ahB +dbN +lpL +lfH +lpL +anT +afc aoo apc apT @@ -136700,33 +137965,33 @@ aaa aaa aaa aaa -adN -ovL -ovL -ovL -ovL -doS +aaa +aaa +aaa +aaa +aaa doS +vrP +rhX +alw +aly ovL -doS -doS -ahz -doS -aio -aiH -aiX -ajy -doS -pHg -doS -doS ovL doS -doS -ovL +agE +seh +ajy +ahB +agF +ahB +alH +aiX +agE +dGS +aAr aAr anp -jOW +kOD aoo aoo aoo @@ -136955,34 +138220,34 @@ aaa aaa aaa aaa -add -add -add -adL -aey +aaa +aaa +aaa +aaa +aaa +aaa +abj +ovL doS -afc -dWL -dWL -pvQ -ffG -rJF -dWL -dWL -dWL -dWL -dWL -dWL -dWL -dWL +ovL ffG -rJF -pvQ -dWL +blc dWL -gpy -amL -ant +doS +abj +agF +ail +ail +ahB +agF +ahB +ail +ail +agF +abj +dGS +ahQ +aeN anO jzs aoq @@ -137212,37 +138477,37 @@ aaa aaa aaa aaa -ade -adx -adO -aed -aez -aeP -jpa -qGl -qGl -qGl +aaa +aaa +aaa +aaa +aaa +aaa +mQO +abj +abj +ovL agJ +blc ajZ -ajZ -ajZ -ajZ -nEp -ajZ -ajZ -ajZ -ajZ -pfO -ajZ -ajZ -ajZ -ajZ -gVk +doS +aaa +agF +ahC +ahC +ahB +agF +ahB +ahC +ahC +agF +aaa +dGS amM -wvH +anT alx aop -aop +hBD aop aop aop @@ -137469,35 +138734,35 @@ aaa aaa aaa aaa -add -add -add -adL -aeA +aaa +aaa +aaa +aaa +aaa +aaa +ovL doS -afj -blc -blc -agh +doS +ovL agC blc -blc -blc -blc -blc -blc -blc -blc -blc -whp -alt -aly -blc -vmP -tIM -amL -ant +knM +doS +aaa +agF +ail +ail +ahB +agF +ahB +ail +ail +agF +aaa +dGS ait +anT +anY aop ape apV @@ -137728,33 +138993,33 @@ aaa aaa aaa aaa -adN -ovL -ovL -ovL -ovL -doS -doS -ovL -doS -doS -ahA -doS -aio -ndb -ndb -ajy -doS +aaa +aaa +aaa +rJk +gtZ +lKr +anU +gtZ +fMh +blc ahA doS -doS -ovL -doS -ovL -ovL -amN -ant -anL +abj +agF +ahC +ahC +ahB +agF +ahB +ahC +ahC +agF +abj +dGS +vTw +anT +anY xVF apf aqg @@ -137985,32 +139250,32 @@ aaa aaa aaa aaa -abj -abj -abj aaa -abj aaa aaa -abj aaa +ahg +aFB +aFB +ahg +ktI +blc +ovL +ovL doS -afb -doS -doS -doS -doS -doS -doS -afb -doS -aaa -abj -aaa -aaa -aaa +agE +xJy +ail +ahB +pHg +ahB +ail +bRC +agE +dGS aAr -ant +aAr +aio anP aop apg @@ -138244,32 +139509,32 @@ aaa aaa aaa aaa -abj -abj -abj -abj -abj -abj -abj -doS -ahA -doS -abj aaa aaa -abj +ovL doS -ahA doS -abj -abj -abj -abj -abj -dGS -ant -anL -aop +ovL +aeP +blc +afb +oOV +afb +dbN +ahB +ahB +ahB +ahB +ahB +ahB +ahB +dbN +lpL +xty +lpL +anT +anY +qtd aop fih xVF @@ -138460,74 +139725,74 @@ aaa aaa aaa aaa -aaa -aaa -aaa -"} -(151,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -acF -aaa +aaa +aaa +aaa +"} +(151,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +mQO abj -aaa -aaa -agE -agD -agE -ahB -agE -agF -agF -agF -agF +abj +ovL +dKW +api +ovL +ovL +doS agE +akz +vZx +agX ahB +oMB +aky +akx agE -agE -aaa -aaa -aaa -aaa +dGS aAr -ann +aAr +adu anQ aou -api +aeJ apZ aqU asA @@ -138758,31 +140023,31 @@ aaa aaa aaa aaa -acF aaa -abj aaa -aee +abj +ovL +doS +ovL +wSO +aez +vmP +ovL +abj agE agE -agT -ahC -ahV -ail -ail -ail -ail -ahV -ahC -akw agE -aaa -aaa -aaa -aaa -dGS +agE +aiE +agE +agE +agE +agE +abj +aAr +uci anl -anR +oTa oTa dhh aqX @@ -139015,32 +140280,32 @@ aaa aaa aaa aaa -acF aaa -abj aaa -aee -agk -agF +aaa +doS +meH +ahi +fMh agU -ahC -ahC -ahC -ahC -ahC -ahC -ahC -ahC -akx -agE +agg +ovL +ovL +aaa +aaa agE -agF +tEQ +ail +tEQ agE aaa -dGS -ant +aaa +aAr +aAr +ann anT -vYz +eDE +aoA apj aqa aqV @@ -139272,31 +140537,31 @@ aaa aaa aaa aaa -acF aaa -abj aaa -aee -agk -agF -agV -ahC -ahC -aim -aim -aim -aim +aaa +doS +gVk +ueF +qGl +agU +hAr +afj +doS +aaa +aaa +agE ajD -ahC -aky -akY -alv -alH -agF +ajD +ajD +agE +aaa aaa dGS -ant +aiG +jpA anT +eDE joU acC aqb @@ -139529,31 +140794,31 @@ aaa aaa aaa aaa -acF -abj -abj aaa -agE -agE -agD +aaa +aaa +doS +rwY +ueF +qGl agW -ahC +ueF ahW -agD -aiG -aiG -aiG -agD -aka -ahC -akZ -alw -alH +doS +abj +aaa +agE +agF agF +agF +agE aaa +abj dGS -ant -anU +rJF +nDl +jZc +eDE lML acC aqc @@ -139748,69 +141013,69 @@ aaa aaa aaa aaa -"} -(156,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +"} +(156,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +doS +oMA +ueF +qGl +agU +oSU +ryh +doS +abj aaa aaa aaa aaa aaa aaa -acF aaa abj -aaa -aee -agk -agF -agX -ahC -ahC -ail -ail -ail -ail -ajF -ahC -aky -ala -alv -alH -agF -aaa dGS -ant +agB +huz anT +eDE wEA acC aqd @@ -140043,31 +141308,31 @@ aaa aaa aaa aaa -acF aaa -abj aaa +aaa +doS aee agk -agF +ktI agU -ahC -ahC -ahC -ahC -ahC -ahC -ahC -ahC -akz -agE -agE -agF -agE +jWY +aeI +doS +abj +abj +abj +aaa +adO aaa +abj +abj +abj dGS +anK ant anT +eDE aoA tCW aqe @@ -140300,31 +141565,31 @@ aaa aaa aaa aaa -acF aaa -abj aaa -aee -agE -agE +aaa +ovL +doS +sGT +qQS agT -ahC -ahV -aim -aim -aim -aim -xPh -ahC +amA +qzl akA -agE -aaa -aaa -aaa -aaa -dGS -ant -anT +grB +grB +grB +slc +ahz +akA +grB +grB +grB +slc +slc +age +upw +uQW eDE aeJ aea @@ -140552,38 +141817,38 @@ aaa aaa aaa aaa +abj +abj +abj aaa aaa aaa aaa -aaa -acF -aaa abj -aaa -aaa -agE -agD -agE -ahE -agE -agF -agF -agF -agF -agE +abj +abj +ovL +tIM +agU ahE -agE -agE -aaa -aaa -aaa -aaa -aAr +slc +onX ans -lpL +aik +sWI +pMq +akA +vsP +aef +gVr +agA +aiF +slc +adZ +anT +rrZ aoB -apv +aeJ aqZ aqZ asW @@ -140807,39 +142072,39 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -abj -abj -abj -abj -abj -abj -abj -grB -ahF -grB -abj -aaa -aaa -abj -grB +adO +fCA +ovL +aeb +aeb +aeb +aeb +aeb +aeb +aeb +ovL +ovL +ovL +qQv +tnU ahF -grB -abj -abj -abj -abj -abj -dGS -ant -anL -aoC +akA +tXb +ans +gEs +sWI +aec +slc +lQG +akG +akG +ajF +fiu +akA +mra +saK +nAP +uhO aoC hTD jJl @@ -141033,29 +142298,8 @@ aaa aaa aaa aaa -"} -(161,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +"} +(161,1,1) = {" aaa aaa aaa @@ -141073,27 +142317,48 @@ aaa aaa aaa aaa -abj -abj aaa aaa aaa -grB -pMq -grB -grB -grB -grB -grB -grB -pMq -grB aaa -abj aaa aaa aaa -aAr +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +abj +aaa +grB +adL +pGg +anW +slc +akY +sWI +aim +sWI +xch +slc +hhn +akG +akG +aed +eBn +akA +adL hbv als aoC @@ -141331,28 +142596,28 @@ aaa aaa aaa aaa -aaa -abj -abj -aaa -grB -ahF +slc grB +slc +adL +pGg +anW +slc pWw -tRa +sWI ajd sWI -grB -ahF -grB -grB +whp slc -grB -grB +vBL +afh +afh +eKO +uTN slc -amN -ant -anL +adL +hbv +anW jJl apm arM @@ -141587,28 +142852,28 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -abj -grB -aip -vrP -aip -aip -aip -aip -aip +agh +reW +alt +reW +afh +pGg +wRJ +amz +alG +alG +alG +alG +alG xHN -aip -agA alG -aip -aip +alG +alG +alG +alG amz amL -ant +hbv anW aoC apn @@ -141845,26 +143110,26 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +slc grB -aFB -fiu -fiu +slc +vHl +ajX +vcE +fPG +vcE +vcE +vcE +vcE vcE -fiu -fiu -fiu giE kLd kNa -kNa -kNa -ahi +vcE +vcE +gnm fPG -amM +vcE wvH anX aoC @@ -142102,28 +143367,28 @@ aaa aaa aaa aaa -aaa -aaa -aaa +abj aaa grB -aec -akb -bld -bld -bld +anv +afh +rQS +amB +afh +rVD bld +rQS akb -bld +uSO inH xyI -ivG -pCM rQS +pCM +inH amB -amL -ant -anY +rQS +cYR +anW axm apo apo @@ -142352,24 +143617,24 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +adO +oCh +slc +anR +anR +anR +anR slc slc slc -aeM slc +eCj +slc +slc +aeM slc slc +akZ slc slc mqP @@ -142378,7 +143643,7 @@ axm axm awY axm -axm +agV anv anZ axm @@ -142611,16 +143876,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abj +abj +abj +abj +acF +akA +sMV +aeA +hhG +xlP slc aeC hhG @@ -142872,13 +144137,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -slc +abj +grB +jpa +ndb +jpa +nWU +akA aeK aeQ aeK @@ -143129,13 +144394,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +abj slc +hyL +aka +ltw +qke +akA aeL afa aeL @@ -143386,13 +144651,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abj +akA +slc +grB +grB +akA +akA aeL afd aeL @@ -143643,11 +144908,11 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +anu +abj +abj +abj +anu aaa aaa aeL diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 1de73ac8b4aff..50335f2e18a16 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -176,7 +176,7 @@ /area/station/aisat/atmos) "acf" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/structure/cable{ d2 = 8; icon_state = "0-4" @@ -300,7 +300,7 @@ /area/station/maintenance/asmaint) "aeo" = ( /obj/effect/spawner/random/fungus/maybe, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/dorms/starboard) "aer" = ( @@ -470,7 +470,7 @@ }, /area/station/public/dorms) "agc" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "agk" = ( @@ -547,7 +547,7 @@ /obj/machinery/cooker/deepfryer, /obj/item/organ/internal/lungs/vox, /obj/effect/decal/cleanable/blood/xeno, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -691,7 +691,7 @@ /area/station/public/shops) "aiN" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -824,7 +824,7 @@ /turf/simulated/floor/wood, /area/station/command/office/hop) "akg" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, @@ -850,7 +850,7 @@ pixel_x = 1; pixel_y = 5 }, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/machinery/requests_console/directional/west, /turf/simulated/floor/plasteel{ dir = 9; @@ -975,6 +975,19 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) +"amj" = ( +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "amn" = ( /turf/simulated/wall/r_wall, /area/station/hallway/secondary/entry/east) @@ -982,7 +995,7 @@ /obj/structure/flora/ausbushes/sparsegrass, /obj/item/paper/crumpled, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandoned_office) "ams" = ( @@ -993,7 +1006,7 @@ /turf/simulated/floor/plating/airless, /area/station/aisat/breakroom) "amC" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -1438,7 +1451,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/asteroid_filtering) "apl" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/aft2) "aps" = ( @@ -1553,7 +1566,7 @@ }, /area/station/science/robotics) "aqu" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -1662,8 +1675,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "arh" = ( -/obj/effect/landmark/burnturf, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "arj" = ( @@ -1990,7 +2003,7 @@ }, /area/station/security/lobby) "atx" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/starboard) @@ -2211,7 +2224,7 @@ }, /area/station/supply/expedition) "avQ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "avZ" = ( @@ -2448,6 +2461,11 @@ icon_state = "dark" }, /area/station/aisat/service) +"ayn" = ( +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/trash, +/turf/simulated/floor/wood, +/area/station/maintenance/apmaint2) "ayt" = ( /obj/structure/lattice/catwalk/mining, /obj/structure/railing, @@ -2646,7 +2664,7 @@ }, /area/station/science/xenobiology) "aAM" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/glass/beaker, /turf/simulated/floor/plasteel{ @@ -2695,7 +2713,7 @@ /area/station/engineering/ai_transit_tube) "aBc" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) "aBe" = ( @@ -2726,7 +2744,7 @@ }, /area/station/science/research) "aBm" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -2972,6 +2990,25 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) +"aFa" = ( +/obj/effect/spawner/random/blood/maybe, +/obj/effect/spawner/random/trash, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/aft2) "aFc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -3567,8 +3604,8 @@ /area/station/science/genetics) "aKZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/oil/maybe, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "aLc" = ( @@ -3918,6 +3955,18 @@ }, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) +"aNW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "aNZ" = ( /obj/structure/cable{ d1 = 1; @@ -3990,7 +4039,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -4077,11 +4126,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "aPv" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/apmaint) "aPz" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) @@ -4269,7 +4318,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "aRt" = ( @@ -4326,7 +4375,7 @@ /area/station/science/toxins/mixing) "aRP" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/light/small{ dir = 4 }, @@ -4373,7 +4422,7 @@ pixel_y = 3 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "aSf" = ( @@ -4412,7 +4461,7 @@ /area/station/security/permabrig) "aSl" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/electrical) "aSp" = ( @@ -4612,7 +4661,7 @@ }, /area/station/medical/storage/secondary) "aUS" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "aVh" = ( @@ -4834,7 +4883,7 @@ }, /area/station/security/permabrig) "aXl" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/machinery/suit_storage_unit/expedition, /turf/simulated/floor/plasteel{ dir = 5; @@ -4995,8 +5044,8 @@ /area/station/medical/sleeper) "aYj" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/oil/maybe, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "aYl" = ( @@ -5062,6 +5111,11 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -5180,7 +5234,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) @@ -5347,8 +5401,8 @@ /turf/simulated/floor/plating, /area/station/security/range) "bae" = ( -/obj/effect/landmark/burnturf, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -5469,7 +5523,7 @@ /area/station/maintenance/apmaint2) "baM" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -5573,7 +5627,7 @@ /area/station/public/fitness) "bcm" = ( /obj/machinery/space_heater, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "bcy" = ( @@ -5656,7 +5710,7 @@ }, /area/station/security/permabrig) "bdD" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "beb" = ( @@ -5905,7 +5959,7 @@ }, /area/station/hallway/primary/central/se) "bgM" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -6058,7 +6112,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "bhY" = ( @@ -6182,7 +6236,7 @@ }, /area/station/command/bridge) "bja" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -6318,7 +6372,7 @@ /area/station/turret_protected/aisat/interior) "bkF" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -6429,7 +6483,7 @@ }, /area/station/aisat/breakroom) "blH" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -6992,7 +7046,7 @@ /area/station/security/prison/cell_block) "bqd" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -7059,7 +7113,7 @@ /obj/structure/sign/fire{ pixel_x = 32 }, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/machinery/light/small{ dir = 4 }, @@ -7201,7 +7255,7 @@ }, /area/station/hallway/primary/starboard) "bsr" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/dorms/starboard) "bss" = ( @@ -7460,7 +7514,7 @@ "buE" = ( /obj/structure/bed, /obj/item/bedsheet/black, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/carpet/royalblack, /area/station/maintenance/fsmaint) "buG" = ( @@ -7643,7 +7697,7 @@ /area/station/medical/cryo) "bvM" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bvW" = ( @@ -7749,7 +7803,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "bwz" = ( @@ -7949,7 +8003,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/security/fore) "byO" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/molten_object/large{ @@ -8126,6 +8180,20 @@ icon_state = "darkredcorners" }, /area/station/security/brig) +"bAo" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/door/airlock/engineering{ + name = "Power Transmission Laser" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/engine) "bAr" = ( /obj/machinery/flasher/portable, /obj/item/radio/intercom/department/security{ @@ -8262,13 +8330,13 @@ "bAT" = ( /obj/structure/table, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "bBm" = ( /obj/structure/table, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "bBn" = ( @@ -8399,8 +8467,8 @@ /area/station/science/lobby) "bCs" = ( /obj/item/clothing/suit/chef/classic, -/obj/effect/landmark/burnturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -8447,7 +8515,7 @@ /obj/structure/grille/broken, /obj/item/stack/rods, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/port) "bCU" = ( @@ -8513,7 +8581,7 @@ /turf/simulated/floor/plasteel, /area/station/command/bridge) "bDq" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/shard/shark_teeth{ name = "Unathi teeth" }, @@ -8791,7 +8859,7 @@ /area/station/medical/medbay2) "bFQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -9121,7 +9189,7 @@ /obj/structure/chair/stool{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) @@ -9667,12 +9735,12 @@ /area/station/maintenance/asmaint) "bNN" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/landmark/spawner/xeno, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bNO" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "bNS" = ( @@ -9842,7 +9910,7 @@ /turf/space, /area/station/engineering/solar/aft_starboard) "bPu" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/card/id/prisoner, /obj/structure/cable{ d1 = 1; @@ -10091,7 +10159,7 @@ }, /area/station/science/robotics/chargebay) "bRl" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -10659,7 +10727,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "bVQ" = ( @@ -10882,7 +10950,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/sorting) "bYg" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/engineering/gravitygenerator) "bYq" = ( @@ -10975,7 +11043,7 @@ /area/station/maintenance/fsmaint2) "bZm" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "bZs" = ( @@ -10984,6 +11052,16 @@ }, /turf/space, /area/space/nearstation) +"bZD" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/engine) "bZJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11046,7 +11124,7 @@ /area/station/engineering/engine/supermatter) "cas" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/disposalpipe/segment/corner{ dir = 8 }, @@ -11238,8 +11316,8 @@ /obj/item/reagent_containers/drinks/cans/beer, /obj/item/reagent_containers/drinks/h_chocolate, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/cobweb/right/rare, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "cbU" = ( @@ -11315,7 +11393,7 @@ /area/station/maintenance/fsmaint) "cdd" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -11337,7 +11415,7 @@ /area/station/maintenance/apmaint2) "cdn" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -11602,19 +11680,6 @@ icon_state = "darkblue" }, /area/station/medical/surgery/observation) -"cfp" = ( -/obj/effect/spawner/random/trash, -/obj/effect/spawner/random_spawners/blood_maybe, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/station/maintenance/apmaint2) "cfy" = ( /obj/item/kirbyplants, /obj/machinery/alarm/directional/north, @@ -11828,7 +11893,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) "chL" = ( @@ -11937,7 +12002,7 @@ /obj/structure/table, /obj/item/poster/random_contraband, /obj/item/stack/cable_coil, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft) "ciO" = ( @@ -11963,7 +12028,7 @@ }, /area/station/security/permabrig) "ciZ" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, @@ -11982,7 +12047,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "cjO" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -12373,7 +12438,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "cnZ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint) "coj" = ( @@ -12565,7 +12630,7 @@ "cqq" = ( /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/wood, /area/station/maintenance/dorms/starboard) "cqt" = ( @@ -12634,7 +12699,7 @@ /obj/machinery/atmospherics/portable/canister/air{ filled = 0.05 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_port) "cqZ" = ( @@ -12798,7 +12863,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "csh" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/abandoned_office) "csk" = ( @@ -12832,6 +12897,12 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) +"csT" = ( +/obj/effect/spawner/random/oil/maybe, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/trash, +/turf/simulated/floor/plating, +/area/station/maintenance/dorms/port) "csX" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -12848,6 +12919,12 @@ icon_state = "whitepurple" }, /area/station/science/xenobiology) +"cth" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "cto" = ( /obj/machinery/newscaster{ dir = 8; @@ -13007,11 +13084,11 @@ /turf/simulated/floor/plasteel, /area/station/science/storage) "cuN" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/dorms/fore) "cuO" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) "cuW" = ( @@ -13049,7 +13126,7 @@ /area/station/hallway/secondary/garden) "cvb" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) @@ -13098,7 +13175,7 @@ /area/station/service/hydroponics) "cvM" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -13147,7 +13224,7 @@ /turf/simulated/wall/r_wall, /area/space/nearstation) "cwc" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -13520,7 +13597,7 @@ /area/station/medical/sleeper) "czA" = ( /obj/machinery/recharge_station, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "czE" = ( @@ -13553,6 +13630,16 @@ icon_state = "browncorner" }, /area/station/supply/storage) +"czV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/firealarm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "czZ" = ( /obj/structure/cable{ d1 = 2; @@ -13633,7 +13720,7 @@ "cBd" = ( /obj/structure/table, /obj/item/storage/bag/money, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) "cBr" = ( @@ -13675,7 +13762,7 @@ /turf/simulated/floor/grass/jungle, /area/station/maintenance/aft) "cBK" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/ash, /obj/structure/sign/poster/contraband/random{ pixel_x = -32 @@ -13745,7 +13832,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/engine/supermatter) "cCo" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/wood, /area/station/maintenance/aft2) "cCu" = ( @@ -13951,11 +14038,6 @@ icon_state = "bluecorner" }, /area/station/hallway/primary/fore/north) -"cEL" = ( -/obj/effect/spawner/random/trash, -/obj/effect/landmark/damageturf, -/turf/simulated/floor/wood, -/area/station/maintenance/apmaint2) "cET" = ( /obj/machinery/light{ dir = 4 @@ -14047,6 +14129,13 @@ }, /turf/simulated/floor/wood, /area/station/service/clown) +"cFI" = ( +/obj/effect/turf_decal/caution/stand_clear, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "cFM" = ( /obj/structure/chair{ dir = 4 @@ -14107,7 +14196,7 @@ }, /area/station/service/hydroponics) "cGm" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/starboard) "cGp" = ( @@ -14253,7 +14342,7 @@ "cGW" = ( /obj/effect/decal/cleanable/confetti, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -14303,6 +14392,11 @@ /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) +"cHm" = ( +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/trash, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint2) "cHD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -14384,7 +14478,7 @@ }, /area/station/service/chapel/funeral) "cIq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -14461,7 +14555,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) @@ -14551,7 +14645,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "cJQ" = ( @@ -14624,7 +14718,7 @@ /area/station/hallway/primary/central/west) "cKS" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/ash, /obj/structure/cable{ d1 = 4; @@ -14691,7 +14785,7 @@ /obj/structure/toilet{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/light/small{ dir = 8 }, @@ -14704,6 +14798,20 @@ /obj/item/storage/fancy/cigarettes/cigpack_robust, /turf/simulated/floor/carpet, /area/station/hallway/primary/central/se) +"cLC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel, +/area/station/maintenance/apmaint2) "cLE" = ( /obj/structure/table, /obj/item/poster/random_contraband, @@ -14726,7 +14834,7 @@ "cLO" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "cLR" = ( @@ -14907,7 +15015,7 @@ /area/station/service/chapel/funeral) "cOq" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cOt" = ( @@ -15069,7 +15177,7 @@ /obj/structure/table, /obj/item/crowbar, /obj/item/soap, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "cPN" = ( @@ -15102,7 +15210,7 @@ /area/station/hallway/secondary/entry/west) "cQb" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -15175,7 +15283,7 @@ /area/station/security/processing) "cQy" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -15303,7 +15411,7 @@ /turf/space, /area/space) "cSc" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/wrench, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -15335,7 +15443,7 @@ /turf/simulated/floor/carpet, /area/station/public/mrchangs) "cSv" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -15690,7 +15798,7 @@ /area/station/medical/cloning) "cVy" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "cVJ" = ( @@ -16160,7 +16268,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandoned_office) "dbu" = ( @@ -16340,7 +16448,7 @@ /obj/item/lighter/zippo/nt_rep, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/item/stack/spacecash/c1000, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/machinery/light/small{ dir = 1 }, @@ -16376,6 +16484,12 @@ icon_state = "redyellowfull" }, /area/station/maintenance/apmaint2) +"ddu" = ( +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "ddv" = ( /obj/structure/cable{ d1 = 4; @@ -17017,6 +17131,21 @@ }, /turf/simulated/floor/plating, /area/station/science/xenobiology) +"djZ" = ( +/obj/effect/spawner/random/oil/maybe, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/storage) "dka" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -17284,7 +17413,7 @@ "dmz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -17315,12 +17444,12 @@ "dmF" = ( /obj/item/paper/crumpled, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandoned_office) "dmI" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -17544,7 +17673,7 @@ "doE" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -17558,7 +17687,7 @@ name = "Hidden spikes" }, /obj/structure/flora/ausbushes/fullgrass, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/grass/jungle, /area/station/maintenance/aft) "doM" = ( @@ -17629,7 +17758,7 @@ /area/station/hallway/secondary/entry/west) "dpk" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -17651,7 +17780,7 @@ }, /area/station/public/dorms) "dpq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -17756,7 +17885,7 @@ /turf/simulated/floor/wood, /area/station/command/office/cmo) "dro" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/spawner/nukedisc_respawn, /turf/simulated/floor/wood, @@ -17786,7 +17915,7 @@ /turf/simulated/floor/plasteel, /area/station/security/range) "drv" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -17836,7 +17965,7 @@ /area/station/engineering/atmos) "drN" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -17864,7 +17993,7 @@ /area/station/maintenance/apmaint2) "drV" = ( /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "drX" = ( @@ -18197,7 +18326,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -18242,7 +18371,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/wood, /area/station/maintenance/aft2) "duW" = ( @@ -19109,7 +19238,7 @@ /area/station/science/xenobiology) "dDv" = ( /obj/machinery/hydroponics/soil, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 1 @@ -19837,7 +19966,7 @@ /obj/structure/table, /obj/item/wrench, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft) "dKr" = ( @@ -19906,7 +20035,7 @@ /obj/structure/table, /obj/item/clothing/head/welding, /obj/item/weldingtool, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "dLt" = ( @@ -20169,6 +20298,11 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/mapping_helpers/airlock/autoname, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "dNw" = ( @@ -20207,7 +20341,7 @@ }, /area/station/science/xenobiology) "dNP" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -20225,7 +20359,7 @@ /area/station/hallway/primary/starboard/south) "dOf" = ( /obj/item/food/meat, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) @@ -20355,6 +20489,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/engine, /area/station/maintenance/starboard) +"dPN" = ( +/obj/effect/mapping_helpers/turfs/burn, +/obj/item/trash/spentcasing/shotgun, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/station/maintenance/aft2) "dPQ" = ( /obj/structure/closet/secure_closet/evidence, /obj/structure/sign/poster/official/random{ @@ -20379,6 +20519,11 @@ /obj/structure/disposalpipe/segment/corner{ dir = 1 }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "dPV" = ( @@ -20415,7 +20560,7 @@ }, /area/station/aisat/service) "dQg" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) @@ -20561,7 +20706,7 @@ /turf/simulated/wall, /area/station/command/office/cmo) "dRH" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -20613,7 +20758,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "dSc" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "dSf" = ( @@ -20826,11 +20971,11 @@ /area/station/maintenance/fsmaint) "dVM" = ( /obj/machinery/economy/vending/coffee, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "dVN" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) @@ -20934,8 +21079,8 @@ }, /area/station/engineering/control) "dXh" = ( -/obj/effect/landmark/burnturf, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/blood/maybe, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -21116,7 +21261,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "dZo" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -21262,6 +21407,17 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard) +"eaB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/catwalk, +/area/station/engineering/transmission_laser) "eaD" = ( /turf/simulated/floor/plasteel{ icon_state = "arrival" @@ -21454,7 +21610,7 @@ /area/station/engineering/ai_transit_tube) "ecx" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -21695,7 +21851,7 @@ /obj/machinery/mech_bay_recharge_port{ dir = 2 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft) "eeH" = ( @@ -21916,7 +22072,7 @@ }, /area/station/public/dorms) "egS" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/starboard) "egV" = ( @@ -22003,7 +22159,7 @@ /obj/machinery/power/treadmill{ dir = 8 }, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "eiD" = ( @@ -22164,7 +22320,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "ejL" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/command/vault) "ejP" = ( @@ -22210,7 +22366,7 @@ /turf/simulated/floor/carpet, /area/station/command/office/cmo) "ekg" = ( -/obj/structures/plasmageyser, +/obj/structure/plasmageyser, /turf/simulated/floor/lava/plasma/fuming, /area/station/engineering/atmos/asteroid_core) "eki" = ( @@ -22227,7 +22383,7 @@ /area/station/science/toxins/mixing) "ekj" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "ekk" = ( @@ -22451,7 +22607,7 @@ /area/station/maintenance/aft2) "emi" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -22562,8 +22718,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/mapping_helpers/airlock/access/any/command, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/command/general, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -22638,7 +22794,7 @@ /turf/simulated/floor/grass, /area/station/hallway/secondary/garden) "enX" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -22669,7 +22825,7 @@ /area/station/engineering/gravitygenerator) "eod" = ( /obj/structure/closet/secure_closet/miner, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "brown" @@ -22679,7 +22835,7 @@ /obj/item/chair, /obj/item/shard, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) @@ -22881,7 +23037,7 @@ /turf/simulated/floor/carpet/red, /area/station/public/fitness) "eqB" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -22944,6 +23100,14 @@ icon_state = "dark" }, /area/station/medical/storage/secondary) +"eqR" = ( +/obj/effect/spawner/random/blood/maybe, +/obj/item/trash/spentcasing/shotgun, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/station/maintenance/dorms/port) "eqW" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -23050,6 +23214,11 @@ /obj/item/toy/plushie/ipcplushie, /turf/simulated/floor/carpet, /area/station/medical/psych) +"esj" = ( +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/trash, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint) "esq" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable, @@ -23193,11 +23362,11 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_4) "etA" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/solar_maintenance/fore_port) "etN" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/item/storage/toolbox/emergency, /obj/structure/table, /obj/machinery/light/small{ @@ -23265,7 +23434,7 @@ /area/station/maintenance/abandonedbar) "euA" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "euH" = ( @@ -23703,11 +23872,11 @@ /area/station/maintenance/apmaint2) "eys" = ( /obj/machinery/space_heater, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "eyx" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -23951,7 +24120,7 @@ "eAx" = ( /obj/structure/rack, /obj/item/tank/internals/emergency_oxygen, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/machinery/light/small{ dir = 1 }, @@ -24005,7 +24174,7 @@ /area/station/public/locker) "eBd" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, @@ -24047,7 +24216,7 @@ /area/station/engineering/atmos) "eBv" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "eBw" = ( @@ -24095,7 +24264,7 @@ /area/station/command/office/hop) "eCl" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light/small{ dir = 4 }, @@ -24517,7 +24686,7 @@ /area/station/maintenance/fsmaint2) "eFY" = ( /obj/machinery/space_heater, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "eGc" = ( @@ -24575,7 +24744,7 @@ "eGz" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "eGC" = ( @@ -24620,7 +24789,7 @@ /area/station/engineering/atmos/asteroid_filtering) "eGP" = ( /obj/structure/musician/piano, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "eGU" = ( @@ -24640,6 +24809,23 @@ icon_state = "darkred" }, /area/station/security/brig) +"eHd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/camera{ + c_tag = "AI Satellite Exterior West"; + dir = 8; + network = list("SS13","MiniSat") + }, +/obj/machinery/power/apc/directional/east, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "eHf" = ( /obj/structure/railing/corner{ dir = 1 @@ -24688,9 +24874,7 @@ }, /area/station/engineering/break_room/secondary) "eHF" = ( -/obj/machinery/computer/prisoner{ - req_access = list(2) - }, +/obj/machinery/computer/prisoner, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -24794,6 +24978,23 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) +"eJg" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/storage) "eJr" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/simulated/floor/plating, @@ -24842,7 +25043,7 @@ /area/station/engineering/atmos/storage) "eJK" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "eJL" = ( @@ -24866,7 +25067,7 @@ }, /area/station/engineering/engine) "eJT" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/security/aft_starboard) "eJV" = ( @@ -25218,12 +25419,12 @@ /obj/machinery/photocopier{ toner = 0 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel, /area/station/public/storage/office) "eNJ" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "eOe" = ( @@ -25313,7 +25514,7 @@ }, /area/station/public/dorms) "eOD" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -25484,7 +25685,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/port) "ePB" = ( @@ -25643,7 +25844,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_starboard) "eRV" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "eRW" = ( @@ -25831,8 +26032,8 @@ /area/station/hallway/primary/central/se) "eUe" = ( /obj/effect/decal/cleanable/molten_object/large, -/obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/oil/maybe, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -25959,7 +26160,7 @@ /area/station/maintenance/security/aft_starboard) "eVo" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -26067,7 +26268,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/incinerator) "eVT" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -26357,7 +26558,7 @@ /area/station/maintenance/asmaint) "eYj" = ( /obj/effect/mob_spawn/human/corpse/assistant, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" @@ -26430,7 +26631,7 @@ /turf/simulated/floor/plating, /area/station/service/chapel) "eYQ" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light/small, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -26573,7 +26774,7 @@ /turf/simulated/floor/carpet/orange, /area/station/service/kitchen) "eZJ" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel/white/side, /area/station/maintenance/asmaint) "eZK" = ( @@ -26835,7 +27036,7 @@ }, /area/station/medical/surgery/observation) "fbI" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/station/maintenance/aft2) "fcb" = ( @@ -27418,9 +27619,9 @@ }, /area/station/public/shops) "fgs" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -27548,7 +27749,7 @@ /turf/simulated/floor/wood, /area/station/command/office/captain) "fhh" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "fhm" = ( @@ -27669,7 +27870,7 @@ /area/station/service/bar) "fje" = ( /obj/structure/grille/broken, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) "fjf" = ( @@ -27774,7 +27975,7 @@ /area/station/command/office/ce) "fkc" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -27902,12 +28103,6 @@ "flb" = ( /turf/simulated/floor/plasteel, /area/station/engineering/ai_transit_tube) -"flp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash, -/obj/effect/landmark/burnturf, -/turf/simulated/floor/plating, -/area/station/maintenance/dorms/starboard) "fls" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 5; @@ -28033,12 +28228,12 @@ /area/station/engineering/atmos) "fmF" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "fmJ" = ( /obj/structure/closet/cardboard, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "fmK" = ( @@ -28382,7 +28577,7 @@ }, /area/station/hallway/spacebridge/security/west) "foU" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, @@ -28481,6 +28676,15 @@ }, /turf/space, /area/station/engineering/solar/aft_starboard) +"fpF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/trash, +/obj/structure/disposalpipe/segment/corner{ + dir = 2 + }, +/turf/simulated/floor/plasteel, +/area/station/maintenance/dorms/starboard) "fpM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -28694,7 +28898,7 @@ /obj/structure/rack, /obj/item/extinguisher, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "frB" = ( @@ -29103,6 +29307,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/engine, /area/station/engineering/engine) "fvl" = ( @@ -29208,7 +29417,7 @@ }, /area/station/science/toxins/mixing) "fwd" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/engineering/secure_storage) @@ -29268,7 +29477,7 @@ "fwP" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "fwS" = ( @@ -29979,7 +30188,7 @@ "fEa" = ( /obj/structure/table, /obj/item/scalpel, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/item/food/fried_vox{ pixel_y = 11 }, @@ -30117,7 +30326,7 @@ /turf/simulated/floor/grass, /area/station/medical/reception) "fFT" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "fFW" = ( @@ -30378,7 +30587,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -30402,7 +30611,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "fIl" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -30453,7 +30662,7 @@ "fIG" = ( /obj/structure/rack, /obj/item/storage/toolbox/emergency, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -30758,7 +30967,7 @@ }, /area/station/hallway/primary/fore/north) "fLj" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -30909,7 +31118,7 @@ /obj/effect/decal/cleanable/blood/tracks/mapped{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) @@ -31072,7 +31281,7 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/port) "fNz" = ( @@ -31093,11 +31302,6 @@ /obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel, /area/station/ai_monitored/storage/eva) -"fNH" = ( -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random/trash, -/turf/simulated/floor/plating, -/area/station/maintenance/apmaint2) "fNL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -31125,7 +31329,7 @@ }, /area/station/security/lobby) "fOc" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -31172,12 +31376,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) -"fOt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash, -/obj/effect/landmark/damageturf, -/turf/simulated/floor/wood, -/area/station/maintenance/apmaint2) "fOu" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -31285,8 +31483,7 @@ /area/station/public/shops) "fPs" = ( /obj/machinery/computer/prisoner{ - dir = 8; - req_access = list(2) + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -31331,7 +31528,7 @@ "fPN" = ( /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/aft2) "fPO" = ( @@ -31703,7 +31900,7 @@ /obj/structure/closet/crate{ name = "Silver Crate" }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/machinery/firealarm/directional/west, /obj/machinery/light/small{ dir = 1 @@ -31942,7 +32139,7 @@ /obj/structure/rack, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft) "fWG" = ( @@ -32127,7 +32324,7 @@ /area/station/maintenance/asmaint) "fYW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "fYX" = ( @@ -32316,7 +32513,7 @@ /turf/simulated/floor/plasteel, /area/station/service/theatre) "gbw" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "purple" @@ -32493,6 +32690,15 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) +"gcE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "gcF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -32608,11 +32814,11 @@ /turf/simulated/floor/plasteel, /area/station/command/office/ce) "gdS" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -32760,7 +32966,7 @@ /area/station/supply/storage) "geX" = ( /obj/structure/closet, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) @@ -32940,14 +33146,6 @@ /obj/structure/sign/securearea, /turf/simulated/wall, /area/station/science/research) -"ggS" = ( -/obj/item/trash/spentcasing/shotgun, -/obj/effect/spawner/random_spawners/blood_maybe, -/obj/effect/landmark/burnturf, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/station/maintenance/dorms/port) "ggT" = ( /obj/structure/morgue{ dir = 2 @@ -32956,6 +33154,15 @@ icon_state = "cult" }, /area/station/service/chapel/office) +"ggZ" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "blackcorner" + }, +/area/station/engineering/transmission_laser) "ghb" = ( /obj/item/clothing/head/welding{ pixel_x = -3; @@ -33487,7 +33694,7 @@ /area/station/hallway/primary/starboard/south) "gkP" = ( /obj/machinery/space_heater, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "gkT" = ( @@ -33580,7 +33787,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "gmb" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/roller{ pixel_x = -2; pixel_y = 10 @@ -33611,7 +33818,7 @@ pixel_y = 32 }, /obj/item/paper, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "gmo" = ( @@ -33662,7 +33869,7 @@ "gmB" = ( /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt/roach, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "gmD" = ( @@ -33750,7 +33957,7 @@ /area/station/maintenance/aft2) "gnA" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -33901,7 +34108,7 @@ pixel_x = 26 }, /obj/structure/headspear, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/aft) "gpf" = ( @@ -33910,7 +34117,7 @@ /area/station/maintenance/aft) "gph" = ( /obj/structure/bed, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/clothing/under/rank/medical/nursesuit, /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, @@ -33999,7 +34206,7 @@ dir = 8; pixel_y = 10 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -34300,12 +34507,6 @@ "gtu" = ( /turf/simulated/floor/wood, /area/station/public/dorms) -"gtw" = ( -/obj/effect/landmark/burnturf, -/obj/item/trash/spentcasing/shotgun, -/obj/effect/spawner/random_spawners/cobweb_left_rare, -/turf/simulated/floor/plating, -/area/station/maintenance/aft2) "gtz" = ( /obj/structure/cable{ d1 = 2; @@ -34749,7 +34950,7 @@ /area/station/supply/sorting) "gyH" = ( /obj/machinery/economy/slot_machine, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "gyJ" = ( @@ -34792,7 +34993,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "gzv" = ( @@ -34908,7 +35109,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) "gAX" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -35180,7 +35381,7 @@ /turf/simulated/floor/engine, /area/station/engineering/engine) "gDA" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -35313,7 +35514,7 @@ "gEd" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/item/extinguisher/mini, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -35714,7 +35915,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "gHC" = ( @@ -35742,7 +35943,7 @@ "gHI" = ( /obj/machinery/recharge_station, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) "gHK" = ( @@ -36045,7 +36246,7 @@ "gKv" = ( /obj/item/trash/can, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "gKE" = ( @@ -36069,9 +36270,9 @@ /area/station/maintenance/storage) "gKI" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) "gKV" = ( @@ -36191,6 +36392,20 @@ }, /turf/simulated/floor/engine, /area/station/engineering/engine) +"gMe" = ( +/obj/machinery/alarm/directional/east, +/obj/item/stack/cable_coil, +/obj/item/multitool, +/obj/item/clothing/gloves/color/yellow, +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "gMl" = ( /obj/structure/grille, /turf/simulated/floor/plating, @@ -36328,7 +36543,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "gNW" = ( @@ -36431,7 +36646,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "gOI" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -36545,7 +36760,7 @@ /area/station/supply/office) "gQc" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) @@ -36572,7 +36787,7 @@ }, /area/station/hallway/primary/fore) "gQi" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -36616,7 +36831,7 @@ /turf/simulated/floor/wood, /area/station/command/office/cmo) "gQY" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/flour/foam, /turf/simulated/floor/plating, @@ -37075,7 +37290,7 @@ }, /area/station/maintenance/asmaint) "gVK" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/machinery/conveyor{ dir = 4; id = "Skynet_heavy" @@ -37085,7 +37300,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/assembly_line) "gVP" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/simulated/floor/plating, @@ -37137,6 +37352,11 @@ icon_state = "redfull" }, /area/station/security/permabrig) +"gWw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light, +/turf/simulated/floor/plating, +/area/station/maintenance/storage) "gWB" = ( /obj/structure/table, /obj/item/stack/tape_roll, @@ -37325,7 +37545,7 @@ /obj/item/flashlight, /obj/effect/decal/cleanable/dirt, /obj/item/storage/toolbox/emergency, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "gXX" = ( @@ -38355,7 +38575,7 @@ }, /area/station/science/research) "hht" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -38679,7 +38899,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/incinerator) "hjH" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/disposalpipe/segment/corner{ dir = 2 }, @@ -38781,7 +39001,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "hkF" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "hkJ" = ( @@ -38879,7 +39099,7 @@ }, /area/station/science/genetics) "hmo" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "hmq" = ( @@ -38910,7 +39130,7 @@ /turf/simulated/floor/engine, /area/station/engineering/engine) "hmw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/public/toilet/lockerroom) "hmx" = ( @@ -38969,7 +39189,7 @@ /obj/structure/mirror{ pixel_y = 28 }, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "hna" = ( @@ -39606,8 +39826,8 @@ }, /area/station/medical/virology) "hsV" = ( -/obj/effect/spawner/random_spawners/blood_maybe, -/obj/effect/landmark/burnturf, +/obj/effect/spawner/random/blood/maybe, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "hsY" = ( @@ -39724,7 +39944,7 @@ }, /area/station/security/permabrig) "hui" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "hum" = ( @@ -39856,7 +40076,7 @@ /obj/item/flashlight{ pixel_y = -12 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "hvy" = ( @@ -39937,7 +40157,7 @@ }, /area/station/engineering/equipmentstorage) "hwb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "hwd" = ( @@ -40063,8 +40283,8 @@ /area/station/security/permabrig) "hxd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/landmark/burnturf, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/oil/maybe, /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, @@ -40290,7 +40510,7 @@ }, /area/station/security/range) "hyE" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/plating, /area/station/maintenance/abandoned_garden) @@ -40534,7 +40754,7 @@ /turf/simulated/floor/plasteel, /area/station/security/prison/cell_block) "hAW" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -40751,7 +40971,7 @@ /area/station/maintenance/fsmaint2) "hCe" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "hCh" = ( @@ -40850,7 +41070,7 @@ /turf/simulated/floor/plating, /area/station/engineering/atmos/asteroid_maint) "hCF" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) @@ -40878,7 +41098,7 @@ /area/station/science/xenobiology) "hCN" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "hCS" = ( @@ -40928,7 +41148,7 @@ /area/station/maintenance/aft2) "hDy" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, @@ -40950,7 +41170,7 @@ /area/station/maintenance/aft2) "hDA" = ( /obj/effect/decal/cleanable/crayon, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/engine/cult, /area/station/maintenance/apmaint) "hDC" = ( @@ -41212,7 +41432,7 @@ /obj/item/trash/plate{ pixel_y = -19 }, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "hGA" = ( @@ -41671,7 +41891,7 @@ /area/station/maintenance/apmaint) "hKN" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, @@ -41840,11 +42060,11 @@ /obj/item/decorations/sticky_decorations/flammable/googlyeyes{ pixel_y = -5 }, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "hNh" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -41941,7 +42161,7 @@ /turf/simulated/floor/engine, /area/station/science/xenobiology) "hNX" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -42029,7 +42249,7 @@ /area/station/public/dorms) "hPu" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "hPx" = ( @@ -42130,7 +42350,7 @@ "hQP" = ( /obj/structure/closet/emcloset, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "hQU" = ( @@ -42170,7 +42390,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 8 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -42254,8 +42474,8 @@ }, /area/station/security/brig) "hSJ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/landmark/burnturf, +/obj/effect/spawner/random/oil/maybe, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "hSK" = ( @@ -42291,7 +42511,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/incinerator) "hTk" = ( @@ -42329,7 +42549,7 @@ }, /area/station/science/research) "hTG" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -42348,7 +42568,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "hUe" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -42387,7 +42607,7 @@ /turf/simulated/floor/plating, /area/station/security/warden) "hUH" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -42527,7 +42747,7 @@ /turf/simulated/floor/plating, /area/station/engineering/break_room) "hVN" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -42627,7 +42847,7 @@ }, /area/station/science/rnd) "hWC" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) @@ -42646,6 +42866,19 @@ icon_state = "whitegreen" }, /area/station/medical/virology) +"hWF" = ( +/obj/effect/spawner/random/blood/maybe, +/obj/effect/spawner/random/trash, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/station/maintenance/apmaint2) "hWI" = ( /obj/machinery/door/airlock/engineering/glass{ autoclose = 0; @@ -43006,7 +43239,7 @@ /turf/simulated/floor/engine, /area/station/engineering/engine) "iam" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /mob/living/simple_animal/mouse, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -43162,7 +43395,7 @@ /area/station/security/permabrig) "ibO" = ( /obj/machinery/space_heater, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "ibR" = ( @@ -43346,7 +43579,7 @@ /turf/space, /area/station/engineering/solar/aft_port) "idv" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "idC" = ( @@ -43477,7 +43710,7 @@ /area/station/science/explab) "ieS" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -43514,9 +43747,9 @@ /turf/simulated/floor/carpet, /area/station/service/library) "ifj" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "ifm" = ( @@ -43564,7 +43797,7 @@ /area/station/medical/break_room) "ifF" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -43614,7 +43847,7 @@ "ifZ" = ( /obj/effect/decal/cleanable/vomit, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -43639,7 +43872,7 @@ "igc" = ( /obj/structure/table, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/structure/extinguisher_cabinet{ name = "north bump"; pixel_y = 30 @@ -43856,7 +44089,7 @@ /area/station/maintenance/apmaint2) "ihE" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "ihH" = ( @@ -44099,7 +44332,7 @@ /area/station/aisat/atmos) "ike" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -44281,7 +44514,7 @@ /obj/structure/rack, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -44703,6 +44936,12 @@ icon_state = "browncorner" }, /area/station/supply/office) +"iqx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/trash, +/turf/simulated/floor/plating, +/area/station/maintenance/dorms/starboard) "iqC" = ( /obj/structure/chair/sofa/corp, /turf/simulated/floor/plasteel{ @@ -44712,7 +44951,7 @@ "iqE" = ( /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/incinerator) "iqF" = ( @@ -44733,6 +44972,11 @@ }, /turf/simulated/floor/wood, /area/station/command/office/rd) +"iqK" = ( +/obj/effect/mapping_helpers/turfs/burn, +/obj/item/trash/spentcasing/shotgun, +/turf/simulated/floor/plating, +/area/station/maintenance/dorms/port) "iqL" = ( /obj/effect/turf_decal/delivery, /obj/item/radio/intercom{ @@ -44852,7 +45096,7 @@ /area/station/science/rnd) "isn" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "isq" = ( @@ -44899,7 +45143,7 @@ /turf/simulated/floor/plating, /area/station/security/prisonershuttle) "isH" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ @@ -45430,6 +45674,11 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/engine, /area/station/engineering/engine) "ixQ" = ( @@ -45600,10 +45849,24 @@ icon_state = "cafeteria" }, /area/station/service/kitchen) +"ize" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/turfs/burn, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/random/trash, +/turf/simulated/floor/plating, +/area/station/maintenance/dorms/port) "izg" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -45693,7 +45956,7 @@ }, /area/station/hallway/primary/starboard/south) "iAa" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -45965,11 +46228,11 @@ /obj/machinery/floodlight{ light_power = 1 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "iCP" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt, /obj/item/shard, @@ -46106,7 +46369,7 @@ /area/station/security/permabrig) "iEr" = ( /obj/effect/spawner/random/barrier/grille_maybe, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "iEs" = ( @@ -46149,8 +46412,8 @@ /turf/simulated/floor/wood, /area/station/maintenance/dorms/starboard) "iEK" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/starboard) "iEL" = ( @@ -46174,7 +46437,7 @@ /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "iEU" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -46216,7 +46479,7 @@ }, /area/station/security/brig) "iFt" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -46321,7 +46584,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "iGc" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -46436,7 +46699,7 @@ /turf/simulated/floor/engine, /area/station/engineering/engine) "iGU" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/aft) "iGZ" = ( @@ -46474,7 +46737,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "iHq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/shard, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating, @@ -46523,7 +46786,7 @@ /turf/simulated/floor/lava/plasma/fuming, /area/station/engineering/atmos/asteroid_core) "iHB" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -46542,7 +46805,7 @@ /obj/effect/decal/cleanable/glass, /obj/item/shard, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/wood, /area/station/maintenance/aft2) "iHQ" = ( @@ -46619,7 +46882,7 @@ /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "iIw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/dorms/starboard) "iID" = ( @@ -46862,6 +47125,11 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -46916,6 +47184,19 @@ /obj/item/poster/random_contraband, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) +"iLz" = ( +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/transmission_laser/west, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/transmission_laser) "iLD" = ( /obj/structure/railing{ dir = 4 @@ -46974,7 +47255,7 @@ }, /area/station/service/library) "iMd" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -47075,7 +47356,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) @@ -47095,7 +47376,7 @@ }, /area/station/aisat/service) "iMZ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fsmaint) "iNa" = ( @@ -47268,14 +47549,6 @@ icon_state = "darkgrey" }, /area/station/security/range) -"iOO" = ( -/obj/item/trash/spentcasing/shotgun, -/obj/effect/spawner/random_spawners/blood_maybe, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/station/maintenance/dorms/port) "iOR" = ( /obj/structure/girder, /turf/simulated/floor/plating, @@ -47451,7 +47724,7 @@ /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/wood, /area/station/maintenance/dorms/starboard) "iQa" = ( @@ -47854,7 +48127,7 @@ }, /area/station/hallway/primary/central/west) "iUn" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/random{ pixel_y = 32 @@ -47995,7 +48268,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "iVu" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -48318,10 +48591,9 @@ /turf/simulated/wall, /area/station/public/storage/office) "iYK" = ( -/obj/effect/spawner/window/reinforced/grilled, /obj/effect/spawner/airlock/s_to_n/long, -/turf/simulated/floor/plating, -/area/station/maintenance/storage) +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "iYO" = ( /obj/item/radio/intercom/locked/prison{ name = "Prison Intercom (General)"; @@ -48403,7 +48675,7 @@ /turf/simulated/floor/carpet, /area/station/public/dorms) "iZx" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -48814,7 +49086,7 @@ /turf/simulated/floor/plasteel, /area/station/command/teleporter) "jdo" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -49317,29 +49589,10 @@ /area/station/public/vacant_office) "jiR" = ( /obj/structure/rack, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) -"jiX" = ( -/obj/effect/spawner/random/trash, -/obj/effect/spawner/random_spawners/blood_maybe, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/aft2) "jiY" = ( /turf/simulated/wall, /area/space/nearstation) @@ -49376,7 +49629,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -49426,6 +49679,11 @@ }, /turf/simulated/floor/carpet, /area/station/public/arcade) +"jjQ" = ( +/obj/effect/spawner/random/cobweb/right/rare, +/obj/effect/spawner/random/trash, +/turf/simulated/floor/wood, +/area/station/maintenance/dorms/starboard) "jjT" = ( /mob/living/simple_animal/bunny, /obj/structure/railing{ @@ -49532,7 +49790,7 @@ /area/station/engineering/engine) "jkJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -49560,7 +49818,7 @@ /area/station/engineering/atmos) "jla" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -49670,7 +49928,7 @@ /area/station/security/brig) "jlL" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -49727,7 +49985,7 @@ /turf/simulated/floor/grass/no_creep, /area/station/medical/virology) "jmd" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "jmr" = ( @@ -49770,7 +50028,7 @@ /obj/item/circuitboard/sleeper, /obj/effect/spawner/random/maintenance, /obj/item/stack/cable_coil, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/structure/closet/wardrobe/medical_white, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -49967,7 +50225,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "jof" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) @@ -50646,7 +50904,7 @@ }, /area/station/public/dorms) "jvq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/space_heater, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -50660,6 +50918,18 @@ "jvz" = ( /turf/simulated/wall/r_wall, /area/station/engineering/gravitygenerator) +"jvA" = ( +/obj/structure/sign/electricshock{ + pixel_x = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "jvB" = ( /turf/simulated/floor/bluegrid, /area/station/telecomms/computer) @@ -50685,6 +50955,14 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/north) +"jvX" = ( +/obj/effect/spawner/random/blood/maybe, +/obj/effect/mapping_helpers/turfs/burn, +/obj/item/trash/spentcasing/shotgun, +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/station/maintenance/dorms/port) "jwc" = ( /obj/machinery/light, /obj/effect/turf_decal/stripes/line, @@ -51954,7 +52232,7 @@ /turf/simulated/floor/grass, /area/station/service/kitchen) "jGK" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -52062,7 +52340,7 @@ "jHx" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "jHz" = ( @@ -52107,7 +52385,7 @@ "jHZ" = ( /obj/structure/closet/emcloset, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "jIe" = ( @@ -52118,7 +52396,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "jIn" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/security/fore) "jIp" = ( @@ -52423,7 +52701,7 @@ /obj/structure/chair/office, /obj/item/restraints/handcuffs/cable/red, /obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -52483,6 +52761,12 @@ icon_state = "darkredcorners" }, /area/station/security/brig) +"jMc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "blackcorner" + }, +/area/station/engineering/transmission_laser) "jMk" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ @@ -52512,7 +52796,7 @@ /area/station/engineering/engine) "jMq" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "jMs" = ( @@ -52878,7 +53162,7 @@ /area/station/hallway/primary/fore) "jPo" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) @@ -52977,8 +53261,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) "jQA" = ( -/obj/effect/landmark/burnturf, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/cobweb/left/rare, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -53055,7 +53339,7 @@ /turf/simulated/floor/plasteel, /area/station/public/pet_store) "jRf" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -53170,7 +53454,7 @@ /area/station/maintenance/incinerator) "jRO" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -53292,7 +53576,7 @@ /turf/simulated/floor/engine, /area/station/science/test_chamber) "jTc" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -53532,7 +53816,7 @@ }, /area/station/security/permabrig) "jWe" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -53609,7 +53893,7 @@ /area/station/public/storage/tools/auxiliary) "jWC" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/aft2) "jWF" = ( @@ -53790,7 +54074,7 @@ /obj/item/clothing/suit/straight_jacket, /obj/item/clothing/glasses/sunglasses/blindfold, /obj/item/clothing/mask/muzzle, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/radio/intercom/department/security{ pixel_x = 28 }, @@ -54057,7 +54341,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "kbt" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -54119,7 +54403,7 @@ /area/station/maintenance/dorms/starboard) "kcg" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -54193,8 +54477,7 @@ /area/station/hallway/primary/fore/north) "kcA" = ( /obj/machinery/computer/prisoner{ - dir = 4; - req_access = list(2) + dir = 4 }, /obj/machinery/button/windowtint{ dir = 4; @@ -54319,7 +54602,7 @@ }, /area/station/hallway/primary/fore/north) "kdx" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/abandonedbar) "kdB" = ( @@ -54467,7 +54750,7 @@ /area/station/engineering/solar/aft_port) "kfa" = ( /obj/structure/closet/secure_closet/freezer/meat, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/effect/decal/cleanable/dirt, /obj/item/food/meat/human, /obj/item/food/meat/human, @@ -54556,7 +54839,7 @@ name = "north bump"; pixel_y = 24 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandoned_office) "kgg" = ( @@ -54726,7 +55009,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "khL" = ( @@ -54842,7 +55125,7 @@ /area/station/maintenance/apmaint2) "kiE" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -55035,7 +55318,7 @@ "kkD" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/abandoned_office) @@ -55123,7 +55406,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/mapping_helpers/airlock/windoor/access/all/command, +/obj/effect/mapping_helpers/airlock/windoor/access/all/command/general, /turf/simulated/floor/plasteel, /area/station/command/bridge) "klt" = ( @@ -55260,7 +55543,7 @@ dir = 4 }, /obj/item/stack/rods, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -55285,7 +55568,7 @@ /obj/structure/table, /obj/item/trash/tray, /obj/item/poster/random_contraband, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/landmark/spawner/nukedisc_respawn, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -55509,7 +55792,7 @@ "kpm" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "kpq" = ( @@ -55528,7 +55811,7 @@ dir = 9 }, /obj/effect/spawner/random/barrier/grille_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "kpO" = ( @@ -55632,7 +55915,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "kqI" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/fore) @@ -55677,7 +55960,7 @@ "kqW" = ( /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "kqZ" = ( @@ -55711,7 +55994,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/aft2) "krq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -55792,7 +56075,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/warehouse) "kse" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/fore) "ksj" = ( @@ -55965,7 +56248,7 @@ "ktC" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "ktI" = ( @@ -55976,7 +56259,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -56082,12 +56365,6 @@ icon_state = "dark" }, /area/station/science/genetics) -"kuZ" = ( -/obj/effect/spawner/random/trash, -/obj/effect/spawner/random_spawners/cobweb_right_rare, -/obj/structure/table_frame, -/turf/simulated/floor/plating, -/area/station/maintenance/apmaint2) "kvh" = ( /obj/machinery/light, /turf/simulated/floor/plasteel, @@ -56123,7 +56400,7 @@ }, /area/station/security/armory/secure) "kvV" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) "kvZ" = ( @@ -56258,7 +56535,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "kwN" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/engineering/secure_storage) "kwO" = ( @@ -56416,7 +56693,7 @@ "kyJ" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "kyR" = ( @@ -56745,7 +57022,7 @@ /turf/simulated/floor/carpet/orange, /area/station/service/kitchen) "kBy" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/radio/intercom/department/security{ pixel_y = -28 }, @@ -56990,7 +57267,7 @@ /area/station/science/xenobiology) "kEH" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) @@ -57080,7 +57357,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -57166,9 +57443,9 @@ }, /area/station/hallway/secondary/entry/lounge) "kHi" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "kHn" = ( @@ -57364,8 +57641,8 @@ "kJn" = ( /obj/structure/table/wood, /obj/item/storage/fancy/cigarettes/cigpack_shadyjims, -/obj/effect/spawner/random_spawners/cobweb_left_rare, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/cobweb/left/rare, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "kJt" = ( @@ -57815,7 +58092,7 @@ /area/station/science/test_chamber) "kML" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -57859,7 +58136,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) "kMW" = ( @@ -57904,7 +58181,7 @@ /area/station/legal/magistrate) "kNt" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -57982,6 +58259,26 @@ dir = 8 }, /area/station/hallway/primary/central/west) +"kOf" = ( +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fpmaint) "kOh" = ( /obj/structure/table, /obj/item/book/manual/supermatter_engine, @@ -58016,7 +58313,7 @@ /area/station/hallway/primary/central/se) "kOl" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "kOn" = ( @@ -58159,7 +58456,7 @@ /area/station/service/chapel) "kQc" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/cap/visible{ dir = 4 }, @@ -58464,6 +58761,21 @@ /obj/item/storage/box, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) +"kSW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/storage) "kTb" = ( /obj/machinery/atmospherics/binary/pump{ name = "Mix to Gas" @@ -58504,6 +58816,26 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) +"kTs" = ( +/obj/effect/spawner/random/trash, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/turfs/burn, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/dorms/fore) "kTt" = ( /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plating, @@ -58636,7 +58968,7 @@ /area/station/medical/virology) "kUV" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "kVa" = ( @@ -58893,7 +59225,7 @@ }, /area/station/security/lobby) "kYa" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -58934,7 +59266,7 @@ /area/station/supply/qm) "kYn" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -59004,7 +59336,7 @@ }, /mob/living/simple_animal/cockroach, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/light/small, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -59022,7 +59354,7 @@ /turf/simulated/floor/plasteel, /area/station/command/bridge) "kZq" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/restraints/handcuffs/cable/zipties, /obj/item/kitchen/knife, /turf/simulated/floor/plasteel{ @@ -59171,7 +59503,7 @@ }, /area/station/engineering/equipmentstorage) "laP" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/shreds, /turf/simulated/floor/plating, @@ -59367,7 +59699,7 @@ dir = 8; pixel_y = 10 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/aft) "ldA" = ( @@ -59520,7 +59852,7 @@ "leW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/flora/ausbushes/sparsegrass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandoned_office) "lfe" = ( @@ -59579,7 +59911,7 @@ /area/station/medical/psych) "lfN" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -59892,7 +60224,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "liC" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/flour/foam, /obj/item/paper/maintengine, @@ -60000,7 +60332,7 @@ /area/station/security/permabrig) "ljY" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandoned_office) "lkf" = ( @@ -60333,7 +60665,7 @@ /turf/simulated/floor/plating/asteroid/ancient/airless, /area/station/engineering/atmos/asteroid) "lnB" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -60471,6 +60803,14 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/station/command/bridge) +"loM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/transmission_laser) "loN" = ( /turf/simulated/wall/r_wall, /area/station/science/explab/chamber) @@ -60521,7 +60861,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/fore) @@ -60630,7 +60970,7 @@ dir = 8 }, /obj/item/food/candy/coin, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "lpY" = ( @@ -60850,7 +61190,7 @@ }, /area/station/medical/cloning) "lrR" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -60908,7 +61248,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "lsu" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellowcorner" @@ -60916,7 +61256,7 @@ /area/station/engineering/hardsuitstorage) "lsw" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) @@ -61120,7 +61460,7 @@ /area/station/maintenance/security/fore) "luo" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) @@ -61589,7 +61929,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -61878,7 +62218,7 @@ /area/station/hallway/primary/starboard/south) "lAu" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -62129,7 +62469,7 @@ /turf/simulated/floor/plasteel, /area/station/public/dorms) "lCx" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -62150,7 +62490,7 @@ "lCO" = ( /obj/structure/table, /obj/item/flashlight, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "lCV" = ( @@ -62226,7 +62566,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "lDR" = ( @@ -62446,19 +62786,6 @@ icon_state = "purplecorner" }, /area/station/command/bridge) -"lFR" = ( -/obj/structure/closet/crate/secure{ - req_one_access = list(33,41) - }, -/obj/item/circuitboard/thermomachine{ - pixel_x = -5 - }, -/obj/item/circuitboard/chem_dispenser, -/obj/effect/spawner/random/maintenance, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, -/turf/simulated/floor/plating, -/area/station/maintenance/security/fore) "lGc" = ( /obj/item/paper, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -62487,7 +62814,7 @@ /obj/structure/sink{ pixel_y = 22 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -62526,16 +62853,9 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandoned_office) -"lGI" = ( -/obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/spawner/random/trash, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/station/maintenance/apmaint) "lGO" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -63389,7 +63709,7 @@ }, /area/station/medical/virology) "lRo" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/confetti, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -63429,7 +63749,7 @@ }, /area/station/hallway/secondary/exit) "lRz" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/storage) "lRC" = ( @@ -63696,7 +64016,7 @@ /area/station/maintenance/apmaint) "lUF" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -63908,7 +64228,7 @@ /area/station/command/server) "lWB" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "lWD" = ( @@ -64014,7 +64334,7 @@ /obj/structure/bed{ dir = 1 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/random{ pixel_y = -32 @@ -64045,6 +64365,18 @@ icon_state = "dark" }, /area/station/turret_protected/aisat/interior) +"lXE" = ( +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/turf/simulated/floor/plating, +/area/station/maintenance/fsmaint) "lXF" = ( /obj/effect/turf_decal/delivery/hollow, /obj/effect/turf_decal/arrows{ @@ -64815,7 +65147,7 @@ }, /area/station/hallway/primary/starboard) "mgs" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "mgz" = ( @@ -64948,7 +65280,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "mhP" = ( @@ -65008,7 +65340,7 @@ }, /area/station/medical/medbay2) "mit" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -65131,7 +65463,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint2) "mjE" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -65238,6 +65570,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/station/maintenance/starboard) +"mkQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "mlc" = ( /turf/simulated/floor/plasteel{ dir = 5; @@ -65311,12 +65652,12 @@ "mlr" = ( /obj/item/cigbutt/roach, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 8 }, /obj/effect/landmark/spawner/xeno, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/aft2) "mlB" = ( @@ -65668,7 +66009,7 @@ /area/station/command/office/cmo) "moy" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -66037,6 +66378,24 @@ }, /turf/simulated/floor/wood, /area/station/service/bar) +"mrC" = ( +/obj/machinery/door/airlock/engineering{ + name = "Power Transmission Laser" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/engineering/transmission_laser) "mrH" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = -32 @@ -66317,7 +66676,7 @@ }, /area/station/science/robotics) "muL" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -66810,7 +67169,7 @@ /area/station/public/construction) "mAY" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "mBq" = ( @@ -67067,7 +67426,7 @@ pixel_x = 26 }, /obj/structure/headspear, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -67204,7 +67563,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "mDY" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/security/aft_starboard) "mDZ" = ( @@ -67327,7 +67686,7 @@ pixel_y = 9; pixel_x = 9 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -67342,7 +67701,7 @@ }, /area/station/security/main) "mFO" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/fpmaint) "mFX" = ( @@ -67366,7 +67725,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 }, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "mGi" = ( @@ -67379,7 +67738,7 @@ "mGn" = ( /obj/effect/decal/cleanable/dirt, /obj/item/kirbyplants/dead, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/electrical) "mGp" = ( @@ -67425,7 +67784,7 @@ /obj/structure/flora/ausbushes/fullgrass{ pixel_y = 16 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/grass/jungle, /area/station/maintenance/aft) "mGM" = ( @@ -67625,9 +67984,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) +"mJM" = ( +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "mJR" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) @@ -67691,7 +68053,7 @@ "mKz" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/random{ pixel_y = 32 @@ -67793,7 +68155,7 @@ "mLn" = ( /obj/structure/chair/comfy/brown, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -67992,7 +68354,7 @@ "mNF" = ( /obj/structure/table/wood, /obj/item/camera, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -68384,7 +68746,7 @@ /area/space) "mRC" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/item/poster/random_contraband, /obj/item/toy/crayon/random, /obj/machinery/alarm/directional/north, @@ -68401,7 +68763,7 @@ "mRF" = ( /obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "mRL" = ( @@ -68418,7 +68780,7 @@ pixel_x = -32 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "mRQ" = ( @@ -68438,7 +68800,7 @@ }, /area/station/science/break_room) "mRW" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" @@ -68522,8 +68884,7 @@ /area/station/command/meeting_room) "mSw" = ( /obj/machinery/computer/prisoner{ - dir = 1; - req_access = list(2) + dir = 1 }, /obj/item/radio/intercom{ name = "south bump"; @@ -68560,7 +68921,7 @@ }, /area/station/legal/courtroom) "mSL" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "mSP" = ( @@ -68607,7 +68968,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "mTb" = ( @@ -68646,7 +69007,7 @@ "mTm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/abandoned_garden) "mTp" = ( @@ -68817,7 +69178,7 @@ /area/station/supply/warehouse) "mUs" = ( /obj/machinery/shieldgen, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "mUt" = ( @@ -68848,6 +69209,17 @@ pixel_y = 20 }, /obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/maintenance/storage) "mUI" = ( @@ -69154,7 +69526,7 @@ /area/station/maintenance/starboard) "mXx" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /mob/living/simple_animal/mouse, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -69517,6 +69889,11 @@ }, /obj/machinery/atmospherics/pipe/manifold/visible/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/engine, /area/station/engineering/engine) "naT" = ( @@ -69593,7 +69970,7 @@ }, /area/station/service/theatre) "ncF" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/security/aft_starboard) "ncH" = ( @@ -69729,9 +70106,23 @@ icon_state = "yellowcorner" }, /area/station/hallway/primary/central/sw) +"ndF" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Secondary Cooling" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/engine, +/area/station/engineering/engine) "ndJ" = ( /obj/effect/spawner/random/barrier/grille_maybe, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "ndK" = ( @@ -70164,7 +70555,7 @@ /area/station/supply/storage) "nhh" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -70178,7 +70569,7 @@ "nho" = ( /obj/item/paper, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandoned_office) "nhr" = ( @@ -70285,7 +70676,7 @@ }, /area/station/public/shops) "nia" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/shard{ icon_state = "small" }, @@ -70301,7 +70692,7 @@ }, /area/station/public/sleep) "niO" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/assembly_line) "niR" = ( @@ -70683,7 +71074,7 @@ /area/station/engineering/atmos) "nmS" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) "nmV" = ( @@ -70732,7 +71123,7 @@ "nni" = ( /obj/structure/table, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "nnm" = ( @@ -70893,7 +71284,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "noG" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/fsmaint2) "noO" = ( @@ -70920,12 +71311,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/station/supply/lobby) -"npe" = ( -/obj/effect/landmark/burnturf, -/obj/item/trash/spentcasing/shotgun, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/station/maintenance/aft2) "npi" = ( /turf/simulated/wall/r_wall, /area/station/ai_monitored/storage/eva) @@ -70937,7 +71322,7 @@ }, /area/station/service/hydroponics) "npp" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/engine/cult, /area/station/maintenance/apmaint) "npx" = ( @@ -71018,7 +71403,7 @@ /area/station/supply/expedition) "npP" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /obj/item/shard{ icon_state = "medium" @@ -71159,21 +71544,6 @@ icon_state = "arrival" }, /area/station/hallway/secondary/entry) -"nqv" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, -/obj/effect/spawner/random/trash, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, -/area/station/maintenance/apmaint2) "nqw" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -71200,7 +71570,7 @@ }, /area/station/aisat/breakroom) "nqK" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/fpmaint) @@ -71386,7 +71756,7 @@ }, /obj/item/stack/cable_coil/random, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "nsp" = ( @@ -71475,7 +71845,7 @@ /area/station/maintenance/dorms/starboard) "ntM" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -71648,7 +72018,7 @@ }, /obj/item/pen/red, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandoned_office) "nwc" = ( @@ -71867,7 +72237,7 @@ /turf/simulated/floor/wood, /area/station/command/office/rd) "nxL" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/shard{ icon_state = "small" }, @@ -71960,7 +72330,7 @@ /area/station/hallway/primary/central/ne) "nyp" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -71986,6 +72356,12 @@ }, /turf/simulated/floor/plasteel, /area/station/ai_monitored/storage/eva) +"nyB" = ( +/obj/effect/spawner/random/oil/maybe, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash, +/turf/simulated/floor/plasteel, +/area/station/maintenance/dorms/port) "nyD" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -72003,7 +72379,7 @@ /area/station/hallway/spacebridge/security/west) "nyK" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -72083,8 +72459,8 @@ /area/station/supply/lobby) "nzO" = ( /obj/structure/mecha_wreckage/odysseus, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft) "nzR" = ( @@ -72217,7 +72593,7 @@ /turf/simulated/floor/wood, /area/station/hallway/secondary/exit) "nBe" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) @@ -72381,7 +72757,7 @@ /area/station/maintenance/aft2) "nCL" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "nCP" = ( @@ -72492,7 +72868,7 @@ /obj/structure/chair/office/dark{ dir = 8 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/wood, @@ -72529,7 +72905,7 @@ /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "nEt" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "nEu" = ( @@ -72987,7 +73363,7 @@ }, /area/station/science/rnd) "nHE" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 2; @@ -73081,7 +73457,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/extinguisher_cabinet{ name = "east bump"; pixel_x = 27 @@ -73201,12 +73577,6 @@ /obj/item/reagent_containers/drinks/cans/badminbrew, /turf/simulated/floor/plating, /area/station/maintenance/starboard) -"nJB" = ( -/obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/spawner/random/trash, -/obj/effect/landmark/burnturf, -/turf/simulated/floor/plating, -/area/station/maintenance/dorms/port) "nJD" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 @@ -73359,6 +73729,13 @@ icon_state = "dark" }, /area/station/medical/morgue) +"nLr" = ( +/obj/effect/spawner/random/oil/maybe, +/obj/effect/spawner/random/trash, +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/station/maintenance/apmaint) "nLz" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 @@ -73405,7 +73782,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "nLU" = ( @@ -73864,7 +74241,7 @@ }, /area/station/hallway/secondary/garden) "nPe" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) @@ -73942,7 +74319,7 @@ /area/station/engineering/control) "nPY" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -74033,12 +74410,6 @@ }, /turf/simulated/floor/engine, /area/station/engineering/engine) -"nQL" = ( -/obj/effect/spawner/random/trash, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, -/turf/simulated/floor/wood, -/area/station/maintenance/dorms/starboard) "nQM" = ( /obj/machinery/button/windowtint{ id = "gravity"; @@ -74182,7 +74553,7 @@ /area/station/engineering/solar/aft_starboard) "nRQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -74527,7 +74898,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "nVl" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/aft) "nVs" = ( @@ -74672,7 +75043,7 @@ /area/station/medical/storage) "nWG" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) "nWI" = ( @@ -74716,7 +75087,7 @@ }, /area/station/engineering/atmos/storage) "nXe" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -74790,6 +75161,11 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/public/park) +"nXF" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/transmission_laser) "nXL" = ( /obj/structure/chair/stool{ dir = 8 @@ -74858,8 +75234,7 @@ /area/station/maintenance/asmaint) "nYy" = ( /obj/machinery/computer/prisoner{ - dir = 4; - req_access = list(2) + dir = 4 }, /obj/machinery/light{ dir = 8 @@ -74984,7 +75359,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/fore) "nZp" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -74995,7 +75370,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/asteroid_filtering) "nZv" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) @@ -75323,7 +75698,7 @@ "obQ" = ( /obj/item/paper, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "obT" = ( @@ -75367,12 +75742,6 @@ icon_state = "neutralcorner" }, /area/station/public/shops) -"oct" = ( -/obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash, -/turf/simulated/floor/plasteel, -/area/station/maintenance/dorms/port) "ocz" = ( /obj/structure/cable{ d1 = 1; @@ -75454,7 +75823,7 @@ /area/station/science/xenobiology) "ocY" = ( /obj/structure/closet, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -75587,6 +75956,10 @@ icon_state = "dark" }, /area/station/science/robotics/chargebay) +"oec" = ( +/obj/structure/sign/radiation/rad_area, +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "oef" = ( /obj/machinery/economy/vending/cigarette, /turf/simulated/floor/plasteel{ @@ -75595,7 +75968,7 @@ }, /area/station/hallway/spacebridge/security/south) "oeh" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/apmaint2) "oei" = ( @@ -75607,7 +75980,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -75630,7 +76003,7 @@ /turf/simulated/floor/engine/xenobio, /area/station/science/xenobiology) "oeG" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -76581,8 +76954,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "omY" = ( @@ -76737,7 +77110,7 @@ }, /area/station/engineering/break_room) "ooy" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -76901,7 +77274,7 @@ /area/station/command/office/hop) "opY" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "oqa" = ( @@ -76985,7 +77358,7 @@ "oqI" = ( /obj/item/chair/stool, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "oqL" = ( @@ -77042,7 +77415,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) @@ -77430,7 +77803,7 @@ }, /area/station/public/dorms) "ouZ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -77898,7 +78271,7 @@ "oAs" = ( /obj/structure/rack, /obj/item/toy/crayon/spraycan, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "oAu" = ( @@ -78090,6 +78463,12 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"oCs" = ( +/obj/effect/spawner/random/cobweb/right/rare, +/obj/effect/spawner/random/trash, +/obj/structure/table_frame, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint2) "oCC" = ( /obj/structure/transit_tube/curved/flipped{ dir = 4 @@ -78194,7 +78573,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) @@ -78252,7 +78631,7 @@ }, /area/station/turret_protected/aisat/interior) "oDZ" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/flour/foam, /obj/effect/decal/cleanable/glass, @@ -78356,6 +78735,15 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) +"oFg" = ( +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "oFi" = ( /obj/machinery/light{ dir = 1 @@ -78469,7 +78857,7 @@ "oGl" = ( /obj/machinery/photocopier, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/aft2) "oGn" = ( @@ -78565,7 +78953,7 @@ /area/station/maintenance/dorms/fore) "oHn" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "oHw" = ( @@ -78852,7 +79240,7 @@ /area/station/medical/chemistry) "oKk" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -79026,6 +79414,15 @@ /obj/item/t_scanner, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) +"oLt" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "oLv" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 5 @@ -79136,7 +79533,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) @@ -79161,7 +79558,7 @@ /turf/simulated/floor/wood, /area/station/service/library) "oMk" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/engineering/tech_storage) "oMl" = ( @@ -79185,7 +79582,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) @@ -79280,7 +79677,7 @@ }, /area/station/public/dorms) "oNg" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -79330,7 +79727,7 @@ name = "Ians Stick"; desc = "A large stick covered in bite marks and dried slobber.ss" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint) "oNB" = ( @@ -79434,7 +79831,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) @@ -79574,7 +79971,7 @@ /area/station/science/toxins/mixing) "oPE" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "oPP" = ( @@ -79947,7 +80344,7 @@ }, /area/station/public/storage/tools) "oTq" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/solar_maintenance/fore_port) "oTr" = ( @@ -80427,7 +80824,7 @@ /area/station/engineering/atmos/control) "oXc" = ( /obj/machinery/photocopier, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "oXj" = ( @@ -80477,7 +80874,7 @@ /area/station/engineering/solar/fore_starboard) "oXw" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "oXJ" = ( @@ -80584,7 +80981,7 @@ /area/station/command/office/blueshield) "oYm" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -80637,7 +81034,7 @@ }, /area/station/security/checkpoint/secondary) "oYH" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -80957,7 +81354,6 @@ c_tag = "Mr. Chang's"; dir = 10 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet, /area/station/public/mrchangs) "pbt" = ( @@ -80975,7 +81371,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "pbP" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "pbT" = ( @@ -81214,7 +81610,7 @@ /area/station/hallway/secondary/exit) "pdF" = ( /obj/structure/bookcase{ - name = "bookcase (Adult)" + name = "bookcase (Romance)" }, /turf/simulated/floor/wood, /area/station/service/library) @@ -81304,7 +81700,7 @@ /area/station/supply/qm) "peT" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "peU" = ( @@ -81392,7 +81788,7 @@ /turf/simulated/floor/engine, /area/station/medical/chemistry) "pfC" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/legal/courtroom) "pfG" = ( @@ -81459,7 +81855,7 @@ /area/station/hallway/primary/fore/north) "pga" = ( /obj/machinery/space_heater, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "pgc" = ( @@ -81675,8 +82071,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/north) "phI" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/cobweb/right/rare, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/fore) "phJ" = ( @@ -82196,7 +82592,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel, /area/station/maintenance/incinerator) @@ -82222,12 +82618,12 @@ /area/station/security/brig) "pnv" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "pnD" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/blood/drip, /obj/structure/cable{ d1 = 4; @@ -82330,7 +82726,7 @@ pixel_x = 2; pixel_y = 2 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/machinery/light/small{ dir = 1 }, @@ -82583,7 +82979,7 @@ }, /obj/effect/spawner/random/maintenance, /obj/item/lipstick/random, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -82786,7 +83182,7 @@ /area/station/engineering/atmos) "ptq" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -82921,7 +83317,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/machinery/firealarm/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/incinerator) @@ -82999,6 +83395,14 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) +"pvG" = ( +/obj/item/food/candy/coin, +/obj/effect/mapping_helpers/turfs/burn, +/obj/item/chair/stool, +/obj/item/trash/spentcasing/shotgun, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/station/maintenance/dorms/starboard) "pvK" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/barricade/wooden, @@ -83074,7 +83478,7 @@ }, /area/station/aisat/atmos) "pwK" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -83256,7 +83660,7 @@ /area/station/medical/reception) "pyW" = ( /obj/machinery/photocopier, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/wood, /area/station/service/library) "pzb" = ( @@ -83387,7 +83791,7 @@ "pAk" = ( /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -83461,7 +83865,7 @@ }, /area/station/engineering/atmos/control) "pAS" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -83499,7 +83903,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "pBg" = ( @@ -83555,7 +83959,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) "pBs" = ( @@ -83643,7 +84047,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "pCR" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -83662,7 +84066,7 @@ /area/station/public/dorms) "pCU" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -83906,7 +84310,7 @@ /area/station/supply/sorting) "pEQ" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "pEU" = ( @@ -83931,7 +84335,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "pFc" = ( @@ -84322,7 +84726,7 @@ }, /area/station/legal/courtroom) "pIh" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -84864,7 +85268,7 @@ /area/station/engineering/atmos) "pMq" = ( /obj/item/chair, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -85317,7 +85721,7 @@ /turf/simulated/floor/engine/airless, /area/station/engineering/atmos) "pSv" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/asmaint) "pSy" = ( @@ -85351,6 +85755,15 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) +"pSR" = ( +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_y = -32 + }, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "pSS" = ( /obj/structure/table/reinforced, /obj/item/phone, @@ -85547,6 +85960,17 @@ }, /turf/simulated/floor/lava/plasma/fuming, /area/station/engineering/atmos/asteroid_core) +"pVa" = ( +/obj/item/storage/toolbox/mechanical, +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "pVg" = ( /obj/structure/cable{ d1 = 1; @@ -85719,7 +86143,7 @@ /area/station/science/rnd) "pWy" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/item/storage/toolbox/emergency, /obj/item/flashlight/flare/glowstick/random, /obj/effect/decal/cleanable/dirt, @@ -86294,7 +86718,7 @@ /obj/structure/rack, /obj/effect/decal/cleanable/dirt, /obj/item/storage/toolbox/emergency, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/structure/extinguisher_cabinet{ name = "west bump"; pixel_x = -27 @@ -86321,7 +86745,7 @@ "qcI" = ( /obj/machinery/hydroponics/soil, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/machinery/light/small{ dir = 4 }, @@ -86332,6 +86756,19 @@ icon_state = "white" }, /area/station/science/xenobiology) +"qcO" = ( +/obj/machinery/camera{ + c_tag = "AI Satellite Antechamber South"; + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "qcP" = ( /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = 32 @@ -86356,7 +86793,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) @@ -86596,12 +87033,12 @@ "qey" = ( /obj/structure/rack, /obj/item/flashlight/flare/glowstick/random, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "qez" = ( /obj/structure/rack, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -86732,7 +87169,7 @@ /area/station/maintenance/apmaint2) "qgh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "qgl" = ( @@ -86793,7 +87230,7 @@ /area/station/maintenance/aft2) "qhb" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) "qhc" = ( @@ -86874,7 +87311,7 @@ /area/station/engineering/tech_storage) "qhP" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/item/stack/sheet/glass{ amount = 50; pixel_x = 3; @@ -87155,7 +87592,7 @@ }, /area/station/hallway/secondary/entry) "qla" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "yellow" @@ -87237,7 +87674,7 @@ /area/station/maintenance/fsmaint2) "qmg" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -87296,7 +87733,7 @@ "qna" = ( /obj/structure/table, /obj/item/vending_refill/coffee, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/abandoned_office) @@ -87366,7 +87803,7 @@ }, /area/station/command/office/cmo) "qnB" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -87492,7 +87929,7 @@ /turf/simulated/floor/engine, /area/station/engineering/engine) "qoG" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/structure/foamedmetal, /turf/simulated/floor/plating, @@ -87540,7 +87977,7 @@ }, /area/station/security/storage) "qpr" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/starboard) "qps" = ( @@ -87617,6 +88054,12 @@ icon_state = "darkredcorners" }, /area/station/security/brig) +"qpW" = ( +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash, +/turf/simulated/floor/wood, +/area/station/maintenance/apmaint2) "qqd" = ( /obj/structure/cable{ d1 = 4; @@ -88120,7 +88563,7 @@ /area/station/maintenance/security/aft_port) "qwl" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "qwt" = ( @@ -88180,7 +88623,7 @@ }, /area/station/medical/break_room) "qxb" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -88229,7 +88672,7 @@ }, /area/station/hallway/primary/fore) "qxD" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -88614,7 +89057,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/port) @@ -88681,7 +89124,7 @@ /area/station/medical/virology) "qBE" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "qBI" = ( @@ -88773,7 +89216,7 @@ /area/station/public/storage/tools/auxiliary) "qCz" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) "qCA" = ( @@ -89039,7 +89482,7 @@ dir = 4 }, /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/rods, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -89193,7 +89636,7 @@ /area/station/service/chapel) "qGa" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "qGg" = ( @@ -89248,7 +89691,7 @@ /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "qGz" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/storage) "qGC" = ( @@ -89365,7 +89808,7 @@ }, /area/station/science/robotics/chargebay) "qHM" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/shreds, /turf/simulated/floor/plating, @@ -89623,7 +90066,7 @@ /obj/item/decorations/sticky_decorations/flammable/ghost{ pixel_y = -18 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "qKm" = ( @@ -89655,7 +90098,7 @@ "qKM" = ( /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/ash, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -89670,7 +90113,7 @@ /area/station/maintenance/asmaint) "qKQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -89734,7 +90177,7 @@ /turf/simulated/floor/grass/no_creep, /area/station/medical/virology) "qLv" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -89896,7 +90339,7 @@ "qMM" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "qMN" = ( @@ -89922,7 +90365,7 @@ /area/station/engineering/control) "qMS" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/structure/table_frame, /turf/simulated/floor/wood, /area/station/maintenance/aft2) @@ -89958,12 +90401,12 @@ }, /area/station/medical/patients_rooms_secondary) "qNo" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "qNp" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "qNJ" = ( @@ -90041,13 +90484,13 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/north) "qOJ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "qOY" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/effect/landmark/spawner/nukedisc_respawn, /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, @@ -90178,7 +90621,7 @@ /obj/item/mounted/frame/display{ pixel_y = 30 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -90234,7 +90677,7 @@ /area/station/maintenance/abandoned_office) "qQs" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -90550,7 +90993,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/lobby) "qTY" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -90597,7 +91040,7 @@ /turf/simulated/floor/carpet, /area/station/public/dorms) "qUr" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -90615,7 +91058,7 @@ }, /area/station/hallway/primary/central/west) "qUE" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/electrical) "qUF" = ( @@ -90624,7 +91067,7 @@ /obj/item/shard{ icon_state = "medium" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/flour/foam, /turf/simulated/floor/plating, @@ -90700,11 +91143,6 @@ icon_state = "browncorner" }, /area/station/hallway/primary/central/sw) -"qVm" = ( -/obj/item/trash/spentcasing/shotgun, -/obj/effect/landmark/burnturf, -/turf/simulated/floor/plating, -/area/station/maintenance/dorms/port) "qVn" = ( /obj/structure/flora/ausbushes/grassybush, /turf/simulated/floor/grass/jungle, @@ -90990,7 +91428,7 @@ /area/station/maintenance/aft2) "qXY" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -91204,7 +91642,7 @@ }, /area/station/engineering/atmos/transit) "qZs" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/blood/drip, /obj/machinery/light/small{ dir = 4 @@ -91387,11 +91825,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) -"raT" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, -/obj/effect/spawner/random/trash, -/turf/simulated/floor/wood, -/area/station/maintenance/dorms/starboard) "raV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -92033,7 +92466,7 @@ /area/station/command/office/hop) "rgF" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "rgI" = ( @@ -92256,7 +92689,7 @@ dir = 4 }, /obj/effect/decal/cleanable/generic, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "rir" = ( @@ -92553,7 +92986,7 @@ }, /obj/structure/grille/broken, /obj/item/stack/rods, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "rjW" = ( @@ -92645,7 +93078,7 @@ /area/station/security/prison/cell_block) "rld" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -92788,7 +93221,7 @@ name = "Hidden spikes" }, /obj/structure/flora/grass/jungle, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/grass/jungle, /area/station/maintenance/aft) "rmA" = ( @@ -92993,7 +93426,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "roe" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -93206,7 +93639,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "rqs" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/station/maintenance/aft) "rqw" = ( @@ -93371,7 +93804,7 @@ /area/station/legal/magistrate) "rsq" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -93849,8 +94282,8 @@ /obj/structure/chair/stool{ dir = 8 }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "rxl" = ( @@ -94115,7 +94548,7 @@ /area/station/legal/courtroom) "rzE" = ( /obj/item/restraints/handcuffs/cable/red, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -94266,7 +94699,7 @@ }, /area/station/service/chapel/office) "rAJ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -94290,7 +94723,7 @@ "rAP" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "rAU" = ( @@ -94324,7 +94757,7 @@ /area/station/legal/magistrate) "rBE" = ( /obj/effect/decal/cleanable/confetti, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -94441,7 +94874,7 @@ /area/station/security/processing) "rCm" = ( /obj/structure/closet/toolcloset, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/item/radio/intercom{ name = "north bump"; pixel_y = 28 @@ -94471,13 +94904,13 @@ }, /area/station/security/prison/cell_block) "rDd" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "rDe" = ( /obj/structure/table, /obj/item/storage/fancy/matches, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "rDg" = ( @@ -94715,7 +95148,7 @@ /area/station/maintenance/apmaint) "rGh" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "rGk" = ( @@ -94859,7 +95292,7 @@ /turf/simulated/floor/wood, /area/station/public/dorms) "rHN" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) @@ -95088,7 +95521,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "rJr" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -95159,6 +95592,23 @@ }, /turf/simulated/floor/plasteel, /area/station/security/interrogation) +"rJZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-4"; + d1 = 1; + d2 = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "rKa" = ( /obj/structure/cable{ d1 = 4; @@ -95235,7 +95685,7 @@ /area/station/engineering/engine) "rKv" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft) "rKx" = ( @@ -95279,7 +95729,7 @@ /area/station/security/prisonershuttle) "rKN" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "rKO" = ( @@ -95452,7 +95902,7 @@ /area/station/supply/storage) "rLX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) @@ -95573,13 +96023,13 @@ /area/station/supply/lobby) "rMG" = ( /obj/structure/closet/secure_closet/engineering_electrical, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/electrical) "rMU" = ( /obj/effect/decal/cleanable/blood/gibs/robot, /obj/effect/decal/cleanable/blood/oil, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -95774,7 +96224,7 @@ }, /area/station/medical/patients_rooms_secondary) "rOP" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -95784,11 +96234,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/station/maintenance/aft) -"rOV" = ( -/obj/effect/spawner/random/trash, -/obj/effect/spawner/random_spawners/oil_maybe, -/turf/simulated/floor/plating, -/area/station/maintenance/aft2) "rOX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random{ @@ -96081,7 +96526,7 @@ /obj/item/clothing/suit/straight_jacket, /obj/item/clothing/glasses/sunglasses/blindfold, /obj/item/clothing/mask/muzzle, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -96091,7 +96536,7 @@ /turf/simulated/floor/grass/jungle, /area/station/maintenance/aft) "rRE" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -96372,7 +96817,7 @@ }, /area/station/aisat/service) "rUe" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -96501,7 +96946,7 @@ /area/station/maintenance/security/aft_starboard) "rVl" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "rVv" = ( @@ -96633,6 +97078,11 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/wood, /area/station/command/office/hop) +"rWj" = ( +/obj/effect/spawner/random/oil/maybe, +/obj/effect/spawner/random/trash, +/turf/simulated/floor/plating, +/area/station/maintenance/aft2) "rWp" = ( /obj/structure/closet/secure_closet/brig, /obj/structure/window/reinforced{ @@ -96817,7 +97267,7 @@ /area/station/hallway/primary/starboard/south) "rXp" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "rXs" = ( @@ -96840,7 +97290,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "rXv" = ( @@ -96983,6 +97433,10 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/grass, /area/station/public/dorms) +"rYz" = ( +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/engineering/transmission_laser) "rYG" = ( /turf/simulated/floor/lava/plasma/fuming, /area/station/engineering/atmos/asteroid_core) @@ -97013,7 +97467,7 @@ /area/station/service/kitchen) "rYY" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/security/aft_port) "rZa" = ( @@ -97270,14 +97724,14 @@ }, /area/station/medical/cloning) "sbA" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/table_frame, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "sbL" = ( /obj/item/cigbutt, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "sbN" = ( @@ -97411,7 +97865,7 @@ icon_state = "0-2" }, /obj/structure/table, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) @@ -97707,7 +98161,7 @@ "sgs" = ( /obj/structure/sign/vacuum/external, /obj/effect/spawner/window/reinforced/grilled, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/supply/storage) "sgG" = ( @@ -97949,7 +98403,7 @@ /obj/item/paper_bin, /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "siN" = ( @@ -97987,7 +98441,7 @@ }, /area/station/maintenance/starboard) "sja" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 2; @@ -98006,7 +98460,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "sjf" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -98202,7 +98656,7 @@ }, /area/station/medical/storage) "skm" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/security/aft_port) "sks" = ( @@ -98216,6 +98670,16 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) +"skA" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "skE" = ( /obj/structure/chair/sofa/left{ dir = 1 @@ -98421,7 +98885,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -98430,7 +98894,7 @@ dir = 1; pixel_y = -8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "smU" = ( @@ -98493,7 +98957,7 @@ }, /area/station/security/prison) "snE" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -98523,7 +98987,7 @@ /obj/machinery/kitchen_machine/microwave{ pixel_y = 6 }, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "snW" = ( @@ -98552,7 +99016,7 @@ /area/station/maintenance/starboard) "sov" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "soz" = ( @@ -98599,7 +99063,7 @@ /area/station/hallway/secondary/entry) "soT" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "soW" = ( @@ -98820,7 +99284,7 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools/auxiliary) "srp" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "srv" = ( @@ -98914,6 +99378,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) +"ssy" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/engine) "ssD" = ( /turf/simulated/wall, /area/station/maintenance/solar_maintenance/fore_port) @@ -98933,7 +99409,7 @@ /area/station/maintenance/dorms/starboard) "ssV" = ( /obj/effect/spawner/random/fungus/maybe, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/starboard) "ssZ" = ( @@ -98995,7 +99471,7 @@ /obj/structure/rack, /obj/item/soap/deluxe, /obj/item/mop, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/fpmaint) "stA" = ( @@ -99253,7 +99729,7 @@ "svw" = ( /obj/structure/table, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "svF" = ( @@ -99370,7 +99846,7 @@ }, /area/station/medical/break_room) "swL" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -99785,7 +100261,7 @@ /obj/structure/table, /obj/item/rpd, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "sAB" = ( @@ -99818,7 +100294,7 @@ /turf/simulated/wall/r_wall, /area/station/security/prison) "sAH" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/newscaster{ name = "north bump"; pixel_y = 28 @@ -99934,7 +100410,7 @@ /turf/simulated/floor/plating/airless, /area/station/aisat/breakroom) "sBR" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -100128,8 +100604,8 @@ /obj/structure/chair/sofa/corp{ dir = 8 }, -/obj/effect/spawner/random_spawners/blood_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/blood/maybe, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/aft2) "sDk" = ( @@ -100573,7 +101049,7 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "sHh" = ( @@ -100641,7 +101117,7 @@ }, /area/station/supply/qm) "sHN" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -100877,7 +101353,7 @@ /area/station/maintenance/assembly_line) "sKu" = ( /obj/machinery/atmospherics/portable/scrubber, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/port) "sKy" = ( @@ -100969,7 +101445,7 @@ }, /area/station/supply/miningdock) "sLh" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) @@ -101368,7 +101844,7 @@ /obj/structure/chair/stool{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "sQn" = ( @@ -101426,13 +101902,13 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "sQU" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "sQV" = ( @@ -101636,7 +102112,7 @@ /area/station/engineering/engine) "sSA" = ( /obj/machinery/space_heater, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "sSN" = ( @@ -101925,7 +102401,7 @@ /area/station/engineering/atmos) "sVx" = ( /obj/machinery/atmospherics/portable/scrubber, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "sVz" = ( @@ -102093,7 +102569,7 @@ /turf/simulated/floor/plating, /area/station/engineering/gravitygenerator) "sWz" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -102202,7 +102678,7 @@ /turf/simulated/floor/plasteel, /area/station/command/bridge) "sXg" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) @@ -102296,12 +102772,12 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/asteroid_filtering) "sXY" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "sXZ" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) @@ -102393,7 +102869,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/port) @@ -102419,7 +102895,7 @@ /area/station/medical/medbay) "sZN" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -102509,7 +102985,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/ash, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -102735,7 +103211,7 @@ /turf/simulated/floor/plating/airless, /area/station/aisat/breakroom) "tcy" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -103045,7 +103521,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "tfe" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -103372,16 +103848,6 @@ icon_state = "brown" }, /area/station/supply/sorting) -"tic" = ( -/obj/item/circuitboard/arcade/orion_trail, -/obj/item/trash/spentcasing/shotgun, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, -/obj/effect/landmark/damageturf, -/turf/simulated/floor/wood, -/area/station/maintenance/aft2) "tih" = ( /obj/structure/rack, /obj/item/apc_electronics, @@ -103407,7 +103873,7 @@ }, /area/station/hallway/spacebridge/security/south) "tiw" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -103534,7 +104000,7 @@ /obj/item/chair/wood, /obj/item/seeds/cannabis, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "tjA" = ( @@ -103552,7 +104018,7 @@ /area/station/legal/lawoffice) "tjH" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -103802,7 +104268,7 @@ }, /area/station/medical/chemistry) "tlQ" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -103885,7 +104351,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/flour/foam, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -104113,7 +104579,7 @@ /turf/simulated/floor/engine, /area/station/engineering/atmos/asteroid_filtering) "tod" = ( -/obj/machinery/suit_storage_unit/ce/secure, +/obj/machinery/suit_storage_unit/industrial/ce/secure, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "yellow" @@ -104145,13 +104611,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "tok" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plasteel, @@ -104279,11 +104745,6 @@ /obj/machinery/computer/security/telescreen/entertainment/television, /turf/simulated/floor/carpet/royalblack, /area/station/maintenance/fsmaint) -"tpq" = ( -/obj/effect/landmark/burnturf, -/obj/effect/spawner/random/trash, -/turf/simulated/floor/plating, -/area/station/maintenance/apmaint) "tps" = ( /obj/structure/table/wood, /turf/simulated/floor/carpet, @@ -104315,7 +104776,7 @@ }, /area/station/medical/reception) "tpV" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 2; @@ -104682,7 +105143,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "ttc" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -104839,7 +105300,7 @@ /obj/item/cigbutt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) "tua" = ( @@ -104859,7 +105320,7 @@ /area/station/hallway/secondary/entry) "tuj" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) @@ -105045,7 +105506,7 @@ "txu" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 @@ -105136,7 +105597,7 @@ /turf/simulated/wall, /area/station/service/chapel) "tyf" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "tyi" = ( @@ -105145,7 +105606,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "tyl" = ( @@ -105298,6 +105759,13 @@ "tAF" = ( /turf/simulated/floor/plasteel, /area/station/public/storage/tools) +"tAQ" = ( +/obj/structure/closet/emcloset, +/obj/structure/sign/electricshock{ + pixel_x = -32 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/storage) "tAW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -105517,7 +105985,7 @@ /obj/item/grenade/confetti{ pixel_x = 4 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "tCV" = ( @@ -105568,7 +106036,7 @@ /area/station/maintenance/apmaint2) "tDs" = ( /obj/machinery/economy/slot_machine, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/wood, /area/station/maintenance/dorms/starboard) "tDu" = ( @@ -106540,12 +107008,12 @@ "tMn" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "tMr" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -106772,7 +107240,7 @@ /area/station/maintenance/fsmaint) "tNS" = ( /obj/structure/bookcase/random, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -106787,7 +107255,7 @@ /area/station/science/explab) "tOs" = ( /obj/item/stack/tile/carpet, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -106990,7 +107458,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "tRV" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "yellow" @@ -107088,7 +107556,7 @@ /area/station/maintenance/fpmaint) "tSQ" = ( /obj/structure/bed/pod, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "tSS" = ( @@ -107286,7 +107754,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "tUl" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -107630,7 +108098,7 @@ "tXs" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/item/storage/box, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -107714,7 +108182,7 @@ }, /area/station/command/office/ce) "tXS" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/remains/robot, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -107752,7 +108220,7 @@ }, /area/station/medical/cloning) "tYb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ d1 = 4; @@ -107978,7 +108446,7 @@ /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/aft2) "uaj" = ( @@ -108059,7 +108527,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "uaV" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) @@ -108067,6 +108535,12 @@ /obj/machinery/economy/vending/cart, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) +"ubc" = ( +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/cobweb/left/rare, +/obj/item/trash/spentcasing/shotgun, +/turf/simulated/floor/plating, +/area/station/maintenance/aft2) "ubg" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -108185,12 +108659,12 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "ubU" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "ubY" = ( /obj/structure/rack, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/item/storage/box, /obj/item/toy/crayon/spraycan, /turf/simulated/floor/plating, @@ -108279,7 +108753,7 @@ }, /area/station/security/prisonershuttle) "ucH" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -108484,6 +108958,11 @@ /obj/structure/table_frame, /turf/simulated/floor/plating, /area/station/maintenance/aft) +"ueM" = ( +/obj/effect/spawner/random/blood/maybe, +/obj/effect/spawner/random/trash, +/turf/simulated/floor/plating, +/area/station/maintenance/security/fore) "ueN" = ( /turf/simulated/wall/r_wall, /area/station/science/research) @@ -108542,7 +109021,7 @@ /area/station/maintenance/aft2) "ufk" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "ufl" = ( @@ -108721,7 +109200,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) "uhm" = ( @@ -108822,7 +109301,7 @@ /obj/structure/sign/poster/official/love_ian{ pixel_y = -32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint) "uiT" = ( @@ -108976,26 +109455,6 @@ icon_state = "whitepurple" }, /area/station/science/misc_lab) -"ukj" = ( -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random/trash, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/disposalpipe/segment/corner{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) "ukq" = ( /obj/structure/extinguisher_cabinet{ name = "east bump"; @@ -109441,7 +109900,7 @@ /area/space) "uoD" = ( /obj/machinery/atmospherics/unary/tank/air, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "uoG" = ( @@ -109463,7 +109922,7 @@ /area/station/service/bar) "uoR" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, @@ -109704,7 +110163,7 @@ }, /area/station/security/processing) "usc" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/computerframe{ dir = 8 }, @@ -109785,7 +110244,7 @@ pixel_x = 3; pixel_y = -4 }, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_port) "usF" = ( @@ -109860,14 +110319,6 @@ icon_state = "whitepurplecorner" }, /area/station/science/research) -"utj" = ( -/obj/item/chair/stool, -/obj/item/trash/spentcasing/shotgun, -/obj/effect/decal/cleanable/dirt, -/obj/item/food/candy/coin, -/obj/effect/landmark/burnturf, -/turf/simulated/floor/plating, -/area/station/maintenance/dorms/starboard) "utm" = ( /obj/effect/decal/cleanable/crayon, /obj/item/cardboard_cutout{ @@ -110166,7 +110617,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/disposalpipe/segment, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) @@ -110417,11 +110868,11 @@ /area/station/maintenance/fpmaint) "uyk" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "uym" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -110448,15 +110899,6 @@ icon_state = "white" }, /area/station/maintenance/starboard) -"uyu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash, -/obj/effect/landmark/burnturf, -/obj/structure/disposalpipe/segment/corner{ - dir = 2 - }, -/turf/simulated/floor/plasteel, -/area/station/maintenance/dorms/starboard) "uyA" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -110492,7 +110934,7 @@ /area/station/engineering/break_room/secondary) "uyK" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) @@ -110700,7 +111142,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) "uAy" = ( @@ -110929,7 +111371,7 @@ /obj/structure/flora/ausbushes/fullgrass{ pixel_y = 15 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/grass/jungle, /area/station/maintenance/aft) "uCR" = ( @@ -110959,7 +111401,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) "uDa" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -111192,6 +111634,20 @@ icon_state = "dark" }, /area/station/aisat/service) +"uFm" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/storage) "uFx" = ( /obj/effect/landmark/start/shaft_miner, /turf/simulated/floor/plasteel, @@ -111405,7 +111861,7 @@ /turf/simulated/floor/plating, /area/station/security/permabrig) "uGJ" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -111536,7 +111992,7 @@ /turf/simulated/floor/plasteel, /area/station/security/permabrig) "uHQ" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -111694,7 +112150,7 @@ "uIN" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "uIR" = ( @@ -111778,7 +112234,7 @@ /obj/structure/chair/sofa/corp/left{ dir = 8 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/wood, /area/station/maintenance/aft2) @@ -111816,7 +112272,7 @@ /area/station/security/processing) "uKf" = ( /obj/structure/chair, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/security/fore) @@ -111950,7 +112406,7 @@ }, /area/station/security/lobby) "uLT" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -112483,7 +112939,7 @@ }, /area/station/command/office/rd) "uRj" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) @@ -112592,8 +113048,8 @@ /obj/structure/sign/poster/official/random{ pixel_y = 32 }, -/obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/oil/maybe, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "uSn" = ( @@ -113065,7 +113521,7 @@ /area/station/maintenance/aft2) "uWm" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -113146,7 +113602,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) @@ -113176,7 +113632,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) "uXq" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -113410,7 +113866,7 @@ /obj/item/shard{ icon_state = "medium" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, @@ -113448,7 +113904,7 @@ }, /area/station/turret_protected/ai) "vaY" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/fpmaint) @@ -113594,8 +114050,19 @@ }, /turf/simulated/floor/wood, /area/station/maintenance/abandoned_office) +"vcP" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/storage) "vcS" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/abandoned_garden) "vcV" = ( @@ -113658,7 +114125,7 @@ /area/station/hallway/secondary/exit) "vdI" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "vdJ" = ( @@ -113734,7 +114201,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "ves" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) "vew" = ( @@ -114155,7 +114622,7 @@ /area/station/hallway/primary/aft) "vjj" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/item/storage/toolbox/mechanical, /obj/machinery/light/small{ dir = 1 @@ -114643,7 +115110,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "vnf" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/glass/beaker, /turf/simulated/floor/plasteel{ @@ -115319,7 +115786,7 @@ name = "Ians Collar"; desc = "Sports a small tag on the front: Ian" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/fpmaint) "vtr" = ( @@ -115396,7 +115863,7 @@ /area/station/engineering/engine) "vtS" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft) "vuu" = ( @@ -115408,6 +115875,12 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) +"vuz" = ( +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/transmission_laser) "vuF" = ( /obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, @@ -115507,7 +115980,7 @@ /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/spawner/nukedisc_respawn, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/aft2) "vvj" = ( @@ -115636,7 +116109,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "vwN" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -115750,7 +116223,7 @@ /turf/space, /area/station/engineering/solar/aft_starboard) "vyj" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/fpmaint) "vyl" = ( @@ -115806,7 +116279,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "vyP" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -115864,7 +116337,7 @@ /turf/simulated/floor/engine, /area/station/science/xenobiology) "vzs" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) @@ -116098,7 +116571,7 @@ }, /area/station/aisat/hall) "vBq" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -116281,7 +116754,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/asteroid_filtering) "vDd" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" @@ -116447,7 +116920,18 @@ }, /area/station/security/processing) "vEK" = ( -/obj/machinery/light{ +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/simulated/floor/plating, @@ -117016,7 +117500,7 @@ /turf/simulated/floor/engine, /area/station/science/xenobiology) "vJX" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/security/fore) "vKa" = ( @@ -117037,7 +117521,7 @@ "vKd" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "vKf" = ( @@ -117320,7 +117804,7 @@ /area/station/public/dorms) "vMb" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/ash, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) @@ -117748,7 +118232,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 2 }, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/fsmaint2) "vPr" = ( @@ -117990,7 +118474,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/aft_port) "vRE" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, @@ -118000,6 +118484,16 @@ /obj/item/ashtray/glass, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/asteroid_filtering) +"vRQ" = ( +/obj/effect/mapping_helpers/turfs/damage, +/obj/item/circuitboard/arcade/orion_trail, +/obj/item/trash/spentcasing/shotgun, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/station/maintenance/aft2) "vRS" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -118030,7 +118524,7 @@ }, /area/station/security/checkpoint/secondary) "vSy" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil, /obj/structure/cable, /turf/simulated/floor/plasteel, @@ -118105,7 +118599,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) @@ -118154,7 +118648,7 @@ pixel_y = 3 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "vTw" = ( @@ -118202,7 +118696,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "vUk" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -118239,7 +118733,7 @@ /area/station/science/robotics) "vUx" = ( /obj/item/mod/module/balloon, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "vUy" = ( @@ -118602,7 +119096,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/vault) "vXQ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/dorms/port) "vXX" = ( @@ -118909,7 +119403,7 @@ /area/station/command/office/rd) "waH" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -118928,7 +119422,7 @@ /area/station/maintenance/asmaint) "waP" = ( /obj/machinery/recharge_station, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "brown" @@ -119076,7 +119570,7 @@ }, /area/station/science/rnd) "wcG" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/electrical) "wcI" = ( @@ -119163,7 +119657,7 @@ "wdB" = ( /obj/structure/table, /obj/item/storage/fancy/crayons, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "wdE" = ( @@ -119532,7 +120026,7 @@ }, /area/station/hallway/primary/starboard) "whf" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/generic, /mob/living/simple_animal/mouse, /turf/simulated/floor/plating, @@ -119625,7 +120119,7 @@ /area/station/medical/break_room) "whN" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/storage/box, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -119652,8 +120146,8 @@ /area/station/maintenance/aft2) "whZ" = ( /obj/effect/decal/cleanable/molten_object/large, -/obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/oil/maybe, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) @@ -119688,6 +120182,14 @@ icon_state = "whitecorner" }, /area/station/hallway/primary/central/south) +"wio" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/transmission_laser) "wiu" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/item/radio/intercom/department/security{ @@ -119957,7 +120459,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/electrical) "wkQ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -119976,6 +120478,16 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) +"wkT" = ( +/obj/machinery/atmospherics/unary/portables_connector, +/obj/item/radio/intercom{ + name = "north bump"; + pixel_y = 28 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/engine) "wkZ" = ( /obj/structure/rack{ dir = 8; @@ -120197,7 +120709,7 @@ }, /area/station/hallway/primary/aft) "wnG" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "wnL" = ( @@ -120571,7 +121083,7 @@ /area/station/security/warden) "wqs" = ( /obj/item/chair/wood/wings, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/effect/decal/cleanable/vomit, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) @@ -120758,7 +121270,7 @@ }, /area/station/service/chapel/office) "wsQ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) @@ -120886,7 +121398,7 @@ "wuc" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel/white/side, /area/station/maintenance/asmaint) "wux" = ( @@ -120930,13 +121442,22 @@ /area/station/public/vacant_office) "wva" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/storage) "wve" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "wvi" = ( @@ -121113,7 +121634,7 @@ "wwR" = ( /obj/structure/table, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "wwT" = ( @@ -121184,7 +121705,7 @@ /area/station/public/shops) "wxx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -121219,7 +121740,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "wxL" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/closet/secure_closet/genetics, /turf/simulated/floor/plasteel{ dir = 5; @@ -121232,7 +121753,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/wood, /area/station/maintenance/aft2) "wxY" = ( @@ -121276,7 +121797,7 @@ /turf/space, /area/space) "wyR" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/item/toy/figure/crew/engineer{ pixel_y = 17; pixel_x = -9 @@ -121320,8 +121841,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "wzf" = ( -/obj/effect/landmark/burnturf, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "wzh" = ( @@ -121341,7 +121862,7 @@ }, /area/station/service/mime) "wzk" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, /turf/simulated/floor/plating, @@ -121684,14 +122205,9 @@ }, /area/station/supply/office) "wDI" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/aft) -"wDJ" = ( -/obj/effect/spawner/random_spawners/blood_maybe, -/obj/effect/spawner/random/trash, -/turf/simulated/floor/plating, -/area/station/maintenance/security/fore) "wDW" = ( /obj/effect/spawner/window/reinforced/plasma, /turf/simulated/floor/plating, @@ -121827,7 +122343,7 @@ /area/station/medical/chemistry) "wFM" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -121862,9 +122378,7 @@ }, /area/station/hallway/primary/starboard/south) "wFX" = ( -/obj/structure/closet/secure_closet/bar{ - req_access = list(25) - }, +/obj/structure/closet/secure_closet/bar, /obj/item/ammo_box/shotgun/beanbag, /turf/simulated/floor/wood, /area/station/service/bar) @@ -122203,7 +122717,7 @@ dir = 1 }, /obj/item/clothing/under/suit/mafia/vest, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "wKf" = ( @@ -122285,7 +122799,7 @@ }, /area/station/security/brig) "wKq" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) @@ -122484,18 +122998,6 @@ icon_state = "dark" }, /area/station/security/brig) -"wLO" = ( -/obj/effect/landmark/damageturf, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/turf/simulated/floor/plating, -/area/station/maintenance/fsmaint) "wMb" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/effect/turf_decal/stripes/line{ @@ -122680,12 +123182,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "wOp" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) @@ -122775,7 +123277,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "wOW" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/reagent_dispensers/watertank, /obj/structure/sign/poster/official/random{ pixel_x = 32 @@ -122877,7 +123379,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "wPQ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -123006,7 +123508,7 @@ /turf/simulated/wall, /area/station/supply/warehouse) "wRf" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "wRg" = ( @@ -123129,7 +123631,7 @@ /area/station/engineering/atmos/control) "wSl" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -123792,13 +124294,6 @@ }, /turf/simulated/floor/engine/asteroid, /area/station/engineering/atmos/asteroid_core) -"wZs" = ( -/obj/item/paper, -/obj/effect/spawner/random/trash, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, -/turf/simulated/floor/wood, -/area/station/maintenance/abandoned_office) "wZD" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/cable{ @@ -123973,7 +124468,7 @@ /turf/simulated/floor/engine/airless/nodecay, /area/station/engineering/atmos/asteroid_filtering) "xbL" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -124163,7 +124658,7 @@ /turf/simulated/wall, /area/station/maintenance/security/aft_starboard) "xdR" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/starboard) @@ -124308,7 +124803,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) @@ -124469,6 +124964,24 @@ icon_state = "grimy" }, /area/station/command/office/hop) +"xgJ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/storage) "xgT" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable{ @@ -124853,7 +125366,7 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "xjZ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) "xkc" = ( @@ -125032,7 +125545,7 @@ }, /area/station/security/permabrig) "xmi" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) @@ -125163,6 +125676,14 @@ icon_state = "whitepurple" }, /area/station/science/explab) +"xnC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/transmission_laser) "xnE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -125643,7 +126164,7 @@ /obj/structure/chair/stool{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/machinery/light/small{ dir = 1 }, @@ -125933,7 +126454,7 @@ /area/station/hallway/secondary/entry/lounge) "xsY" = ( /obj/item/stack/rods, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/fore) "xts" = ( @@ -126008,7 +126529,7 @@ }, /area/station/medical/morgue) "xtZ" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -126036,7 +126557,7 @@ "xuI" = ( /obj/item/cigbutt/roach, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) "xuN" = ( @@ -126139,7 +126660,7 @@ /area/station/maintenance/aft2) "xvO" = ( /obj/structure/closet/wardrobe/mixed, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "xvW" = ( @@ -126224,7 +126745,7 @@ /area/station/engineering/break_room/secondary) "xwH" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "xwJ" = ( @@ -126351,7 +126872,7 @@ }, /area/station/science/xenobiology) "xxy" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -126380,7 +126901,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 9 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) "xxQ" = ( @@ -126400,7 +126921,7 @@ /area/station/medical/psych) "xyd" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -126810,7 +127331,7 @@ /obj/structure/sign/poster/official/obey{ pixel_y = -32 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -126877,7 +127398,7 @@ "xCT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "xDg" = ( @@ -127287,7 +127808,7 @@ /turf/simulated/floor/plasteel, /area/station/legal/courtroom) "xHE" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -127377,7 +127898,7 @@ "xIe" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "xIl" = ( @@ -127620,7 +128141,7 @@ }, /area/station/aisat/service) "xKJ" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/item/shard{ icon_state = "small" @@ -127753,7 +128274,7 @@ /turf/simulated/floor/plasteel, /area/station/ai_monitored/storage/eva) "xLD" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -127895,6 +128416,19 @@ /obj/machinery/economy/vending/chinese, /turf/simulated/floor/plasteel, /area/station/legal/courtroom) +"xNL" = ( +/obj/structure/closet/crate/secure{ + req_one_access = list(33,41) + }, +/obj/item/circuitboard/thermomachine{ + pixel_x = -5 + }, +/obj/item/circuitboard/chem_dispenser, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/cobweb/right/rare, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/station/maintenance/security/fore) "xNN" = ( /obj/effect/spawner/random/fungus/maybe, /turf/simulated/wall/r_wall, @@ -127964,7 +128498,7 @@ /turf/simulated/floor/carpet/black, /area/station/command/meeting_room) "xOo" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -128072,7 +128606,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard) "xPt" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/cockroach, /turf/simulated/floor/plasteel{ @@ -128238,7 +128772,7 @@ /area/station/science/rnd) "xQZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "xRf" = ( @@ -128422,7 +128956,7 @@ }, /area/station/hallway/secondary/exit) "xTr" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/dorms/fore) "xTw" = ( @@ -128433,7 +128967,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/asteroid_filtering) "xTA" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/broken_bottle, /turf/simulated/floor/light/disco, /area/station/maintenance/apmaint2) @@ -128637,6 +129171,18 @@ icon_state = "darkbrown" }, /area/station/supply/qm) +"xUL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "black" + }, +/area/station/engineering/transmission_laser) "xUW" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, @@ -128784,6 +129330,12 @@ icon_state = "grimy" }, /area/station/security/detective) +"xWo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/spawner/random/trash, +/turf/simulated/floor/wood, +/area/station/maintenance/dorms/starboard) "xWq" = ( /mob/living/simple_animal/slime, /turf/simulated/floor/engine, @@ -128819,26 +129371,6 @@ icon_state = "whitebluefull" }, /area/station/medical/reception) -"xWC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash, -/obj/effect/landmark/burnturf, -/turf/simulated/floor/plating, -/area/station/maintenance/dorms/fore) "xWH" = ( /obj/effect/turf_decal/delivery/partial, /turf/simulated/floor/plating, @@ -128850,7 +129382,7 @@ }, /area/station/service/hydroponics) "xWW" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/chair{ dir = 4 }, @@ -128932,6 +129464,12 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) +"xYf" = ( +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/transmission_laser) "xYm" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -128987,6 +129525,12 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/wall/r_wall, /area/station/engineering/atmos) +"xZj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "xZr" = ( /obj/machinery/atmospherics/portable/canister/air{ filled = 0.1 @@ -129055,7 +129599,7 @@ "xZF" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) "xZG" = ( @@ -129121,7 +129665,7 @@ /area/station/public/sleep) "yau" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -129195,7 +129739,7 @@ }, /area/station/telecomms/computer) "ybc" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -129356,7 +129900,7 @@ /area/station/service/bar) "ycK" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft) "ycO" = ( @@ -129462,7 +130006,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/dorms/fore) "ydT" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/security/fore) "ydU" = ( @@ -129661,20 +130205,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/lava/plasma/fuming, /area/station/engineering/atmos/asteroid_core) -"yfq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash, -/obj/effect/landmark/burnturf, -/turf/simulated/floor/plating, -/area/station/maintenance/dorms/port) "yfv" = ( /obj/machinery/chem_master/condimaster{ name = "CondiMaster Neo"; @@ -130114,8 +130644,8 @@ /turf/simulated/floor/plasteel, /area/station/science/break_room) "yju" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, -/obj/effect/landmark/burnturf, +/obj/effect/spawner/random/cobweb/right/rare, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "yjv" = ( @@ -139040,7 +139570,7 @@ aQe jTc kNt ldt -cfp +hWF riy sym wGv @@ -139742,7 +140272,7 @@ jnP jnP jnP jnP -aZS +jnP gDq hcP gDq @@ -139789,7 +140319,7 @@ jnP aZS oQf nQm -tpq +esj cVg vGF hey @@ -139999,7 +140529,7 @@ jnP jnP jnP jnP -aZS +jnP gDq hcP gDq @@ -140307,7 +140837,7 @@ aPv pzm gSe moy -lGI +nLr fqv xBo oQf @@ -140764,15 +141294,15 @@ jnP jnP jnP jnP -jnP -jnP -jnP -jnP +mJM +mJM +mJM +rYz +oec +mJM +mJM aZS -jnP -jnP aZS -jnP aZS jnP jnP @@ -141021,13 +141551,13 @@ jnP jnP jnP jnP -jnP -wPA -jnP -aZS -aZS -jnP -jnP +mJM +mkQ +jvA +cFI +qcO +gcE +mJM aZS aZS aZS @@ -141278,13 +141808,13 @@ mLQ jnP jnP jnP -jnP -jnP -jnP -aZS -jnP -jnP -jnP +mJM +oFg +xZj +xYf +cth +pSR +mJM orn orn orn @@ -141535,13 +142065,13 @@ jnP jnP jnP jnP -jnP -jnP -jnP -jnP -jnP -jnP -jnP +mJM +oLt +loM +nXF +vuz +ggZ +amj orn deg aST @@ -141792,19 +142322,19 @@ jnP jnP jnP mLQ -jnP -jnP -jnP -jnP -jnP -jnP -jnP -orn -tja +mJM +xUL +wio +xnC +iLz +eaB +skA +bAo +bZD iKR aYw -xiE -xtA +ssy +ndF fvi naQ ixI @@ -142049,15 +142579,15 @@ jnP jnP jnP wPA -jnP -jnP -jnP -jnP -jnP -jnP -jnP +mJM +czV +jMc +eHd +aNW +rJZ +ddu orn -tLy +wkT nKI xzX cdv @@ -142306,13 +142836,13 @@ wPA jnP jnP jnP -jnP -jnP -jnP -sZB -sZB -sZB -sZB +mJM +pVa +gMe +mJM +mJM +mrC +oec orn oSW nKI @@ -142563,11 +143093,11 @@ jnP jnP jnP jnP -vbN -vbN -vbN +mJM +mJM +mJM iYK -izx +tAQ vEK cHf orn @@ -142825,8 +143355,8 @@ fcb eJr fcb fuK -pff -pff +kSW +gWw orn cPI fke @@ -143082,7 +143612,7 @@ vbN vbN vbN kCQ -lRz +djZ xUn ruC lCF @@ -143339,7 +143869,7 @@ jnP vbN rjB uYT -fcb +uFm wHT lBp bfK @@ -143409,7 +143939,7 @@ xDE wQu oQf cBD -fNH +cHm wSl srp oeh @@ -143853,7 +144383,7 @@ sZB oso fcb fcb -fcb +uFm wHT vbN jnP @@ -144108,8 +144638,8 @@ eZo eZo tCh pff -xUn -wva +xgJ +vcP wva iur vbN @@ -144365,7 +144895,7 @@ ety uuH uHS fcb -wHT +eJg sZB sZB sZB @@ -144622,7 +145152,7 @@ eZo eZo tCh fcb -wHT +eJg sZB jnP jnP @@ -144879,7 +145409,7 @@ fpO fpO fpO dMr -wHT +eJg sZB jnP jnP @@ -145136,7 +145666,7 @@ wIX vew fpO fcb -wHT +eJg ydU ydU ydU @@ -145393,7 +145923,7 @@ gym bav fpO izx -wHT +eJg boC rcY pHK @@ -145907,7 +146437,7 @@ dye pFe fpO fcb -wHT +eJg kwN fwd gCz @@ -146164,7 +146694,7 @@ gEm qZn fpO fcb -wHT +eJg ydU qDG gCz @@ -146502,7 +147032,7 @@ nAc hMT obQ rJq -fOt +qpW nMY emk dGS @@ -147018,7 +147548,7 @@ gml opq hPu ckw -cEL +ayn uPm bNa fMB @@ -147780,7 +148310,7 @@ vLQ php vXX aub -nqv +cLC vOB xFW xnE @@ -152408,7 +152938,7 @@ aYX ipp wgy cFB -kuZ +oCs aIU ues jnP @@ -154170,7 +154700,7 @@ jiR lEt urg oKv -nJB +csT ewj jFw vds @@ -154403,7 +154933,7 @@ uHQ xpa tcy jnX -ukj +kOf jKd nwf fGF @@ -155453,7 +155983,7 @@ oJN arS xDS kZq -qVm +iqK pwK hdT fwH @@ -155968,11 +156498,11 @@ edg arS iXG fMq -iOO +eqR wwP dQk fwH -oct +nyB tPf kGy mwv @@ -156223,7 +156753,7 @@ cDt eSN uUB arS -ggS +jvX nRs izg sXZ @@ -160853,7 +161383,7 @@ mzN sQR fzX pgN -yfq +ize nDk lee vek @@ -164486,7 +165016,7 @@ frO vKF pdF pdF -nEg +gEN arj mWA vHx @@ -164741,9 +165271,9 @@ xdJ gBS fNn vKF -gEN -gEN nEg +nEg +gEN sux mEj qTh @@ -164931,7 +165461,7 @@ dlV jko syn cgf -xWC +kTs eUC vOE wSv @@ -165243,7 +165773,7 @@ eLX kew iTl uqq -jiX +aFa vKF gBS gBS @@ -165981,7 +166511,7 @@ hrj trn tZO iCO -nQL +xWo rMs wzF qDY @@ -166977,7 +167507,7 @@ uZS kRi leW doI -wZs +nho doI vcK doI @@ -167009,7 +167539,7 @@ tZO tZO tZO xqT -utj +pvG uMC bIH sQj @@ -167267,7 +167797,7 @@ ntJ qlt tDs eSk -raT +jjQ iEJ eOn iPZ @@ -167789,7 +168319,7 @@ qlt jOP qad fRA -uyu +fpF bfb bfb xLK @@ -168039,7 +168569,7 @@ rGh jpn dAR tVF -flp +iqx atx vHu luo @@ -168070,7 +168600,7 @@ xxQ lRd snP aIj -rOV +rWj vJc bVp dtF @@ -170141,7 +170671,7 @@ eNH tCt gsg iYE -gtw +ubc bae qHM nCK @@ -170656,8 +171186,8 @@ kVU hIT iYE cCo -tic -npe +vRQ +dPN qXW rZj hda @@ -171564,7 +172094,7 @@ wyj qvk vYn jIn -lFR +xNL fGR cwI cwI @@ -173103,7 +173633,7 @@ jnP jnP cwI cBd -wDJ +ueM rGC tcL gNy @@ -174187,7 +174717,7 @@ jnP gdv mRC rpQ -wLO +lXE qXY uIl mfA diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 7cb54e3bcf31a..5bb30c6beb371 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -211,8 +211,7 @@ }, /obj/machinery/alarm/directional/west, /obj/machinery/computer/prisoner{ - dir = 4; - req_access = list(2) + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -388,9 +387,6 @@ }, /turf/simulated/floor/engine/n2, /area/station/engineering/atmos) -"afb" = ( -/turf/simulated/wall, -/area/station/public/fitness) "afl" = ( /obj/structure/cable{ d1 = 1; @@ -596,7 +592,7 @@ }, /area/station/security/detective) "ahd" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/fore) "ahh" = ( @@ -649,7 +645,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "ahJ" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/fore) "ahZ" = ( @@ -878,7 +874,7 @@ /area/space/nearstation) "ajy" = ( /obj/item/vending_refill/coffee, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "ajC" = ( @@ -958,7 +954,7 @@ /area/station/maintenance/fore) "ajS" = ( /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "akg" = ( @@ -1104,7 +1100,7 @@ c_tag = "Engineering - Storage" }, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "akR" = ( @@ -1493,20 +1489,6 @@ }, /turf/simulated/floor/plasteel, /area/station/public/fitness) -"anf" = ( -/obj/effect/landmark/damageturf, -/obj/machinery/airlock_controller/air_cycler{ - pixel_x = -25; - pixel_y = 4; - vent_link_id = "arrivalsmaint_vent"; - ext_door_link_id = "arrivalsmaint_door_ext"; - int_door_link_id = "arrivalsmaint_door_int"; - ext_button_link_id = "arrivalsmaint_btn_ext"; - int_button_link_id = "arrivalsmaint_btn_int"; - req_access = list(13) - }, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "anh" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, @@ -1751,9 +1733,6 @@ }, /turf/simulated/floor/plasteel, /area/station/supply/lobby) -"aoh" = ( -/turf/simulated/wall, -/area/station/service/mime) "aoi" = ( /obj/structure/sign/securearea{ pixel_y = 32 @@ -1812,7 +1791,7 @@ }, /area/station/public/fitness) "aoE" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -2292,7 +2271,7 @@ /obj/item/extinguisher, /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "aro" = ( @@ -2578,7 +2557,7 @@ /area/station/public/storage/tools) "asN" = ( /obj/machinery/atmospherics/unary/tank/air, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "asQ" = ( @@ -2594,7 +2573,7 @@ }, /area/station/engineering/gravitygenerator) "asU" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/station/maintenance/solar_maintenance/fore_starboard) "asV" = ( @@ -3181,9 +3160,17 @@ /area/station/engineering/gravitygenerator) "avg" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "avk" = ( @@ -3223,7 +3210,7 @@ "avy" = ( /obj/machinery/atmospherics/portable/canister/oxygen, /obj/effect/turf_decal/delivery/hollow, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) "avz" = ( @@ -3250,7 +3237,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "avD" = ( @@ -3502,7 +3489,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/aft_port) "awf" = ( @@ -3619,7 +3606,7 @@ /area/station/security/permabrig) "awE" = ( /obj/machinery/space_heater, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -3641,7 +3628,7 @@ "awM" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore) "awN" = ( @@ -3689,7 +3676,7 @@ /area/station/public/dorms) "awT" = ( /obj/item/clothing/gloves/color/fyellow, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "awU" = ( @@ -3841,7 +3828,7 @@ /area/station/public/storage/emergency/port) "axt" = ( /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "axv" = ( @@ -4104,9 +4091,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -4193,9 +4177,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "ayN" = ( @@ -4315,7 +4296,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -4333,23 +4317,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) -"azs" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/fsmaint) "azu" = ( /obj/structure/closet/firecloset, /obj/effect/spawner/random/maintenance, @@ -4605,9 +4572,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -4620,14 +4584,17 @@ /area/station/public/sleep) "aAK" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aAL" = ( @@ -5166,6 +5133,11 @@ /area/station/maintenance/fsmaint) "aDi" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -5408,7 +5380,7 @@ /turf/simulated/floor/plating, /area/station/command/bridge) "aEj" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/public/storage/emergency/port) "aEk" = ( @@ -5638,7 +5610,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aEN" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light/small{ dir = 1 }, @@ -6084,7 +6056,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -29 }, -/obj/machinery/suit_storage_unit/ce/secure, +/obj/machinery/suit_storage_unit/industrial/ce/secure, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -6519,7 +6491,7 @@ dir = 1 }, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "aIA" = ( @@ -7544,7 +7516,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/service/bar) "aLD" = ( @@ -7746,7 +7718,7 @@ "aMh" = ( /obj/machinery/atmospherics/portable/canister/air, /obj/effect/turf_decal/delivery/white/hollow, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "aMi" = ( @@ -10781,7 +10753,7 @@ /turf/simulated/floor/plating, /area/station/security/storage) "aVY" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/maintenance/fore) "aVZ" = ( @@ -11237,10 +11209,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/port/east) -"aXu" = ( -/obj/effect/spawner/random/fungus/maybe, -/turf/simulated/wall, -/area/station/public/toilet/lockerroom) "aXw" = ( /obj/effect/landmark/start/cargo_technician, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -12140,14 +12108,17 @@ }, /area/station/public/locker) "bag" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bai" = ( @@ -12658,7 +12629,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "bbK" = ( @@ -12740,15 +12711,12 @@ }, /area/station/aisat) "bcb" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/space/nearstation) "bcd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/girder, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -14040,6 +14008,17 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bfc" = ( @@ -14137,7 +14116,7 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plating, -/area/station/supply/storage) +/area/station/maintenance/port2) "bfp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -14780,8 +14759,8 @@ /area/space/nearstation) "bgV" = ( /obj/item/kirbyplants/plant22, -/obj/effect/spawner/random_spawners/cobweb_left_rare, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/cobweb/left/rare, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "bgW" = ( @@ -15399,7 +15378,7 @@ dir = 4 }, /turf/simulated/wall, -/area/station/supply/sorting) +/area/station/maintenance/port2) "biE" = ( /obj/machinery/conveyor{ dir = 4; @@ -16127,7 +16106,7 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, /turf/simulated/floor/plating, -/area/station/supply/sorting) +/area/station/maintenance/port2) "bkw" = ( /obj/structure/cable{ d1 = 1; @@ -16501,6 +16480,11 @@ /area/station/engineering/ai_transit_tube) "blA" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "blB" = ( @@ -16895,7 +16879,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bmq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bmr" = ( @@ -17144,7 +17128,7 @@ /obj/effect/mapping_helpers/airlock/access/any/service/hydroponics, /obj/effect/mapping_helpers/airlock/access/any/service/kitchen, /turf/simulated/floor/plating, -/area/station/service/hydroponics) +/area/station/maintenance/starboard) "bnd" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, @@ -18190,7 +18174,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "bpT" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bpU" = ( @@ -18493,7 +18477,7 @@ }, /area/station/hallway/primary/central/se) "bqS" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/space/nearstation) "bqT" = ( @@ -19868,9 +19852,7 @@ }, /area/station/service/barber) "buI" = ( -/obj/structure/closet/secure_closet/bar{ - req_access = list(25) - }, +/obj/structure/closet/secure_closet/bar, /obj/machinery/light/small{ dir = 1 }, @@ -20703,7 +20685,7 @@ /turf/space, /area/space/nearstation) "bwO" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/service/bar) "bwP" = ( @@ -21964,8 +21946,7 @@ }, /obj/machinery/power/apc/directional/east, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "purple" + icon_state = "neutralcorner" }, /area/station/hallway/primary/aft/south) "bAv" = ( @@ -24151,7 +24132,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/station/science/xenobiology) +/area/station/maintenance/xenobio_north) "bIu" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -24230,7 +24211,7 @@ "bIH" = ( /obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" + icon_state = "purplecorner" }, /area/station/hallway/primary/aft/south) "bIO" = ( @@ -25470,7 +25451,7 @@ "bNf" = ( /obj/structure/table/wood, /obj/item/reagent_containers/glass/rag, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "bNg" = ( @@ -26297,7 +26278,7 @@ /area/station/hallway/secondary/bridge) "bQu" = ( /obj/machinery/economy/slot_machine, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "bQy" = ( @@ -26641,7 +26622,7 @@ /area/station/service/library) "bRK" = ( /obj/structure/bookcase{ - name = "bookcase (Adult)" + name = "bookcase (Romance)" }, /turf/simulated/floor/wood, /area/station/service/library) @@ -26932,7 +26913,7 @@ "bSG" = ( /obj/machinery/atmospherics/portable/pump, /obj/effect/turf_decal/delivery/white/hollow, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/machinery/light/small{ dir = 1 }, @@ -27326,7 +27307,7 @@ }, /area/station/supply/expedition) "bTU" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -27399,7 +27380,7 @@ /area/station/science/research) "bUz" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard2) "bUA" = ( @@ -27605,7 +27586,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/science/robotics/showroom) "bVe" = ( @@ -27724,7 +27705,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "bVL" = ( @@ -27745,7 +27726,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "bVN" = ( @@ -27762,7 +27743,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "bVR" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port) "bVS" = ( @@ -28084,7 +28065,7 @@ /turf/simulated/floor/wood, /area/station/science/robotics/showroom) "bWJ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/science/robotics/showroom) "bWK" = ( @@ -28177,7 +28158,7 @@ }, /area/station/supply/expedition) "bWZ" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -28255,7 +28236,7 @@ opacity = 1 }, /turf/simulated/floor/plasteel, -/area/station/service/hydroponics) +/area/station/maintenance/starboard) "bXt" = ( /obj/structure/bookcase{ name = "bookcase (Fiction)" @@ -28757,7 +28738,7 @@ }, /area/station/ai_monitored/storage/eva) "bYT" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "bYW" = ( @@ -28899,7 +28880,7 @@ }, /area/station/maintenance/asmaint) "bZz" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -29940,7 +29921,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "cdB" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -30009,7 +29990,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "cdP" = ( @@ -30337,7 +30318,7 @@ /area/station/maintenance/aft) "cfb" = ( /obj/machinery/economy/slot_machine, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cfc" = ( @@ -30888,7 +30869,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -31068,7 +31049,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/port2) "chE" = ( @@ -31674,7 +31655,7 @@ /obj/structure/chair/stool{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "cjH" = ( @@ -31862,7 +31843,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/aft) "ckF" = ( @@ -32026,7 +32007,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port) "cll" = ( @@ -32237,7 +32218,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "cmi" = ( @@ -32289,7 +32270,7 @@ }, /area/station/science/research) "cms" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/port) "cmu" = ( @@ -32396,6 +32377,7 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/machinery/atmospherics/unary/portables_connector, /turf/simulated/floor/plating/airless, /area/station/engineering/atmos) "cmQ" = ( @@ -32405,6 +32387,7 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/machinery/atmospherics/unary/portables_connector, /turf/simulated/floor/plating/airless, /area/station/engineering/atmos) "cmR" = ( @@ -32659,14 +32642,16 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/unary/portables_connector, +/obj/machinery/atmospherics/binary/pump, /turf/simulated/floor/plating/airless, /area/station/engineering/atmos) "coc" = ( /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/unary/portables_connector, +/obj/machinery/atmospherics/binary/pump{ + dir = 1 + }, /turf/simulated/floor/plating/airless, /area/station/engineering/atmos) "cof" = ( @@ -32966,13 +32951,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/aft_port) "cpq" = ( -/obj/machinery/atmospherics/binary/pump, -/turf/simulated/wall/r_wall, -/area/station/engineering/atmos) -"cps" = ( -/obj/machinery/atmospherics/binary/pump{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/wall/r_wall, /area/station/engineering/atmos) "cpt" = ( @@ -33196,7 +33175,7 @@ /area/station/maintenance/aft) "cqi" = ( /obj/item/shovel/spade, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard2) "cqj" = ( @@ -33277,8 +33256,8 @@ }, /area/station/science/rnd) "cqC" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, -/obj/machinery/constructable_frame/machine_frame, +/obj/effect/spawner/random/cobweb/left/rare, +/obj/structure/machine_frame, /obj/item/stack/cable_coil/five, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -33304,8 +33283,8 @@ /obj/item/cultivator, /obj/item/reagent_containers/glass/bucket, /obj/item/vending_refill/hydroseeds, -/obj/effect/spawner/random_spawners/cobweb_right_rare, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/cobweb/right/rare, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard2) "cqK" = ( @@ -33599,7 +33578,7 @@ /obj/effect/turf_decal/stripes/white/line, /obj/structure/closet/emcloset, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "crR" = ( @@ -33738,7 +33717,7 @@ /turf/simulated/floor/plasteel/airless, /area/station/engineering/atmos) "csv" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "csw" = ( @@ -34589,7 +34568,7 @@ /obj/structure/chair/stool{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "cvS" = ( @@ -34854,7 +34833,7 @@ "cwQ" = ( /obj/structure/closet/firecloset, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "cwR" = ( @@ -35055,7 +35034,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -35172,7 +35151,7 @@ /obj/item/seeds/banana, /obj/item/seeds/chanter, /obj/item/seeds/chili, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard2) "cyf" = ( @@ -35249,7 +35228,7 @@ "cyx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "cyy" = ( @@ -35623,7 +35602,7 @@ /area/station/maintenance/xenobio_south) "cAf" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/space_heater, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -36176,7 +36155,7 @@ /area/station/maintenance/apmaint) "cCp" = ( /obj/structure/closet/crate, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -36184,7 +36163,7 @@ /obj/structure/table/wood, /obj/item/book/manual/random, /obj/item/paicard, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "cCs" = ( @@ -36411,7 +36390,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cDl" = ( @@ -36494,7 +36473,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cDA" = ( @@ -37474,7 +37453,7 @@ pixel_x = -32 }, /obj/structure/bed/dogbed, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "cHf" = ( @@ -37653,7 +37632,7 @@ /area/station/security/prison/cell_block/A) "cHy" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cHA" = ( @@ -37866,7 +37845,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "cIl" = ( @@ -37891,7 +37870,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "cIp" = ( @@ -38414,7 +38393,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "purplecorner" + dir = 4; + icon_state = "purple" }, /area/station/hallway/primary/aft/south) "cKz" = ( @@ -39174,7 +39154,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/port) "cNC" = ( @@ -39386,9 +39366,7 @@ /area/station/science/toxins/launch) "cOA" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/bar{ - req_access = list(25) - }, +/obj/structure/closet/secure_closet/bar, /obj/machinery/light_switch{ name = "north bump"; pixel_y = 24 @@ -39605,19 +39583,19 @@ pixel_y = 32 }, /obj/structure/reagent_dispensers/fueltank, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cPq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/spawner/random/janitor/supplies, /turf/simulated/floor/plating, /area/station/maintenance/port) "cPr" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/table, /obj/item/kitchen/rollingpin, /obj/item/reagent_containers/glass/beaker, @@ -39861,7 +39839,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "cQt" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light/small, /mob/living/simple_animal/mouse, /turf/simulated/floor/plating, @@ -40242,7 +40220,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard2) "cSg" = ( @@ -40619,7 +40597,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "cTD" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, @@ -41449,13 +41427,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port2) "cXu" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fore) "cXz" = ( @@ -41656,7 +41634,7 @@ /area/station/science/toxins/test) "cYB" = ( /obj/machinery/economy/vending/hydrodrobe, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) "cYC" = ( @@ -42257,7 +42235,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dbC" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/structure/closet/crate/secure/loot, /obj/item/circuitboard/biogenerator, /turf/simulated/floor/plasteel, @@ -42302,7 +42280,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "dcd" = ( @@ -42335,7 +42313,7 @@ "dcj" = ( /obj/structure/chair/sofa/left, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "dcq" = ( @@ -42876,7 +42854,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -42999,7 +42977,7 @@ }, /area/station/hallway/secondary/entry/south) "dgg" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -43016,7 +42994,7 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/simulated/floor/plating, -/area/station/service/hydroponics) +/area/station/maintenance/starboard2) "dgp" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -44004,15 +43982,18 @@ }, /area/station/medical/surgery/observation) "dxe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "dxh" = ( @@ -44080,6 +44061,16 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/control) +"dxJ" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/unary/outlet_injector/on, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/space, +/area/station/maintenance/fsmaint) "dxT" = ( /obj/item/radio/intercom{ name = "north bump"; @@ -44354,6 +44345,18 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) +"dEx" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "dEG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -44561,6 +44564,11 @@ "dKL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "dKN" = ( @@ -44613,6 +44621,10 @@ icon_state = "whiteblue" }, /area/station/medical/reception) +"dMB" = ( +/obj/structure/sign/radiation/rad_area, +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "dMK" = ( /obj/machinery/atmospherics/binary/valve/open, /turf/simulated/floor/plating, @@ -45078,7 +45090,7 @@ pixel_x = 4; pixel_y = -4 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "dYi" = ( @@ -45225,6 +45237,14 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel, /area/station/security/brig) +"eaC" = ( +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "eaG" = ( /obj/structure/sign/poster/official/random{ pixel_x = 32 @@ -45303,7 +45323,7 @@ "ech" = ( /obj/effect/spawner/random/maintenance, /obj/structure/table, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "edg" = ( @@ -45331,7 +45351,7 @@ /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plating, -/area/station/security/range) +/area/station/maintenance/fore) "edw" = ( /obj/structure/cable{ d1 = 4; @@ -46408,7 +46428,7 @@ /area/station/security/permabrig) "eBk" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port) "eBq" = ( @@ -46435,9 +46455,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -46747,11 +46764,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/aft2) -"eKV" = ( -/obj/structure/lattice/catwalk, -/obj/item/barcodescanner, -/turf/space, -/area/space/nearstation) "eKW" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig" @@ -46797,7 +46809,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/science/test_chamber) "eLW" = ( @@ -46851,7 +46863,7 @@ }, /area/station/science/xenobiology) "eMS" = ( -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore) "eNa" = ( @@ -46940,7 +46952,7 @@ }, /area/station/hallway/secondary/entry/lounge) "ePK" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard2) "ePT" = ( @@ -46972,7 +46984,7 @@ /turf/simulated/floor/carpet, /area/station/science/robotics/showroom) "eQn" = ( -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -47027,7 +47039,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bot" }, -/area/station/service/kitchen) +/area/station/maintenance/starboard) "eRy" = ( /obj/structure/table/glass, /obj/structure/cable{ @@ -47224,7 +47236,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -47449,7 +47461,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/station/science/rnd) +/area/station/maintenance/starboard2) "eYD" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ @@ -47533,7 +47545,7 @@ }, /area/station/science/break_room) "eZR" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/clothing/mask/gas, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -47990,7 +48002,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/port2) "fla" = ( @@ -48292,7 +48304,7 @@ dir = 4 }, /turf/simulated/wall/r_wall, -/area/station/science/toxins/mixing) +/area/station/maintenance/asmaint) "fqz" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -48436,6 +48448,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/engine, /area/station/engineering/control) "ftd" = ( @@ -48502,7 +48519,7 @@ inlet_injector_autolink_id = "n2o_in"; name = "Nitrous Oxide Supply Control"; outlet_vent_autolink_id = "n2o_out"; - autolink_sensors = list("n2o_sensor" = "Tank") + autolink_sensors = list("n2o_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/structure/window/reinforced{ @@ -49619,7 +49636,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/station/security/detective) +/area/station/maintenance/fore) "fQi" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -49689,9 +49706,17 @@ "fRm" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fore) +"fRA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkgrey" + }, +/area/station/engineering/transmission_laser) "fRT" = ( /obj/machinery/computer/secure_data{ dir = 8 @@ -49822,7 +49847,7 @@ }, /area/station/science/lobby) "fTV" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "fUf" = ( @@ -50013,7 +50038,7 @@ dir = 10 }, /obj/machinery/alarm/directional/north, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "fYk" = ( @@ -50164,10 +50189,6 @@ icon_state = "whitepurple" }, /area/station/science/xenobiology) -"gbM" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, -/turf/simulated/wall, -/area/station/maintenance/fsmaint) "gbP" = ( /obj/structure/cable{ d1 = 1; @@ -50472,6 +50493,17 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "ggM" = ( @@ -50731,7 +50763,7 @@ /area/station/medical/reception) "gnS" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "gnZ" = ( @@ -50975,13 +51007,27 @@ icon_state = "red" }, /area/station/security/processing) +"gsW" = ( +/obj/effect/spawner/window/reinforced/plasma/grilled, +/obj/machinery/door/poddoor/preopen{ + id_tag = "Xenolab"; + name = "special containment blast door" + }, +/obj/structure/cable, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/engine, +/area/station/maintenance/xenobio_north) "gtu" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, /obj/structure/lattice, /turf/space, /area/space/nearstation) "gty" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/station/maintenance/aft2) "gtW" = ( @@ -51231,7 +51277,7 @@ }, /area/station/medical/reception) "gBL" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/science/test_chamber) "gCo" = ( @@ -51410,7 +51456,7 @@ /obj/structure/table, /obj/item/flashlight/lamp, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "gFf" = ( @@ -51570,6 +51616,11 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -51585,8 +51636,8 @@ /area/station/maintenance/fpmaint) "gHV" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, -/obj/machinery/constructable_frame/machine_frame, +/obj/effect/spawner/random/cobweb/left/frequent, +/obj/structure/machine_frame, /obj/item/stack/cable_coil/five, /turf/simulated/floor/bluegrid, /area/station/maintenance/starboard) @@ -51764,7 +51815,7 @@ }, /area/station/engineering/break_room) "gLZ" = ( -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "gMh" = ( @@ -51922,7 +51973,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/warehouse) "gOT" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/science/research) "gOU" = ( @@ -52804,7 +52855,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -52960,7 +53011,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/lobby) "hjE" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -53069,7 +53120,7 @@ }, /area/station/security/armory/secure) "hmu" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -53123,7 +53174,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -53454,7 +53505,7 @@ /turf/simulated/floor/plasteel, /area/station/security/prison/cell_block/A) "hvr" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "hvz" = ( @@ -53694,6 +53745,17 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "hAK" = ( @@ -54063,6 +54125,20 @@ icon_state = "green" }, /area/station/service/hydroponics) +"hGw" = ( +/obj/effect/mapping_helpers/turfs/damage, +/obj/machinery/airlock_controller/air_cycler{ + pixel_x = -25; + pixel_y = 4; + vent_link_id = "arrivalsmaint_vent"; + ext_door_link_id = "arrivalsmaint_door_ext"; + int_door_link_id = "arrivalsmaint_door_int"; + ext_button_link_id = "arrivalsmaint_btn_ext"; + int_button_link_id = "arrivalsmaint_btn_int"; + req_access = list(13) + }, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "hGS" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -54551,7 +54627,7 @@ inlet_injector_autolink_id = "o2_in"; name = "Oxygen Supply Control"; outlet_vent_autolink_id = "o2_out"; - autolink_sensors = list("o2_sensor" = "Tank") + autolink_sensors = list("o2_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -54741,7 +54817,7 @@ "hTl" = ( /obj/item/book/manual/random, /obj/machinery/light/small, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "hTx" = ( @@ -54768,7 +54844,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 8 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "hTS" = ( @@ -55043,7 +55119,7 @@ /turf/space, /area/space/nearstation) "iag" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -55296,7 +55372,7 @@ "igJ" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "ihq" = ( @@ -56235,7 +56311,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/mecha_part_fabricator/station, +/obj/machinery/mecha_part_fabricator/station{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/science/robotics) "iAS" = ( @@ -56281,7 +56359,7 @@ /obj/effect/spawner/random/maintenance, /obj/item/clothing/under/plasmaman/science, /obj/item/clothing/head/helmet/space/plasmaman/science, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitehall" @@ -56744,6 +56822,11 @@ /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -56952,6 +57035,14 @@ "iRu" = ( /turf/simulated/wall/r_wall, /area/station/engineering/atmos/distribution) +"iRA" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fsmaint) "iRP" = ( /obj/structure/disposalpipe/junction/reversed{ dir = 8 @@ -57545,7 +57636,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "jfb" = ( @@ -57652,7 +57743,7 @@ "jiR" = ( /obj/structure/closet/firecloset, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore) "jiW" = ( @@ -58050,7 +58141,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "juN" = ( @@ -58400,10 +58491,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) -"jDK" = ( -/obj/effect/spawner/random/fungus/maybe, -/turf/simulated/wall, -/area/station/hallway/primary/central/se) "jEw" = ( /obj/structure/transit_tube/horizontal, /obj/structure/lattice/catwalk, @@ -58490,7 +58577,7 @@ /obj/machinery/computer/general_air_control{ dir = 1; name = "Bomb Mix Monitor"; - autolink_sensors = list("burn_sensor" = "Burn Mix") + autolink_sensors = list("burn_sensor"="Burn Mix") }, /obj/machinery/door_control{ id = "ToxinsVenting"; @@ -58628,6 +58715,16 @@ }, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) +"jHX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "jIf" = ( /obj/machinery/hologram/holopad, /obj/structure/disposalpipe/segment, @@ -59984,6 +60081,10 @@ icon_state = "whiteblue" }, /area/station/medical/medbay) +"kgN" = ( +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "kgS" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/light/small{ @@ -60004,7 +60105,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "purple" + icon_state = "purplecorner" }, /area/station/hallway/primary/aft/south) "khy" = ( @@ -60115,7 +60216,7 @@ }, /area/station/security/permabrig) "klo" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -60179,6 +60280,11 @@ "kmb" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, /obj/effect/spawner/window/reinforced/grilled, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "kmj" = ( @@ -60251,7 +60357,7 @@ /turf/simulated/floor/engine/plasma, /area/station/engineering/atmos) "kol" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -60425,10 +60531,6 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) -"ksb" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, -/turf/simulated/wall/r_wall, -/area/station/maintenance/fsmaint) "ksf" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -60937,7 +61039,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "kEw" = ( -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "kEy" = ( @@ -61950,7 +62052,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -62519,7 +62621,7 @@ "ljT" = ( /obj/item/rack_parts, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fore) "ljV" = ( @@ -62762,6 +62864,14 @@ }, /turf/simulated/floor/plasteel, /area/station/public/dorms) +"loa" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; + name = "KEEP CLEAR: DOCKING AREA" + }, +/obj/effect/mapping_helpers/turfs/rust/probably, +/turf/simulated/wall/r_wall, +/area/station/maintenance/fsmaint) "loo" = ( /obj/structure/cable/pink{ icon_state = "1-8" @@ -62913,7 +63023,7 @@ "lst" = ( /obj/structure/rack, /obj/item/extinguisher, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "lsz" = ( @@ -63148,7 +63258,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/science/xenobiology) +/area/station/maintenance/xenobio_south) "lyp" = ( /obj/structure/extinguisher_cabinet{ name = "west bump"; @@ -63802,6 +63912,10 @@ icon_state = "bluecorner" }, /area/station/hallway/primary/central/sw) +"lKS" = ( +/obj/effect/mapping_helpers/turfs/rust/probably, +/turf/simulated/wall/r_wall, +/area/station/maintenance/fsmaint) "lLb" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable, @@ -64025,7 +64139,7 @@ /area/station/service/chapel) "lPm" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "lPx" = ( @@ -64257,7 +64371,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/spacehut) "lVp" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/solar_maintenance/aft_starboard) "lVy" = ( @@ -64338,7 +64452,7 @@ "lXi" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "lXV" = ( @@ -64417,6 +64531,18 @@ }, /turf/simulated/floor/plating, /area/station/security/main) +"lZY" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "mao" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -65317,7 +65443,7 @@ "mtr" = ( /obj/structure/closet/firecloset, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "mtV" = ( @@ -65833,6 +65959,14 @@ icon_state = "blackcorner" }, /area/station/security/permabrig) +"mDU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkgrey" + }, +/area/station/engineering/transmission_laser) "mDX" = ( /obj/structure/cable{ d2 = 4; @@ -65971,8 +66105,7 @@ pixel_x = 32 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "purplecorner" + icon_state = "neutralcorner" }, /area/station/hallway/primary/aft/south) "mGT" = ( @@ -65980,7 +66113,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/carpet/arcade, /area/station/maintenance/fore) "mHn" = ( @@ -66001,7 +66134,7 @@ inlet_injector_autolink_id = "n2_in"; name = "Nitrogen Supply Control"; outlet_vent_autolink_id = "n2_out"; - autolink_sensors = list("n2_sensor" = "Tank") + autolink_sensors = list("n2_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -66386,7 +66519,7 @@ }, /area/station/hallway/primary/starboard/east) "mPr" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -66668,11 +66801,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/station/science/explab) -"mVF" = ( -/obj/effect/spawner/random/fungus/maybe, -/turf/simulated/wall, -/area/station/service/hydroponics) +/area/station/maintenance/asmaint) "mVG" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -66717,10 +66846,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) -"mVZ" = ( -/obj/effect/spawner/random/fungus/probably, -/turf/simulated/wall, -/area/station/service/hydroponics) "mWp" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ @@ -66816,6 +66941,11 @@ d2 = 8; icon_state = "1-8" }, +/obj/structure/cable{ + icon_state = "1-4"; + d1 = 1; + d2 = 4 + }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "mYh" = ( @@ -66938,7 +67068,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/distribution) "naq" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/science/toxins/launch) "naR" = ( @@ -67263,6 +67393,11 @@ }, /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "nfk" = ( @@ -67922,7 +68057,7 @@ "nsJ" = ( /obj/structure/sign/electricshock, /turf/simulated/wall/r_wall, -/area/station/security/range) +/area/station/maintenance/fore) "ntO" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -67942,6 +68077,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -68001,6 +68141,11 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"nuP" = ( +/obj/effect/mapping_helpers/turfs/rust/probably, +/obj/structure/sign/radiation/rad_area, +/turf/simulated/wall/r_wall, +/area/station/maintenance/fsmaint) "nvB" = ( /turf/simulated/wall, /area/station/security/prison/cell_block/A) @@ -68287,7 +68432,7 @@ "nBf" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "nBj" = ( @@ -68328,7 +68473,7 @@ /area/station/maintenance/asmaint) "nCf" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "nCh" = ( @@ -68729,7 +68874,7 @@ pixel_x = -4; pixel_y = 1 }, -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "nKf" = ( @@ -68866,7 +69011,7 @@ /area/station/security/range) "nOE" = ( /obj/item/book/manual/random, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -68877,6 +69022,18 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/starboard) +"nOH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/power/apc/directional/west, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "nOR" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance_hatch{ @@ -68935,7 +69092,7 @@ "nPD" = ( /obj/structure/closet/emcloset, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore) "nPH" = ( @@ -68978,7 +69135,7 @@ }, /area/station/science/toxins/launch) "nRQ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/station/science/test_chamber) "nSc" = ( @@ -68997,7 +69154,7 @@ /area/station/maintenance/asmaint) "nSs" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "nSC" = ( @@ -69226,7 +69383,7 @@ /area/station/maintenance/starboard) "nXk" = ( /obj/structure/bookcase, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "nXr" = ( @@ -69298,7 +69455,7 @@ /obj/machinery/computer/arcade/battle{ dir = 8 }, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fore) "nYF" = ( @@ -69352,7 +69509,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "nZj" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/station/engineering/control) "nZB" = ( @@ -69371,6 +69528,14 @@ icon_state = "escape" }, /area/station/engineering/atmos) +"nZV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/alarm/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "oab" = ( /obj/structure/lattice/catwalk, /obj/item/toy/plushie/carpplushie, @@ -69887,9 +70052,9 @@ }, /area/station/maintenance/asmaint) "ook" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, -/area/station/security/range) +/area/station/maintenance/fore) "ool" = ( /obj/item/seeds/eggplant, /turf/simulated/floor/plating, @@ -70004,7 +70169,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "oqk" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/chair/stool{ dir = 8 }, @@ -70129,9 +70294,6 @@ /turf/space, /area/station/engineering/solar/fore_port) "ovR" = ( -/obj/structure/bookcase{ - name = "bookcase (Adult)" - }, /turf/simulated/floor/wood, /area/station/maintenance/starboard) "owq" = ( @@ -70142,6 +70304,15 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/security/permabrig) +"owM" = ( +/obj/structure/rack, +/obj/item/storage/toolbox/mechanical, +/obj/item/multitool, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "owQ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -70433,7 +70604,7 @@ /area/station/science/rnd) "oDp" = ( /obj/structure/girder, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "oEe" = ( @@ -70746,7 +70917,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "oNk" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "oNl" = ( @@ -70817,7 +70988,7 @@ /area/station/maintenance/starboard) "oNA" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "oNQ" = ( @@ -71247,7 +71418,7 @@ }, /area/station/science/robotics) "oVx" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/station/engineering/gravitygenerator) "oVI" = ( @@ -71266,6 +71437,14 @@ icon_state = "neutralcorner" }, /area/station/public/fitness) +"oVV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkgrey" + }, +/area/station/engineering/transmission_laser) "oWa" = ( /obj/machinery/door/window/classic/normal{ name = "Containment Pen #7"; @@ -71478,6 +71657,23 @@ icon_state = "bar" }, /area/station/service/bar) +"pap" = ( +/obj/effect/mapping_helpers/turfs/damage, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/obj/machinery/access_button{ + autolink_id = "arrivalsmaint_btn_int"; + name = "interior access button"; + pixel_x = -25; + pixel_y = -25; + req_access = list(13) + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "pat" = ( /obj/structure/table/wood, /obj/machinery/computer/secure_data/laptop{ @@ -71830,7 +72026,7 @@ inlet_injector_autolink_id = "tox_in"; name = "Toxin Supply Control"; outlet_vent_autolink_id = "tox_out"; - autolink_sensors = list("tox_sensor" = "Tank") + autolink_sensors = list("tox_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/structure/window/reinforced{ @@ -72054,7 +72250,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) "pmd" = ( @@ -72530,14 +72726,17 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "pxj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "pxk" = ( @@ -72695,14 +72894,17 @@ /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "pAU" = ( @@ -73782,8 +73984,17 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/starboard) +"pWg" = ( +/obj/effect/spawner/window/reinforced/grilled, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/station/engineering/transmission_laser) "pWK" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "pWM" = ( @@ -73878,7 +74089,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/disposalpipe/segment/corner{ dir = 8 }, @@ -74965,10 +75176,12 @@ dir = 2 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 }, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) @@ -75126,7 +75339,7 @@ /area/station/science/xenobiology) "qyp" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "qyw" = ( @@ -75209,6 +75422,20 @@ icon_state = "whitegreen" }, /area/station/medical/virology) +"qAl" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fsmaint) "qAr" = ( /obj/machinery/light/small{ dir = 1 @@ -75557,7 +75784,7 @@ }, /area/station/security/armory) "qKY" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "qLe" = ( @@ -75849,7 +76076,7 @@ /area/station/security/interrogation) "qRm" = ( /mob/living/simple_animal/mouse, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "qRq" = ( @@ -76135,6 +76362,20 @@ icon_state = "purple" }, /area/station/science/xenobiology) +"qYk" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fsmaint) "qYD" = ( /obj/structure/window/plasmareinforced{ dir = 4 @@ -76146,7 +76387,7 @@ /area/station/science/toxins/mixing) "qYT" = ( /obj/machinery/computer/nonfunctional, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/bluespace, /area/station/maintenance/starboard) "qZg" = ( @@ -76215,6 +76456,20 @@ }, /turf/simulated/floor/engine, /area/station/engineering/control) +"rag" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/engineering{ + name = "Power Transmission Laser" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/simulated/floor/plasteel, +/area/station/maintenance/fsmaint) "rak" = ( /obj/structure/table/glass, /obj/structure/window/reinforced{ @@ -76383,11 +76638,11 @@ /area/station/maintenance/fsmaint) "rbS" = ( /obj/machinery/mecha_part_fabricator, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) "rbU" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light/small{ dir = 4 }, @@ -76556,7 +76811,7 @@ }, /area/station/science/storage) "rhb" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/chair, /turf/simulated/floor/plating, /area/station/maintenance/engimaint) @@ -76749,6 +77004,13 @@ /obj/structure/chair/stool, /turf/simulated/floor/wood, /area/station/service/cafeteria) +"rla" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; + name = "KEEP CLEAR: DOCKING AREA" + }, +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "rll" = ( /obj/structure/table/glass, /obj/machinery/camera{ @@ -76796,6 +77058,11 @@ d2 = 2; icon_state = "4-8" }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/engine, /area/station/engineering/control) "rmg" = ( @@ -77519,6 +77786,20 @@ icon_state = "dark" }, /area/station/aisat) +"rzV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkgrey" + }, +/area/station/engineering/transmission_laser) "rzW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -77560,6 +77841,15 @@ /obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/distribution) +"rAu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "rAE" = ( /obj/structure/extinguisher_cabinet{ name = "east bump"; @@ -78347,6 +78637,18 @@ "rOZ" = ( /turf/simulated/wall/r_wall, /area/station/science/toxins/launch) +"rPn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/catwalk, +/area/station/engineering/transmission_laser) "rPt" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -78498,7 +78800,7 @@ name = "Mixed Air Supply Control"; outlet_vent_autolink_id = "air_out"; outlet_setting = 2000; - autolink_sensors = list("air_sensor" = "Tank") + autolink_sensors = list("air_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -78927,10 +79229,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/maintenance/aft) -"scT" = ( -/obj/effect/spawner/random/fungus/maybe, -/turf/simulated/wall/r_wall, -/area/station/public/mrchangs) "scY" = ( /obj/structure/cable{ d1 = 1; @@ -79201,7 +79499,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/distribution) "skd" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -79380,7 +79678,7 @@ /area/station/hallway/secondary/entry/south) "smW" = ( /obj/machinery/space_heater, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -79475,13 +79773,13 @@ }, /area/station/service/kitchen) "spf" = ( -/obj/structure/filingcabinet/security, /obj/machinery/light{ dir = 8 }, /obj/machinery/computer/guestpass{ pixel_x = -28 }, +/obj/structure/filingcabinet, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" @@ -79616,6 +79914,12 @@ /obj/machinery/economy/vending/cigarette, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"sts" = ( +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/plasteel{ + icon_state = "darkgrey" + }, +/area/station/engineering/transmission_laser) "stW" = ( /obj/structure/window/reinforced{ dir = 8 @@ -79679,7 +79983,7 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "swh" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/crowbar/small, /turf/simulated/floor/plasteel{ dir = 9; @@ -79862,7 +80166,7 @@ dir = 4 }, /obj/structure/closet/crate/trashcart, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -80146,7 +80450,7 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/tox, /turf/simulated/floor/plating, -/area/station/science/toxins/launch) +/area/station/maintenance/aft2) "sGI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -80668,7 +80972,7 @@ /turf/simulated/floor/carpet, /area/station/legal/courtroom) "sPF" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -81066,7 +81370,7 @@ "sZC" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/machinery/light/small{ dir = 1 }, @@ -81179,7 +81483,7 @@ "tba" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -81499,7 +81803,7 @@ /turf/simulated/floor/carpet, /area/station/command/office/hop) "thI" = ( -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, @@ -81583,9 +81887,6 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) -"tjd" = ( -/turf/simulated/wall/r_wall, -/area/station/science/server/coldroom) "tjR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -81820,6 +82121,10 @@ /mob/living/simple_animal/mouse, /turf/simulated/floor/plating, /area/station/maintenance/starboard) +"toc" = ( +/obj/structure/sign/electricshock, +/turf/simulated/wall/r_wall, +/area/station/maintenance/fsmaint) "toy" = ( /turf/simulated/wall/r_wall, /area/station/hallway/primary/central/north) @@ -82316,8 +82621,7 @@ /area/station/security/permabrig) "tAF" = ( /obj/machinery/computer/prisoner{ - dir = 1; - req_access = list(2) + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -82662,7 +82966,7 @@ }, /area/station/engineering/break_room) "tKX" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/engine, /area/station/maintenance/asmaint) "tLv" = ( @@ -82719,7 +83023,7 @@ "tNh" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/atmospherics/portable/canister/air, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fore) "tNn" = ( @@ -83098,7 +83402,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "tXq" = ( @@ -83215,7 +83519,7 @@ inlet_injector_autolink_id = "waste_in"; name = "Gas Mix Tank Control"; outlet_vent_autolink_id = "waste_out"; - autolink_sensors = list("waste_sensor" = "Tank") + autolink_sensors = list("waste_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel{ @@ -83344,6 +83648,20 @@ icon_state = "white" }, /area/station/medical/reception) +"ubU" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fsmaint) "uck" = ( /obj/machinery/light{ dir = 8 @@ -83958,6 +84276,26 @@ /obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"uoX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "upe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -84027,7 +84365,7 @@ /turf/simulated/floor/plating, /area/station/security/permabrig) "urH" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fore) "usg" = ( @@ -84135,6 +84473,15 @@ icon_state = "whitepurple" }, /area/station/science/robotics) +"uvz" = ( +/obj/structure/rack, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "uvM" = ( /obj/structure/cable{ d1 = 1; @@ -84193,6 +84540,11 @@ icon_state = "dark" }, /area/station/medical/surgery/observation) +"uxg" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkgrey" + }, +/area/station/engineering/transmission_laser) "uxo" = ( /obj/machinery/status_display{ layer = 4; @@ -84595,6 +84947,10 @@ icon_state = "white" }, /area/station/science/rnd) +"uHr" = ( +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/engineering/transmission_laser) "uHv" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -84720,6 +85076,17 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/port/east) +"uJG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/camera{ + c_tag = "AI Satellite Antechamber South"; + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "uJL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -84984,6 +85351,10 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"uOd" = ( +/obj/structure/sign/electricshock, +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "uOg" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -85032,15 +85403,15 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/mapping_helpers/airlock/windoor/access/all/science/research{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/windoor/access/all/science/tox{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/science/misc_lab) "uPt" = ( @@ -85108,6 +85479,12 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"uQK" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard) "uQU" = ( /obj/structure/cable{ d1 = 4; @@ -85581,6 +85958,17 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fore) +"uZx" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/mapping_helpers/turfs/rust/probably, +/turf/simulated/floor/plating, +/area/station/maintenance/fsmaint) "uZy" = ( /turf/simulated/floor/plasteel{ icon_state = "red" @@ -85749,7 +86137,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/science/rnd) +/area/station/maintenance/starboard2) "vdk" = ( /obj/structure/cable{ d2 = 4; @@ -85814,23 +86202,6 @@ icon_state = "whiteblue" }, /area/station/medical/medbay) -"veE" = ( -/obj/effect/landmark/damageturf, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 - }, -/obj/machinery/access_button{ - autolink_id = "arrivalsmaint_btn_int"; - name = "interior access button"; - pixel_x = -25; - pixel_y = -25; - req_access = list(13) - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "veO" = ( /obj/machinery/light/small{ dir = 8 @@ -86156,6 +86527,17 @@ dir = 9 }, /obj/machinery/light/small, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "vmA" = ( @@ -86191,7 +86573,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "vmW" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/science/misc_lab) "vmX" = ( @@ -86224,7 +86606,7 @@ inlet_injector_autolink_id = "co2_in"; name = "Carbon Dioxide Supply Control"; outlet_vent_autolink_id = "co2_out"; - autolink_sensors = list("co2_sensor" = "Tank") + autolink_sensors = list("co2_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/structure/window/reinforced{ @@ -86380,9 +86762,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/command/bridge) -"vqX" = ( -/turf/simulated/wall/r_wall, -/area/station/public/mrchangs) "vrw" = ( /obj/structure/chair/stool{ dir = 4 @@ -86529,8 +86908,11 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/station/public/dorms) +"vum" = ( +/turf/simulated/wall/r_wall, +/area/station/engineering/transmission_laser) "vuo" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/station/engineering/tech_storage) "vuE" = ( @@ -86749,13 +87131,6 @@ icon_state = "green" }, /area/station/service/hydroponics) -"vAN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/fsmaint) "vAP" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -86842,7 +87217,7 @@ }, /area/station/security/permabrig) "vCt" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/aft) "vCB" = ( @@ -86919,7 +87294,7 @@ "vFm" = ( /obj/structure/closet/emcloset, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "vFz" = ( @@ -87911,7 +88286,7 @@ /obj/structure/table, /obj/item/storage/toolbox/electrical, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) "wgh" = ( @@ -87935,7 +88310,7 @@ icon_state = "1-2" }, /turf/simulated/floor/engine, -/area/station/science/xenobiology) +/area/station/maintenance/xenobio_south) "wgE" = ( /obj/structure/table/glass, /obj/item/paper_bin{ @@ -87970,7 +88345,7 @@ /area/station/maintenance/fore) "whg" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fore) "whu" = ( @@ -88121,6 +88496,11 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/engine, /area/station/engineering/control) "wlo" = ( @@ -88611,7 +88991,7 @@ dir = 5 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plasteel, /area/station/security/range) "wxR" = ( @@ -88661,6 +89041,16 @@ icon_state = "white" }, /area/station/science/xenobiology) +"wyk" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "wyB" = ( /obj/structure/extinguisher_cabinet{ name = "south bump"; @@ -88772,8 +89162,7 @@ /area/station/maintenance/fsmaint) "wAJ" = ( /obj/machinery/computer/prisoner{ - dir = 8; - req_access = list(2) + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -89023,7 +89412,7 @@ }, /area/station/security/brig) "wGv" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -89201,9 +89590,17 @@ /area/station/maintenance/aft) "wMy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/fore) +"wME" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/station/maintenance/fsmaint) "wMQ" = ( /obj/structure/chair{ dir = 1 @@ -89243,7 +89640,7 @@ name = "Science Chemistry"; dir = 1 }, -/obj/effect/mapping_helpers/airlock/windoor/access/all/science/research{ +/obj/effect/mapping_helpers/airlock/windoor/access/all/science/tox{ dir = 1 }, /turf/simulated/floor/plasteel, @@ -89279,6 +89676,10 @@ /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) +"wPQ" = ( +/obj/effect/mapping_helpers/turfs/rust/probably, +/turf/simulated/wall, +/area/station/maintenance/fsmaint) "wPS" = ( /obj/machinery/smartfridge/food/chef, /obj/machinery/door/window/classic/normal{ @@ -89347,7 +89748,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/station/science/toxins/mixing) +/area/station/maintenance/aft2) "wRh" = ( /obj/machinery/door/window/classic/reversed{ name = "Shooting Range"; @@ -90120,7 +90521,7 @@ dir = 8; level = 3; name = "Distribution and Waste Monitor"; - autolink_sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop") + autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -90308,7 +90709,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "xkQ" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "xkR" = ( @@ -90765,7 +91166,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/xenobio_south) "xtx" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/station/science/toxins/launch) "xtA" = ( @@ -90894,6 +91295,10 @@ icon_state = "whiteblue" }, /area/station/medical/paramedic) +"xwi" = ( +/obj/effect/turf_decal/caution/stand_clear, +/turf/simulated/floor/plasteel, +/area/station/engineering/transmission_laser) "xwJ" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -91628,7 +92033,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -91762,7 +92167,7 @@ /obj/machinery/computer/general_air_control{ dir = 4; name = "Tank Monitor"; - autolink_sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank") + autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") }, /turf/simulated/floor/plasteel{ dir = 9; @@ -91825,6 +92230,19 @@ icon_state = "yellow" }, /area/station/engineering/break_room) +"xPV" = ( +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/transmission_laser/east, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkgrey" + }, +/area/station/engineering/transmission_laser) "xPZ" = ( /obj/structure/chair, /obj/effect/turf_decal/tile/red, @@ -91908,7 +92326,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/east) "xSv" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/engimaint) "xTH" = ( @@ -92002,9 +92420,6 @@ "xWu" = ( /obj/effect/spawner/random/trash, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 8 - }, /obj/structure/disposalpipe/segment/corner{ dir = 4 }, @@ -92013,6 +92428,7 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) "xWI" = ( @@ -102833,11 +103249,11 @@ aaa aaa aaa aaa -laH -laH -laH -laH -laH +abf +abf +abf +abf +abf aaa aaa aaa @@ -103090,11 +103506,11 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa -laH +abf aaa aaa aaa @@ -103338,20 +103754,20 @@ aaa aaa aaa aaa -laH -laH -laH -laH -laH -laH +abf +abf +abf +abf +abf +abf aup -laH -laH -laH +abf +abf +abf aaa brn aaa -laH +abf aaa aaa aaa @@ -103442,9 +103858,9 @@ aaa aaa aaa cVm -laH -laH -laH +abf +abf +abf aaa aaa aaa @@ -103595,7 +104011,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -103608,7 +104024,7 @@ aaa aaa aiQ aaa -laH +abf aaa aaa aaa @@ -103852,7 +104268,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -103865,19 +104281,19 @@ agM abq hpJ abq -laH -laH -laH -laH -laH +abf +abf +abf +abf +abf aup -laH -laH +abf +abf aaa -laH -laH -laH -laH +abf +abf +abf +abf arA arA arA @@ -104109,7 +104525,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -104366,7 +104782,7 @@ aaa aaa aaa aaa -laH +abf aaa abq abq @@ -104487,22 +104903,22 @@ aaa aaa aaa aaa -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf aup -laH -laH +abf +abf iju aaa aaa @@ -104623,7 +105039,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -104744,7 +105160,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -104880,7 +105296,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -105001,7 +105417,7 @@ cRe aaa aaa aaa -laH +abf aaa abq aaa @@ -105137,7 +105553,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -105258,7 +105674,7 @@ aaa aaa aaa aaa -laH +abf aaa coR mHF @@ -105394,7 +105810,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -105515,7 +105931,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -105532,7 +105948,7 @@ aaa aaa abq abq -laH +abf aaa aaa aaa @@ -105651,7 +106067,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -105736,7 +106152,7 @@ anE cdT cEB lJq -anf +hGw bZP bZP tIb @@ -105772,7 +106188,7 @@ chS aaa aaa aaa -laH +abf aaa abq aaa @@ -105789,7 +106205,7 @@ abq abq abq abq -laH +abf aaa aaa aaa @@ -105908,7 +106324,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -106016,15 +106432,15 @@ aef abq abq abq -laH -laH -laH -laH -laH -laH -laH -laH -laH +abf +abf +abf +abf +abf +abf +abf +abf +abf cIl abq abq @@ -106165,7 +106581,7 @@ aaa aaa aaa aaa -laH +abf aaa abq abq @@ -106249,7 +106665,7 @@ bBz bWm cdT ckN -veE +pap bKy bZP cOA @@ -106303,7 +106719,7 @@ abq abq abq abq -laH +abf aaa aaa aaa @@ -106422,7 +106838,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -106560,7 +106976,7 @@ aaa aaa abq aaa -laH +abf aaa aaa aaa @@ -106679,7 +107095,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -106817,7 +107233,7 @@ abq abq abq aaa -laH +abf aaa aaa aaa @@ -106936,7 +107352,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -107074,7 +107490,7 @@ ctJ aaa abq aaa -laH +abf aaa aaa aaa @@ -107331,7 +107747,7 @@ abq abq abq abq -laH +abf aaa aaa aaa @@ -107845,7 +108261,7 @@ abq abq abq abq -laH +abf aaa aaa aaa @@ -108102,7 +108518,7 @@ cFj aaa abq aaa -laH +abf aaa aaa aaa @@ -108478,7 +108894,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -108735,7 +109151,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -109303,13 +109719,13 @@ aaa aaa aZt aZt -aZt +pqM bfo -nrY +pqM biD bku biD -nrY +pqM oRU brF btt @@ -109387,7 +109803,7 @@ abq abq abq abq -laH +abf aaa aaa aaa @@ -109506,7 +109922,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -109644,7 +110060,7 @@ aaa aaa abq aaa -laH +abf aaa aaa aaa @@ -109763,7 +110179,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -109901,7 +110317,7 @@ aaa aaa abq aaa -laH +abf aaa aaa aaa @@ -110020,7 +110436,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -110158,7 +110574,7 @@ aaa aaa abq aaa -laH +abf aaa aaa aaa @@ -110277,7 +110693,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -110415,7 +110831,7 @@ aaa aaa abq abq -laH +abf aaa aaa aaa @@ -110534,7 +110950,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -110791,7 +111207,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -111048,7 +111464,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -111305,7 +111721,7 @@ aaa aaa aaa aaa -laH +abf aaa abq aaa @@ -111344,7 +111760,7 @@ aMq aOB aOB aOB -aVl +aOB aPw aMW azN @@ -111556,13 +111972,13 @@ aaa aaa aaa aaa -laH -laH -laH -laH -laH -laH -laH +abf +abf +abf +abf +abf +abf +abf aaa abq aaa @@ -111601,7 +112017,7 @@ bgA bmi fuy rwj -aVl +aOB aLS aMZ aNm @@ -111813,7 +112229,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -111858,7 +112274,7 @@ atk adY fuy fuy -aVl +aOB aLQ aNY dxB @@ -112089,11 +112505,11 @@ rgu aJM pdc abW -laH -laH -laH -laH -laH +abf +abf +abf +abf +abf iMJ cQJ cQJ @@ -112115,11 +112531,11 @@ aEM aDz aYb aAP -aVl -aVl -aVl -aVl -aVl +aOB +aOB +aOB +aOB +aOB ufI uKy aUt @@ -112327,7 +112743,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -112347,7 +112763,7 @@ dpZ wRL jfk aaa -laH +abf aaa aaa aaa @@ -112584,7 +113000,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa dqt @@ -112604,7 +113020,7 @@ awA lmP gjF aaa -laH +abf aaa aaa aaa @@ -112841,7 +113257,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa hov @@ -113098,7 +113514,7 @@ aaa aaa aaa aaa -laH +abf abq abW abW @@ -113355,7 +113771,7 @@ aaa aaa aaa aaa -laH +abf aaa nui aYF @@ -113612,7 +114028,7 @@ aaa aaa aaa aaa -laH +abf aaa ieD thc @@ -113869,7 +114285,7 @@ aaa aaa aaa aaa -laH +abf abq abW fLK @@ -114126,7 +114542,7 @@ aaa aaa aaa aaa -laH +abf abq abW gmn @@ -114383,7 +114799,7 @@ aaa aaa aaa aaa -laH +abf aaa toO hdk @@ -114640,7 +115056,7 @@ aaa aaa aaa aaa -laH +abf aaa uMy lNt @@ -114897,7 +115313,7 @@ aaa aaa aaa aaa -laH +abf tpq abW abW @@ -115424,11 +115840,11 @@ kbN kbN kbN kbN -kbN -kbN -kbN -kbN -kbN +aky +aky +aky +aky +aky teN kkP owq @@ -116442,9 +116858,9 @@ aaa aaa aaa hxz -laH -laH -laH +mZb +mZb +mZb kbN kbN kbN @@ -116698,7 +117114,7 @@ aaa aaa aaa aaa -abq +aaa abq aaa aaa @@ -116763,9 +117179,9 @@ bhK bkN bpQ box -bqc -bqc -bqc +bje +bje +bje bqc byl bzW @@ -117015,14 +117431,14 @@ bbh bcM bel bfR -bhq -bhq +bht +bht bkO -bhq -bhq +bht +bht bht brS -bqc +bje bya bym thC @@ -117279,7 +117695,7 @@ bmF boy btP brT -bqc +bje byu bym bzX @@ -117536,7 +117952,7 @@ bpU boz bqe buB -bqc +bje bye bym xnp @@ -117793,7 +118209,7 @@ bje bje bht lJg -bqc +bje byv aLy bym @@ -121073,7 +121489,7 @@ aaa aaa aaa aaa -laH +abf aaa lZU rsQ @@ -121330,7 +121746,7 @@ aaa aaa aaa aaa -laH +abf aaa hnc xjC @@ -121587,7 +122003,7 @@ aaa aaa aaa aaa -laH +abf aaa apO aSm @@ -122101,7 +122517,7 @@ aaa aaa aaa aaa -laH +abf aaa apO eXK @@ -122210,13 +122626,13 @@ cJp cFY cFY mPh -cEK -cEK +cOp +cOp wQQ -cEK -cEK -cEK -cEK +cOp +cOp +cOp +cOp agK agK cOp @@ -122358,7 +122774,7 @@ aaa aaa aaa aaa -laH +abf aaa apO eXK @@ -122615,7 +123031,7 @@ aaa aaa aaa aaa -laH +abf aaa apO eXK @@ -122638,9 +123054,9 @@ iBR gZV fuv iBR -iBR -iBR -iBR +awp +awp +awp afy acR dKd @@ -122872,7 +123288,7 @@ aaa aaa aaa aaa -laH +abf aaa apO aSm @@ -122895,20 +123311,20 @@ uKi apM nOA vKs -esA +awp aAw awp -qeK -qeK -qeK -qeK +awp +awp +awp +awp fPT -qeK -apz -abZ -abZ -abZ -abZ +awp +awp +ajg +ajg +ajg +ajg aZU aNC aMm @@ -123129,7 +123545,7 @@ aaa aaa aaa aaa -laH +abf aaa apO aFe @@ -123152,7 +123568,7 @@ esA czl sdX pWM -esA +awp sfG bxN aGE @@ -123386,7 +123802,7 @@ aaa aaa aaa aaa -laH +abf aaa sRw tcD @@ -123409,7 +123825,7 @@ esA aUG sYR liS -esA +awp oqi lHw awu @@ -123643,7 +124059,7 @@ aaa aaa aaa aaa -laH +abf aaa sRw fJr @@ -123666,7 +124082,7 @@ esA uos wRh stW -esA +awp kfU bxN oIs @@ -123900,30 +124316,30 @@ aaa aaa aaa aaa -laH +arB abq apO nEV nEV exm nEV -nEV +awp xyP -apO -apO -apO -avc +awp +awp +awp +awp czz rsR fcT -avc -avc -avc +awp +awp +awp ook qEX gbg qwB -esA +awp avL aWv ajg @@ -124157,26 +124573,26 @@ aaa aaa aaa aaa +aup aaa aaa -laH nEV jXY jKG rOj -nEV +awp oQV ajg jiR agG -avc -avc -avc -avc -avc +awp +awp +awp +awp +awp gbi aWc -esA +awp eZF jQw qwB @@ -124414,14 +124830,14 @@ aaa aaa aaa aaa +abf aaa aaa -laH nEV ffH rUg fFo -nEV +awp alW akR aDY @@ -124433,7 +124849,7 @@ alW rOp aWx vqu -esA +awp qEX olt qwB @@ -124506,10 +124922,10 @@ rdd cmB vde eYA -cmo -cmo -cmo -cmo +cmB +cmB +cmB +cmB lsi rsb rXS @@ -124671,14 +125087,14 @@ aaa aaa aaa aaa +abf aaa aaa -laH -nEV nEV nEV nEV nEV +awp aDY wLB cnV @@ -124694,7 +125110,7 @@ ook wxO ivv myk -esA +awp cju uJL aWv @@ -124766,7 +125182,7 @@ wpn cte pfa ctb -cmo +cmB pQv oFn keQ @@ -124928,9 +125344,9 @@ aaa aaa aaa aaa -aaa -aaa -laH +arB +abq +abq abq abq abq @@ -124948,10 +125364,10 @@ aJl aWv ajg nsJ -esA -esA +awp +awp ook -esA +awp azH dHU ajg @@ -125011,11 +125427,11 @@ bfI qPB yhW bZt -bZu -bZu -bZu -bZu -jDK +cte +cte +cte +cte +lBw cAP ipj cvY @@ -125023,7 +125439,7 @@ jEA xTH ipj cFB -cmo +cmB giv eZG cmA @@ -125040,11 +125456,11 @@ cgG cgG cgG cgG -cgG +bdN fqp fqp -cEK -cEK +bdN +bdN nqG cOp crN @@ -125188,8 +125604,8 @@ aaa aaa aaa aaa +abf aaa -laH aaa aaa aaa @@ -125272,15 +125688,15 @@ chO cfA dCx ggQ -bZu -bZu +cte +cte ppH cvY lBw cte ppH gSO -cmo +cmB mVl afT dxD @@ -125297,7 +125713,7 @@ cUf xPE tCr qAH -cgG +bdN oPh jes das @@ -125445,8 +125861,8 @@ aaa aaa aaa aaa +abf aaa -laH aaa aaa aaa @@ -125530,14 +125946,14 @@ cfB cgO cbL rJn -bZu +cte cwG daw cte rbS mrv rnM -kvG +cmB kvG kvG kvG @@ -125554,7 +125970,7 @@ hiP qlX fRh nUa -cgG +bdN gqC cKG wvJ @@ -125702,7 +126118,6 @@ aaa aaa aaa aaa -aaa laH aaa aaa @@ -125713,6 +126128,7 @@ aaa aaa aaa aaa +aaa ajg ubH qRm @@ -125735,12 +126151,12 @@ wzV aSJ iNk aWv -avv -avv -avv -avv -avv -avv +ajg +ajg +ajg +ajg +ajg +ajg aQB aQC aTp @@ -125787,14 +126203,14 @@ bZv cgP eVE cip -bZu +cte ruo cvY cte vZh gHd cFB -kvG +cmB cwW cvH cKw @@ -125959,8 +126375,8 @@ aaa aaa aaa aaa +abf aaa -laH aaa aaa aaa @@ -126044,14 +126460,14 @@ cfC hvL cbL kCk -bZu +cte cAu daw cte wfE rAm wpL -kvG +cmB kTH oha gDC @@ -126068,22 +126484,22 @@ uHQ cha lfu tRD -cgG +bdN vwU fqn vfd cPc -bXG +bdN bXG luM -bXG -bXG -bXG -rOZ -rOZ -rOZ +cOp +cOp +cOp +cOp +cOp +cOp sGE -rOZ +cOp rOZ xtx rOZ @@ -126216,8 +126632,8 @@ aaa aaa aaa aaa +abf aaa -laH aaa aaa aaa @@ -126230,13 +126646,13 @@ aaa ahH khy fpy -aoh -aoh -aoh -aKB -aKB -aKB -aKB +ajg +ajg +ajg +ajg +ajg +ajg +ajg tYX alW alA @@ -126301,14 +126717,14 @@ cYQ voi ciC bZu -bZu +cte bkp cnF lBw cte dcX cte -kvG +cmB cNk nFh aZr @@ -126325,12 +126741,12 @@ cNu cLB lfu cha -cgG +bdN fWB gqC tWK nCh -bXG +bdN vhl yeU dCm @@ -126473,8 +126889,8 @@ aaa aaa aaa aaa +abf aaa -laH aaa aaa aaa @@ -126487,13 +126903,13 @@ aaa ahH fpy aQM -aoh +ajg aIq aTB aKB aMC adc -aKB +ajg pqg alW akR @@ -126554,10 +126970,10 @@ xLA tfH cdb amV -bZv -bZu -bZu -bZu +cte +cte +cte +cte cte oyD cvY @@ -126565,7 +126981,7 @@ pvb syo wPp wlW -kvG +cmB cvJ mWH wsN @@ -126582,12 +126998,12 @@ cux xrm kNi qnY -qmD +bdN iWB jBw fGH das -bXG +bdN hwV yed xrA @@ -126730,8 +127146,8 @@ aaa aaa aaa aaa +abf aaa -laH aaa aaa aaa @@ -126744,21 +127160,21 @@ aaa ajg aJl khy -aoh +ajg gDi dox aKB rPt aFT -aKB +ajg azH alW uZt -aiY +ajg aGL ajk aTD -aiY +ajg mGT ams uoK @@ -126811,7 +127227,7 @@ cbd ces chm mNu -bZv +cte dZI dZI vpo @@ -126822,7 +127238,7 @@ uhJ pwj sBZ hty -kvG +cmB cGF lCW cCV @@ -126839,12 +127255,12 @@ cKu cnK ruj cnK -qmD +bdN fVX gqC tIg aAO -bXG +bdN gGe keu mEW @@ -126987,8 +127403,8 @@ aaa aaa aaa aaa -aaa -laH +abf +abq abq abq abq @@ -127001,21 +127417,21 @@ abq ajg khy khy -aoh +ajg aex aIs aKB riN aMx -aKB +ajg axS fpy amM -aiY +ajg aGJ akk hWk -aiY +ajg vrw vnj vSV @@ -127068,7 +127484,7 @@ cbt bYA chm pyC -bZv +cte kpl fru sbZ @@ -127079,7 +127495,7 @@ cwG syo aFL umT -kvG +cmB cgY cDK cCV @@ -127096,12 +127512,12 @@ eAx cnK dru cnK -qmD +bdN gWE gWE rPx cPc -bXG +bdN rxB ubf jwi @@ -127247,7 +127663,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -127258,21 +127674,21 @@ aaa aVY ksa khy -aoh +ajg aBu aIt aKB nwU aMA -aKB +ajg pqg akg aDY -aiY +ajg kEh dLF azL -aiY +ajg nYu tRT ghT @@ -127325,7 +127741,7 @@ cbd ces chm qZv -bZv +cte fYb fDE gMo @@ -127336,7 +127752,7 @@ wrO cte ufm lBw -kvG +cmB cwH cxa doV @@ -127353,12 +127769,12 @@ cnK jPj kqi oUs -qmD +bdN bZy fCO fSa gqt -bXG +bdN yap jSe ddG @@ -127504,7 +127920,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -127515,21 +127931,21 @@ aaa ajg ajg cZz -aoh +ajg cZo hdo aKB cYd jbe -aKB +ajg qWM ajg aWv -aiY +ajg wuH aEk aQv -aiY +ajg ajg ajg ajg @@ -127581,8 +127997,8 @@ bYA cbt bYA rXk -bZv -bZv +cte +cte cte vjR hYj @@ -127593,8 +128009,8 @@ cte cte gSO kcG -kvG -tjd +cmB +cmB riX riX fId @@ -127604,18 +128020,18 @@ fId mfG cwR tUS -qmD -qmD -qmD -qmD -qmD -qmD -qmD +bdN +bdN +bdN +bdN +bdN +bdN +bdN cKG ggT kgB uDH -bXG +bdN lVI dRT wyC @@ -127761,7 +128177,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -127838,7 +128254,7 @@ cdD cbd ces cjZ -bZv +cte igJ cwG cwG @@ -127851,7 +128267,7 @@ gnS cFB peg ipj -tjd +cmB qub cyR cyP @@ -127872,7 +128288,7 @@ cFe fGH qEh eZr -bXG +bdN wci dRT ekg @@ -128018,7 +128434,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -128108,7 +128524,7 @@ iKH qig cZY dct -tjd +cmB cbf cyS cBS @@ -128129,13 +128545,13 @@ hjx rPx cPc gWE -bXG -bXG -bXG -bXG -bXG -bXG -rOZ +bdN +bdN +bdN +bdN +bdN +bdN +bdN eAC dWQ eDX @@ -128275,7 +128691,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -128324,7 +128740,7 @@ bPb aIo aLl edZ -gbM +wPQ aLl bnk gcq @@ -128352,7 +128768,7 @@ cgT oTq imQ lIR -bZv +cte cwG cAP cte @@ -128365,7 +128781,7 @@ cte cte cte cte -tjd +cmB hdR xcw cyP @@ -128392,7 +128808,7 @@ nBW cPc rRg das -rOZ +bdN ljg fuC lIC @@ -128578,7 +128994,7 @@ aLl aIo avA xNa -gbM +wPQ aaa aaa aaa @@ -128609,7 +129025,7 @@ bYA cbt bYA cll -bZv +cte cwG cwG xkc @@ -128622,13 +129038,13 @@ cte ipj gqi ima -tjd -tjd -tjd -fId -fId -fId -fId +cmB +cmB +cmB +cmB +cmB +cmB +cmB cfw iBI cfw @@ -128649,7 +129065,7 @@ lPx gpR kXT fHu -rOZ +bdN xtx rOZ rOZ @@ -128830,7 +129246,7 @@ aBI aBI hRH aBI -aBI +aLl aLl vmT alb @@ -128866,7 +129282,7 @@ qXW bpj upe fza -bZv +cte oNA cwG cwG @@ -129087,7 +129503,7 @@ pxM aBI aTF sVD -aBI +aLl cZi smw nET @@ -129123,8 +129539,8 @@ bZv bZv bZv caS -bZv -bZv +cte +cte clC iFx cte @@ -129344,7 +129760,7 @@ aKX bNY aPz aQd -aBI +aLl hFY fvU dAH @@ -129381,7 +129797,7 @@ bZv oFN cdk ceP -bZv +cte bkp ubu cte @@ -129403,12 +129819,12 @@ cmB cmz cWK cmz -mMv -mMv -mMv -mMv -mMv -mMv +bdN +bdN +bdN +bdN +bdN +bdN fFi jSa cTk @@ -129443,7 +129859,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -129590,7 +130006,7 @@ awo avr edg avr -vqX +aBZ aLl aJK aLl @@ -129601,7 +130017,7 @@ mfp utu ebZ aQd -aBI +aLl jln baD aIo @@ -129638,7 +130054,7 @@ bZv mVn ktD gwd -bZv +cte cwG xmO eUU @@ -129665,8 +130081,8 @@ cHq uzR dlD ycw -mMv -mMv +bdN +bdN dSF kqz ifD @@ -129700,7 +130116,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -129817,7 +130233,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -129847,7 +130263,7 @@ eLz oPi efq aOZ -vqX +aBZ fAs aLi dAH @@ -129857,8 +130273,8 @@ wCm aSc axM ktZ -aBI -aXu +aLl +aIo dAH xNa aLl @@ -129883,10 +130299,10 @@ bTd bJO bQI vPk -bQI +aoG eRh -bQI -bQI +aoG +aoG bVA wGR wgT @@ -129895,7 +130311,7 @@ bZv oTB sYJ cex -bZv +cte hvr uZG cwG @@ -129923,7 +130339,7 @@ eIa lar lar ydI -mMv +bdN yaL cPc cPc @@ -129957,7 +130373,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -130074,7 +130490,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -130082,7 +130498,7 @@ aaa ahH agi agG -afb +ajg aio ajp akn @@ -130104,17 +130520,17 @@ aMs jiW oNZ aIc -vqX +aBZ avA aLk cxr aLl -bNY -aBI -aBI -aBI -bNY -aBI +ayv +aLl +aLl +aLl +ayv +aLl apL isf eiI @@ -130138,12 +130554,12 @@ aoG aoG aoG aoG -bQI -bQI -bQI +aoG +aoG +aoG aNR bEG -bZv +aoG bVB mNF nac @@ -130152,7 +130568,7 @@ bZv pHM ces bNK -bZv +aoG aoG pWa oXK @@ -130180,7 +130596,7 @@ uzR bnB uzR cGs -mMv +bdN lEN oUf ifq @@ -130214,7 +130630,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -130331,7 +130747,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -130339,7 +130755,7 @@ aaa ahH agi aDY -afb +ajg ajb ajp ako @@ -130358,10 +130774,10 @@ nrj aPH hCg aAC -vqX -vqX -vqX -scT +aBZ +aBZ +aBZ +cbc rXf aLj xeC @@ -130400,16 +130816,16 @@ oXK bPg dnm bTP -mVF +oXK bnc bXq -bZv -bZv -mVF -bZv -dgn -bZv -mVZ +aoG +aoG +oXK +aoG +uQK +aoG +dcx bSU eUt coQ @@ -130437,7 +130853,7 @@ uzR qyw uzR cEN -mMv +bdN mNJ ljk cJk @@ -130471,7 +130887,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -130596,7 +131012,7 @@ aaa ahH lRK aWv -oWE +awp aeN aeN aeN @@ -130607,7 +131023,7 @@ alh aeN aeN aeN -oWE +aBZ aBZ aBZ aBZ @@ -130694,7 +131110,7 @@ oHb eAL myv xEr -mMv +bdN xLY gft wnx @@ -130728,7 +131144,7 @@ abq abq aaa abq -laH +abf aaa aaa aaa @@ -130845,7 +131261,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -130853,7 +131269,7 @@ aaa ahH ajD azu -oWE +awp air air air @@ -130864,7 +131280,7 @@ air air air air -oWE +aBZ aDe gtW ath @@ -130985,7 +131401,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -131102,7 +131518,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -131110,7 +131526,7 @@ aaa ahH tUt alW -oWE +awp air air air @@ -131121,7 +131537,7 @@ air air air air -oWE +aBZ iAS cxr skd @@ -131242,7 +131658,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -131359,7 +131775,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -131367,7 +131783,7 @@ aaa ahH lRK ajg -oWE +awp air air air @@ -131378,7 +131794,7 @@ air air air air -oWE +aBZ iAS oyN gWz @@ -131499,7 +131915,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -131616,7 +132032,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -131624,7 +132040,7 @@ aaa ahH oTt jNv -oWE +awp air air air @@ -131635,7 +132051,7 @@ air air air air -oWE +aBZ aLl aIo ayk @@ -131756,7 +132172,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -131873,7 +132289,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -131881,7 +132297,7 @@ aaa ahH agi aDY -oWE +awp air air air @@ -131892,7 +132308,7 @@ air air air air -oWE +aBZ avy bVY cxr @@ -132013,7 +132429,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -132130,7 +132546,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -132138,18 +132554,18 @@ aaa aVY dxh aWv -oWE -oWE -oWE -oWE +awp +awp +awp +awp alh aeN aeN alh -oWE -oWE -oWE -oWE +aBZ +aBZ +aBZ +aBZ avD rbR plD @@ -132270,7 +132686,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -132387,7 +132803,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -132398,12 +132814,12 @@ gNO lKn bUA lLH -oWE +awp alj ami ani aqS -oWE +aBZ axb guZ aLl @@ -132504,7 +132920,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -132527,7 +132943,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -132644,7 +133060,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -132761,30 +133177,30 @@ aaa aaa aaa aaa -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf aaa aaa aaa @@ -132901,7 +133317,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -132912,12 +133328,12 @@ loo qNN sxV nmd -oWE +awp oWE bDN bDN oWE -oWE +aBZ pep wTo lEo @@ -133158,7 +133574,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -133431,7 +133847,7 @@ abq abq abq abq -gbM +wPQ aLl atU aIo @@ -133946,7 +134362,7 @@ aaa aaa aaa aaa -gbM +wPQ rIq dhW iqp @@ -134209,7 +134625,7 @@ aud paT aLl aIo -azs +aJK aBZ aEy aEz @@ -134540,8 +134956,8 @@ abq abq abq abq -laH -laH +abf +abf abq rPS fvN @@ -134553,8 +134969,8 @@ uQm fvN rPS abq -laH -laH +abf +abf aaa aaa aaa @@ -134797,7 +135213,7 @@ abq aaa aaa aaa -laH +abf aaa aaa uQm @@ -134811,7 +135227,7 @@ cEn uQm aaa aaa -laH +abf aaa aaa aaa @@ -134978,7 +135394,7 @@ aGt nHi avR avF -aBZ +amk ayQ azn amk @@ -135054,7 +135470,7 @@ iju aaa aaa aaa -laH +abf aaa aaa fvN @@ -135068,7 +135484,7 @@ kjo fvN aaa aaa -laH +abf aaa aaa aaa @@ -135311,7 +135727,7 @@ abq aaa aaa aaa -laH +abf aaa aaa fvN @@ -135325,7 +135741,7 @@ kjo fvN aaa aaa -laH +abf aaa aaa aaa @@ -135564,8 +135980,8 @@ abq abq abq abq -laH -laH +abf +abf abq abq abq @@ -135585,8 +136001,8 @@ abq abq abq abq -laH -laH +abf +abf aaa aaa aaa @@ -135821,7 +136237,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -135843,7 +136259,7 @@ uQm aaa aaa aaa -laH +abf aaa aaa aaa @@ -135981,14 +136397,14 @@ aaa aaa aaa aaa -laH -laH -laH -laH -laH -laH -laH -laH +abf +abf +abf +abf +abf +abf +abf +abf abq abq abq @@ -136078,7 +136494,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -136100,7 +136516,7 @@ hXd aaa aaa aaa -laH +abf aaa aaa aaa @@ -136238,7 +136654,7 @@ aaD aaa aaa aaa -laH +abf aaa aaa aaa @@ -136335,7 +136751,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -136357,7 +136773,7 @@ hXd aaa aaa aaa -laH +abf aaa aaa aaa @@ -136492,10 +136908,10 @@ aaa aaa aaa aaa -laH -laH -laH -laH +abf +abf +abf +abf aaa aaa aaa @@ -136522,8 +136938,8 @@ aaa aaa edZ dsq -wJQ -avA +qAl +iRA iLI aDi gHz @@ -136596,7 +137012,7 @@ abq abq abq fsj -eUC +uQm mDq kEg mDq @@ -136610,7 +137026,7 @@ mkR mDq uZl mDq -evr +uQm kTP abq abq @@ -136749,7 +137165,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa abq @@ -136780,7 +137196,7 @@ gDl gDl azr avg -dAH +sln aBZ qto bsw @@ -137006,7 +137422,7 @@ aaa aaa aaa aaa -laH +abf abq abq cya @@ -137036,7 +137452,7 @@ auj arT gDl heC -avA +qYk avA aBZ iJz @@ -137104,7 +137520,7 @@ abq abq aaa aaa -laH +abf aef aef nxT @@ -137130,7 +137546,7 @@ unF unF aef aef -laH +abf aaa aaa aaa @@ -137263,7 +137679,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa abq @@ -137361,7 +137777,7 @@ aaa abq aaa aaa -laH +abf aaa aaa quL @@ -137387,7 +137803,7 @@ pes adk aaa aaa -laH +abf aaa aaa aaa @@ -137520,7 +137936,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa abq @@ -137624,7 +138040,7 @@ aaa quL cxU eUC -uQm +eUC ibI cBb cEd @@ -137638,7 +138054,7 @@ cji sNa cBb ibI -uQm +evr evr uLb adk @@ -137777,10 +138193,10 @@ aaa aaa aaa aaa -laH -laH -laH -laH +abf +abf +abf +abf aaa aaa cCP @@ -137875,7 +138291,7 @@ aaa abq aaa aaa -laH +abf aaa aaa nxT @@ -137901,7 +138317,7 @@ uLb unF aaa aaa -laH +abf aaa aaa aaa @@ -138037,7 +138453,7 @@ aaa aaa aaa aaa -laH +abf abq abq dch @@ -138061,7 +138477,7 @@ aef aef aef aef -bOn +dxJ kmb blA vmv @@ -138132,7 +138548,7 @@ cqW qbf qbf aaa -laH +abf aef aef quL @@ -138158,7 +138574,7 @@ uLb adk aef aef -laH +abf aaa aaa aaa @@ -138294,7 +138710,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa cke @@ -138313,16 +138729,16 @@ aaa aef aaa aaa -aaa -aaa -aaa -aef -aaa -aaa -ksb -vnQ -vAN -ksb +vum +vum +vum +vum +vum +pWg +loa +avA +qYk +lKS aaa aaa aef @@ -138389,7 +138805,7 @@ cqU cqU cqW aaa -laH +abf aaa aaa nxT @@ -138415,7 +138831,7 @@ uLb unF aaa aaa -laH +abf aaa aaa aaa @@ -138551,7 +138967,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa age @@ -138570,16 +138986,16 @@ aaa aef aaa aaa -aaa -aaa -aaa -aef -aaa -aaa -aLl -gbM -avA -uJn +rla +rAu +nZV +uJG +nOH +uoX +rag +uZx +ubU +aBZ abq abq abq @@ -138808,7 +139224,7 @@ aaa aaa aaa aaa -laH +abf abq abq abq @@ -138827,15 +139243,15 @@ abq aef aaa aaa -aaa -aaa -aaa -aef -aef -aef -aef -aLl -xQV +vum +jHX +mDU +oVV +xPV +rPn +toc +avA +avA aBZ aaa aaa @@ -138897,13 +139313,13 @@ xOC aWC cmQ coc -cps +cpq cqV cqU cqU bCM aaa -laH +abf aaa aaa quL @@ -138929,7 +139345,7 @@ fZU adk aaa aaa -laH +abf aaa aaa aaa @@ -139065,7 +139481,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa ago @@ -139084,16 +139500,16 @@ aaa aef aaa aaa -aaa -aaa -aaa -eKV -aaa -aaa -aef -aLl -avA -ksb +vum +lZY +fRA +uxg +sts +eaC +nuP +vnQ +wME +lKS aaa aaa aaa @@ -139160,7 +139576,7 @@ qbf cqW cpt aaa -laH +abf aef aef nxT @@ -139186,7 +139602,7 @@ unF unF aef aef -laH +abf aaa aaa aaa @@ -139322,7 +139738,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa cCP @@ -139341,16 +139757,16 @@ aaa aef aaa aaa -aaa -aaa -aaa -aef -aaa -aaa -aef -aef -aef -aBZ +vum +dEx +uvz +rzV +owM +wyk +aLl +wPQ +avA +uJn aaa aaa aaa @@ -139579,7 +139995,7 @@ aaa aaa aaa aaa -laH +abf abq abq dch @@ -139598,16 +140014,16 @@ abq ajo aaa aaa -aaa -aaa -aaa -ajo -abq -abq -cSy -abq -aef -abq +vum +kgN +kgN +xwi +kgN +kgN +bre +aLl +xQV +aBZ abq aaa abq @@ -139676,7 +140092,7 @@ aaa aaa aaa abq -laH +abf aaa quL cxU @@ -139698,7 +140114,7 @@ evr uLb adk aaa -laH +abf abq aaa aaa @@ -139852,19 +140268,19 @@ cke cke aaa aaa -laH -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abf aaa aaa +vum +vum +dMB +uHr +uOd +vum +bre +aLl +avA +lKS mZb bre bre @@ -139933,7 +140349,7 @@ aaa aaa aaa aaa -laH +abf abq nxT cxU @@ -139955,7 +140371,7 @@ evr uLb unF abq -laH +abf aaa aaa aaa @@ -140093,7 +140509,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa age @@ -140109,11 +140525,7 @@ age age aaa aaa -laH -aaa -aaa -aaa -aaa +abf aaa aaa aaa @@ -140122,6 +140534,10 @@ aaa aaa aaa aaa +bre +aef +aef +aBZ mZb mZb bre @@ -140350,7 +140766,7 @@ aaa aaa aaa aaa -laH +abf abq abq abq @@ -140366,11 +140782,7 @@ abq abq abq abq -laH -aaa -aaa -aaa -aaa +abf aaa aaa aaa @@ -140379,6 +140791,10 @@ aaa aaa aaa aaa +cSy +abq +aef +abq aaa mZb mZb @@ -140455,13 +140871,13 @@ aEl hEj ltH eUC -uQm +eUC wZa uFN wXA mnt xnj -uQm +evr evr mPr oZw @@ -140607,7 +141023,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -140623,7 +141039,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -140712,13 +141128,13 @@ ngG ngG igv xQR -uQm +eUC bdp reP uDq wXA qcu -uQm +evr uHv uLb nkt @@ -140864,23 +141280,23 @@ aaa aaa aaa aaa -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH +abf +abf +abf +abf +abf +abf +abf +abf +abf +abf aup -laH -laH -laH +abf +abf +abf abq -laH -laH +abf +abf aaa aaa aaa @@ -140969,7 +141385,7 @@ qiA aEl oBT jWt -mIC +gsW mIC xsj vCK @@ -141226,13 +141642,13 @@ nxT nxT jSg nxT -uQm +eUC mdi mdi oJs mdi dSg -uQm +evr unF heq unF @@ -141483,13 +141899,13 @@ nxT oOg umh dfi -uQm +eUC qIh mdi oJs mdi dSg -uQm +evr xts qww sCX @@ -141740,13 +142156,13 @@ nxT hbc dMK lzW -uQm +eUC eqj mdi heJ mdi gSU -uQm +evr noE iqC kUz @@ -141997,13 +142413,13 @@ sJE nxT quL quL -uQm +eUC lKc mdi niQ mdi mdi -uQm +evr adk adk unF @@ -143796,13 +144212,13 @@ aaa aaa aaa aaa -laH +abf abq aaa abq aaa abq -laH +abf aaa aaa aaa @@ -145783,7 +146199,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aUU @@ -145823,7 +146239,7 @@ wri aQF aaa aaa -laH +abf aaa aaa aaa @@ -146040,7 +146456,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aUU @@ -146080,7 +146496,7 @@ wri aQF aaa aaa -laH +abf aaa aaa aaa @@ -146554,7 +146970,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aUU @@ -146594,7 +147010,7 @@ wri aQF aaa aaa -laH +abf aaa aaa aaa @@ -146811,7 +147227,7 @@ aaa aaa aaa aaa -laH +abf bwM aXH aXN @@ -146851,7 +147267,7 @@ wri tFm aXH aaa -laH +abf aaa aaa aaa @@ -147068,7 +147484,7 @@ aaa aaa aaa aaa -laH +abf aUU hIG bbX @@ -147108,7 +147524,7 @@ rKu bbX cer aQF -laH +abf aaa aaa aaa @@ -147325,7 +147741,7 @@ aaa aaa aaa aaa -laH +abf aUU cLL bbW @@ -147365,7 +147781,7 @@ fES cUI bzh aQF -laH +abf aaa aaa aaa @@ -147582,7 +147998,7 @@ aaa aaa aaa aaa -laH +abf aXL bsG bbY @@ -147622,7 +148038,7 @@ cQc bbY cWj aXL -laH +abf aaa aaa aaa @@ -147839,7 +148255,7 @@ aaa aaa aaa aaa -laH +abf aUU cLL pkq @@ -147879,7 +148295,7 @@ ijt kXs bzh aQF -laH +abf aaa aaa aaa @@ -148096,7 +148512,7 @@ aaa aaa aaa aaa -laH +abf aUU btg bbZ @@ -148136,7 +148552,7 @@ cLL bbZ bNX aQF -laH +abf aaa aaa aaa @@ -148353,7 +148769,7 @@ aaa aaa aaa aaa -laH +abf bwM aXO bgU @@ -148393,7 +148809,7 @@ bMr xOC aXO aaa -laH +abf aaa aaa aaa @@ -148610,7 +149026,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aUU @@ -148650,7 +149066,7 @@ bMr aQF aaa aaa -laH +abf aaa aaa aaa @@ -148907,7 +149323,7 @@ bMr aQF aaa aaa -laH +abf aaa aaa aaa @@ -149124,7 +149540,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aUU @@ -149164,7 +149580,7 @@ bMr aQF aaa aaa -laH +abf aaa aaa aaa @@ -149381,7 +149797,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aUU @@ -149421,7 +149837,7 @@ bMr aQF aaa aaa -laH +abf aaa aaa aaa @@ -149895,7 +150311,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -149935,7 +150351,7 @@ aWC aaa aaa aaa -laH +abf aaa aaa aaa @@ -150152,7 +150568,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -150192,7 +150608,7 @@ abq aaa aaa aaa -laH +abf aaa aaa aaa @@ -150409,7 +150825,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -150449,7 +150865,7 @@ abq aaa aaa aaa -laH +abf aaa aaa aaa @@ -150666,7 +151082,7 @@ aaa aaa aaa aaa -laH +abf aaa aaa aaa @@ -150706,7 +151122,7 @@ abq aaa aaa aaa -laH +abf aaa aaa aaa @@ -151182,43 +151598,43 @@ aaa aaa aaa aaa -laH -laH +abf +abf cKI -laH -laH -laH -laH +abf +abf +abf +abf cKI -laH -laH -laH -laH -laH -laH +abf +abf +abf +abf +abf +abf cKI -laH +abf abq aup -laH -laH -laH -laH -laH -laH -laH +abf +abf +abf +abf +abf +abf +abf cKI -laH -laH -laH -laH -laH +abf +abf +abf +abf +abf aup -laH -laH +abf +abf cKI -laH -laH +abf +abf aaa aaa aaa diff --git a/_maps/map_files220/RandomRuins/LavaRuins/ash_old.dmm b/_maps/map_files220/RandomRuins/LavaRuins/ash_old.dmm index ef76da2d8f33f..92d7ecb0b3ddc 100644 --- a/_maps/map_files220/RandomRuins/LavaRuins/ash_old.dmm +++ b/_maps/map_files220/RandomRuins/LavaRuins/ash_old.dmm @@ -73,7 +73,7 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/circuitboard/prisoner, /obj/item/circuitboard/chem_master{ pixel_y = -5; @@ -156,7 +156,7 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/seeds/aloe, /obj/item/seeds/potato{ pixel_x = 5 @@ -366,7 +366,7 @@ }, /obj/item/mod/module/visor/night, /obj/effect/mapping_helpers/no_lava, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/stack/sheet/mineral/diamond{ amount = 4; pixel_x = 4 diff --git a/_maps/map_files220/RandomRuins/LavaRuins/cheesus_temple.dmm b/_maps/map_files220/RandomRuins/LavaRuins/cheesus_temple.dmm index 9af0deff413c4..61112690678b0 100644 --- a/_maps/map_files220/RandomRuins/LavaRuins/cheesus_temple.dmm +++ b/_maps/map_files220/RandomRuins/LavaRuins/cheesus_temple.dmm @@ -50,8 +50,8 @@ /obj/effect/turf_decal/siding/yellow/corner{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/maybe, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "dC" = ( @@ -73,7 +73,7 @@ /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "eW" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/turf_decal/siding/yellow/corner, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) @@ -82,7 +82,7 @@ /area/lavaland/surface/outdoors) "fk" = ( /obj/structure/table/wood, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "fK" = ( @@ -110,12 +110,12 @@ /obj/item/storage/box/mousetraps{ pixel_x = -9 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "hZ" = ( /mob/living/simple_animal/mouse, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "js" = ( @@ -127,7 +127,7 @@ /obj/item/storage/toolbox/mechanical/old{ pixel_x = 4 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/reagent_containers/condiment/enzyme{ pixel_x = -11; pixel_y = 9 @@ -165,7 +165,7 @@ pixel_y = 9; pixel_x = 7 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/reagent_containers/condiment/enzyme{ pixel_y = 5; pixel_x = 9 @@ -200,7 +200,7 @@ dir = 5 }, /obj/effect/spawner/random/trash, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "pQ" = ( @@ -208,7 +208,7 @@ /area/lavaland/surface/outdoors) "qq" = ( /obj/effect/turf_decal/siding/yellow, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "qw" = ( @@ -219,7 +219,7 @@ dir = 1 }, /mob/living/simple_animal/mouse, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "qQ" = ( @@ -233,7 +233,7 @@ /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "rW" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "tw" = ( @@ -244,28 +244,28 @@ /area/ruin/powered/cheesus) "tQ" = ( /obj/effect/turf_decal/siding/yellow/corner, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "vk" = ( /obj/effect/turf_decal/siding/yellow{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "wp" = ( /obj/structure/chair/comfy/yellow{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "wr" = ( /obj/effect/turf_decal/siding/yellow/corner{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "xk" = ( @@ -282,13 +282,13 @@ /obj/effect/turf_decal/siding/yellow/corner{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "yi" = ( /obj/machinery/light/directional/north, -/obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/maybe, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "yM" = ( @@ -321,7 +321,7 @@ /obj/item/kirbyplants{ pixel_y = 13 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "Cn" = ( @@ -339,8 +339,8 @@ /turf/simulated/floor/grass/no_creep, /area/ruin/powered/cheesus) "DW" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/maybe, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "Eo" = ( @@ -348,7 +348,7 @@ /area/ruin/powered/cheesus) "Ex" = ( /obj/structure/table/wood/fancy/orange, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "EE" = ( @@ -361,19 +361,19 @@ /area/ruin/powered/cheesus) "Ga" = ( /mob/living/simple_animal/mouse, -/obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/maybe, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "Gz" = ( /obj/effect/turf_decal/siding/yellow/corner, -/obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/maybe, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "Hh" = ( /obj/structure/table/wood, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/food/vulpix/cheese{ pixel_y = 6; pixel_x = -9 @@ -390,14 +390,14 @@ /area/ruin/powered/cheesus) "HV" = ( /obj/machinery/light/small/directional/west, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "Ka" = ( /turf/template_noop, /area/template_noop) "Km" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak/lavaland_air, /area/lavaland/surface/outdoors) "Md" = ( @@ -405,14 +405,14 @@ dir = 5 }, /mob/living/simple_animal/mouse, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "Nc" = ( /obj/effect/turf_decal/siding/yellow{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "NG" = ( @@ -429,7 +429,7 @@ /obj/effect/turf_decal/siding/yellow{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "OS" = ( @@ -444,19 +444,19 @@ /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "Ud" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "Uu" = ( /obj/effect/turf_decal/siding/yellow{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "UX" = ( /obj/effect/turf_decal/siding/yellow, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "Vn" = ( @@ -471,7 +471,7 @@ /obj/structure/chair/comfy/yellow{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) "XT" = ( @@ -496,7 +496,7 @@ /obj/effect/turf_decal/siding/yellow{ dir = 5 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/food/sliceable/cheesewheel, /turf/simulated/floor/wood/fancy/oak, /area/ruin/powered/cheesus) diff --git a/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm b/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm index 605e28281d1fe..a698a398fc6a1 100644 --- a/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm +++ b/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm @@ -16,7 +16,7 @@ }, /area/ruin/powered/scpfacility) "bf" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/door/airlock/highsecurity, /turf/simulated/floor/plating/lavaland_air, /area/ruin/powered/scpfacility) @@ -106,7 +106,7 @@ /area/ruin/powered/scpfacility) "fH" = ( /obj/structure/girder/reinforced, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/ruin/powered/scpfacility) "fN" = ( @@ -393,7 +393,7 @@ /area/ruin/powered/scpfacility) "sy" = ( /obj/structure/barricade/security, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/ruin/powered/scpfacility) "sT" = ( @@ -659,7 +659,7 @@ "DH" = ( /obj/structure/girder/reinforced, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/ruin/powered/scpfacility) "DJ" = ( @@ -839,7 +839,7 @@ }, /area/ruin/powered/scpfacility) "Ir" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/ruin/powered/scpfacility) "Jj" = ( @@ -1050,7 +1050,7 @@ /area/ruin/powered/scpfacility) "SG" = ( /obj/structure/girder/displaced, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/ruin/powered/scpfacility) "SU" = ( @@ -1220,7 +1220,7 @@ /obj/effect/decal/cleanable/blood/writing{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/ruin/powered/scpfacility) "ZE" = ( diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm index 5c35b388280ac..555b9cb5cfe91 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm @@ -11,7 +11,7 @@ pixel_x = -27; name = "intercom" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, @@ -22,7 +22,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/unpowered/unpowered_structures) "bf" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/shuttle/engine/router, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) @@ -70,7 +70,7 @@ }, /area/ruin/space/unpowered/unpowered_structures) "cG" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, @@ -133,7 +133,7 @@ }, /area/ruin/space/unpowered/unpowered_structures) "eh" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) @@ -145,7 +145,7 @@ /area/ruin/space/unpowered/unpowered_structures) "eJ" = ( /obj/machinery/light_construct/directional/west, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, @@ -170,7 +170,7 @@ }, /area/ruin/space/unpowered/unpowered_structures) "gK" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/closet/crate/secure/weapon, /obj/item/clothing/accessory/storage, /obj/item/clothing/accessory/holster, @@ -213,7 +213,7 @@ pixel_y = -10; pixel_x = 16 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) @@ -390,7 +390,7 @@ /turf/simulated/wall/mineral/plastitanium/interior, /area/ruin/space/unpowered/unpowered_structures) "st" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, @@ -400,7 +400,7 @@ /obj/item/lighter{ pixel_x = 8 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) @@ -415,7 +415,7 @@ }, /area/ruin/space/unpowered/unpowered_structures) "tW" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/closet/crate/secure/weapon{ req_access = list(3) }, @@ -460,7 +460,7 @@ /area/ruin/space/unpowered/unpowered_structures) "vy" = ( /obj/structure/closet/walllocker/emerglocker/west, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/blood/gibs, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" @@ -514,7 +514,7 @@ /area/ruin/space/unpowered/unpowered_structures) "wm" = ( /obj/machinery/door/airlock/command, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, @@ -552,14 +552,14 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered) "yr" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, /area/ruin/space/unpowered/unpowered_structures) "yN" = ( -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /obj/item/circuitboard/pacman, /obj/item/stack/cable_coil{ amount = 5 @@ -688,7 +688,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/unpowered/unpowered_structures) "Dq" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "Dt" = ( @@ -702,7 +702,7 @@ /obj/machinery/atmospherics/unary/vent_pump{ dir = 8 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "darkbluecornersalt"; dir = 4 @@ -747,7 +747,7 @@ /area/ruin/space/unpowered/unpowered_structures) "FZ" = ( /obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/organ/external/arm, /obj/item/organ/external/hand, /turf/simulated/floor/plating/airless, @@ -768,7 +768,7 @@ }, /area/ruin/space/unpowered/unpowered_structures) "GT" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) @@ -819,7 +819,7 @@ /area/template_noop) "IL" = ( /obj/item/airlock_electronics/destroyed, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "IM" = ( @@ -858,7 +858,7 @@ /area/ruin/space/unpowered/unpowered_structures) "JS" = ( /obj/item/shard, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "KG" = ( @@ -954,7 +954,7 @@ }, /area/ruin/space/unpowered/unpowered_structures) "NK" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "OT" = ( @@ -1013,12 +1013,12 @@ icon_state = "medium"; pixel_y = 9 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "Ra" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/shuttle/engine/router, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) @@ -1177,7 +1177,7 @@ /area/ruin/space/unpowered/unpowered_structures) "Vm" = ( /obj/item/rack_parts, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm index 0c0cfdba6f669..d7b8cd9b1278e 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm @@ -33,8 +33,8 @@ /turf/template_noop, /area/template_noop) "bq" = ( -/obj/effect/landmark/burnturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "bS" = ( @@ -45,7 +45,7 @@ /area/template_noop) "dE" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/shard{ icon_state = "small"; pixel_x = 10; @@ -60,8 +60,8 @@ /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "ew" = ( -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "gV" = ( @@ -127,7 +127,7 @@ /turf/template_noop, /area/template_noop) "lt" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/remains/human, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) @@ -147,7 +147,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "lW" = ( @@ -173,11 +173,11 @@ /area/ruin/space/unpowered/unpowered_structures) "nm" = ( /obj/machinery/atmospherics/portable/canister/oxygen, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "nr" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "nA" = ( @@ -210,13 +210,13 @@ /turf/template_noop, /area/template_noop) "pW" = ( -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_2" }, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "rf" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/remains/human, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) @@ -231,7 +231,7 @@ dir = 4; autolink_id = "aisat_vent" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "rT" = ( @@ -239,12 +239,12 @@ /turf/template_noop, /area/template_noop) "sP" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "sW" = ( /obj/item/stack/sheet/mineral/plastitanium, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "tw" = ( @@ -254,7 +254,7 @@ /turf/template_noop, /area/template_noop) "tA" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "tB" = ( @@ -262,8 +262,8 @@ /turf/template_noop, /area/template_noop) "tE" = ( -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "tJ" = ( @@ -283,7 +283,7 @@ /area/ruin/space/unpowered/unpowered_structures) "tP" = ( /obj/structure/table_frame, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "uS" = ( @@ -294,12 +294,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /obj/machinery/teleport/hub/upgraded, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "vt" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/circular_saw, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) @@ -337,7 +337,7 @@ "yT" = ( /obj/machinery/light_construct/directional/south, /obj/machinery/atmospherics/pipe/manifold4w/hidden, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "zg" = ( @@ -351,8 +351,8 @@ /turf/template_noop, /area/template_noop) "zT" = ( -/obj/effect/landmark/burnturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/shard, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) @@ -387,19 +387,19 @@ "CI" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "CK" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/obj/effect/landmark/damageturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "CR" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/stack/sheet/mineral/plastitanium, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) @@ -421,7 +421,7 @@ /area/template_noop) "EM" = ( /obj/structure/table_frame, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "EW" = ( @@ -429,7 +429,7 @@ /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "GS" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/shuttle/engine/heater{ dir = 8 }, @@ -439,13 +439,13 @@ /obj/structure/closet/crate/internals, /obj/item/tank/internals/oxygen/red, /obj/item/clothing/mask/gas, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "Io" = ( /obj/machinery/light_construct/directional/south, -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "Iq" = ( @@ -472,7 +472,7 @@ /obj/item/shard{ icon_state = "small" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "Jx" = ( @@ -509,12 +509,12 @@ icon_state = "medium"; pixel_y = 9 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "LR" = ( /obj/item/chair/stool, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "Mt" = ( @@ -546,7 +546,7 @@ /area/template_noop) "NM" = ( /obj/machinery/door/window/reinforced/normal, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "NV" = ( @@ -556,7 +556,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "Og" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plating/airless, @@ -593,7 +593,7 @@ /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "Pt" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/mineral/plastitanium/red/airless, @@ -633,7 +633,7 @@ /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "SK" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "SQ" = ( @@ -641,7 +641,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "Uf" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/stack/tile{ pixel_y = 14; pixel_x = 18 @@ -653,7 +653,7 @@ /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "Ul" = ( -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil{ amount = 1 }, @@ -665,7 +665,7 @@ /area/ruin/space/unpowered/unpowered_structures) "UE" = ( /obj/machinery/light_construct/directional/east, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "UJ" = ( @@ -676,7 +676,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "UY" = ( @@ -696,7 +696,7 @@ /area/ruin/space/unpowered/unpowered_structures) "VA" = ( /obj/item/storage/toolbox/syndicate, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "VC" = ( @@ -712,15 +712,15 @@ /turf/template_noop, /area/template_noop) "Xp" = ( -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "XO" = ( /obj/item/stack/rods, -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "Yx" = ( diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm index 80251760f5aa5..e5078971e3938 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm @@ -23,25 +23,25 @@ /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "aF" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/item/trash/spentcasing/bullet, /turf/simulated/floor/plasteel{ icon_state = "stage_left" }, /area/ruin/space/powered/requires_power_space) "aH" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "aY" = ( /obj/machinery/light_construct/directional/south, /obj/effect/decal/cleanable/blood/splatter, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "bh" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/dirt/blackpowder, /obj/effect/decal/cleanable/blood/gibs/xeno, /obj/item/trash/spentcasing/bullet, @@ -72,7 +72,7 @@ dir = 8 }, /obj/effect/decal/cleanable/blood/gibs/xeno/body, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/blood/gibs/body, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) @@ -80,7 +80,7 @@ /obj/structure/computerframe{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "cB" = ( @@ -88,7 +88,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "cC" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "cK" = ( @@ -122,8 +122,8 @@ dir = 4 }, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "dq" = ( @@ -142,7 +142,7 @@ "dI" = ( /mob/living/simple_animal/hostile/alien, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "dK" = ( @@ -151,7 +151,7 @@ }, /obj/structure/sign/poster/contraband/random/north, /obj/effect/decal/cleanable/blood/gibs/xeno/body, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "dU" = ( @@ -176,18 +176,18 @@ /area/ruin/space/powered/requires_power_space) "ez" = ( /obj/machinery/light_construct/directional/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/freezer, /area/ruin/space/powered/requires_power_space) "eC" = ( /obj/machinery/atmospherics/portable/canister, /obj/machinery/light_construct/directional/east, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "eG" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/organ/internal/body_egg/alien_embryo{ icon_state = "facehugger_dead" }, @@ -233,7 +233,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/blood/gibs/cleangibs, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) @@ -244,7 +244,7 @@ "gg" = ( /obj/item/trash/can, /obj/structure/sign/poster/contraband/random/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "stage_left" }, @@ -261,7 +261,7 @@ /obj/machinery/atmospherics/unary/vent_pump{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "stage_left" }, @@ -292,13 +292,13 @@ /obj/item/bedsheet/syndie, /obj/item/trash/syndi_cakes, /obj/item/trash/syndi_cakes, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "hG" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, /obj/effect/turf_decal/stripes/line{ @@ -308,7 +308,7 @@ /area/ruin/space/powered/requires_power_space) "hP" = ( /obj/effect/decal/cleanable/blood/gibs/xeno/body, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "stage_left" }, @@ -321,7 +321,7 @@ /obj/structure/grille/broken, /obj/item/shard, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/blood/drip{ icon_state = "5" }, @@ -385,7 +385,7 @@ }, /obj/effect/turf_decal/stripes/white/line, /mob/living/simple_animal/hostile/alien/sentinel, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) @@ -394,7 +394,7 @@ /obj/effect/decal/cleanable/blood/drip{ icon_state = "5" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/generic, /obj/item/trash/spentcasing/bullet, /obj/item/trash/spentcasing/bullet, @@ -410,8 +410,8 @@ /area/ruin/space/powered/requires_power_space) "jr" = ( /obj/item/chair, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "stage_left" }, @@ -423,7 +423,7 @@ /area/ruin/space/powered/requires_power_space) "jW" = ( /mob/living/simple_animal/hostile/alien, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "kg" = ( @@ -441,7 +441,7 @@ /area/ruin/space/powered/requires_power_space) "kx" = ( /obj/item/chair/stool, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/trash/spentcasing/bullet, /turf/simulated/floor/plasteel{ icon_state = "stage_left" @@ -451,7 +451,7 @@ /obj/machinery/atmospherics/unary/vent_pump, /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/blood/drip, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/trash/spentcasing/bullet, /obj/item/trash/spentcasing/bullet, /turf/simulated/floor/mineral/plastitanium, @@ -462,8 +462,8 @@ pixel_y = 9 }, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/dirt/often, +/obj/effect/spawner/random/blood/often, /obj/item/trash/spentcasing/shotgun, /turf/simulated/floor/pod, /area/ruin/space/powered/requires_power_space) @@ -472,7 +472,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/white/line, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "la" = ( @@ -494,13 +494,13 @@ dir = 1 }, /obj/effect/decal/cleanable/blood/gibs/xeno/body, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "lk" = ( /obj/effect/decal/cleanable/generic, /obj/effect/decal/cleanable/vomit/green, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "lm" = ( @@ -519,7 +519,7 @@ pixel_y = 17 }, /obj/item/organ/internal/body_egg/alien_embryo, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "lu" = ( @@ -530,13 +530,13 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "lA" = ( -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, /turf/simulated/floor/pod, /area/ruin/space/powered/requires_power_space) "lP" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/blood/gibs/xeno, /obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/mineral/plastitanium, @@ -560,7 +560,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/white/line, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "ne" = ( @@ -580,7 +580,7 @@ /obj/effect/decal/cleanable/blood/drip{ icon_state = "5" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "ns" = ( @@ -595,7 +595,7 @@ /area/ruin/space/powered/requires_power_space) "nE" = ( /mob/living/simple_animal/hostile/alien/sentinel, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/blood/drip{ icon_state = "3" }, @@ -609,7 +609,7 @@ }, /obj/effect/turf_decal/stripes/white/line, /obj/effect/decal/cleanable/blood/splatter, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "nU" = ( @@ -632,7 +632,7 @@ /obj/structure/computerframe{ icon_state = "comp_frame_2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/shard{ icon_state = "small"; pixel_x = 10; @@ -642,8 +642,8 @@ /area/ruin/space/powered/requires_power_space) "pg" = ( /obj/structure/alien/egg/burst, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "pj" = ( @@ -651,7 +651,7 @@ /obj/structure/computerframe{ icon_state = "comp_frame_5" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/shard, /obj/item/stack/cable_coil{ amount = 1 @@ -669,8 +669,8 @@ /obj/item/chair{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "stage_left" }, @@ -680,7 +680,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "pK" = ( @@ -693,7 +693,7 @@ pixel_x = 8; pixel_y = -4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "pO" = ( @@ -703,7 +703,7 @@ /obj/item/trash/raisins, /obj/item/trash/can, /obj/item/trash/plate, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "stage_left" }, @@ -727,8 +727,8 @@ /turf/simulated/floor/pod, /area/ruin/space/powered/requires_power_space) "rs" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "stage_left" }, @@ -753,8 +753,8 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "sb" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/dirt/often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "sg" = ( @@ -768,7 +768,7 @@ /obj/structure/closet/crate/freezer, /obj/item/food/meat/corgi, /obj/item/food/meat/corgi, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/freezer, /area/ruin/space/powered/requires_power_space) "st" = ( @@ -780,7 +780,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/powered/requires_power_space) "sA" = ( -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, /obj/effect/turf_decal/stripes/white/line{ @@ -811,13 +811,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "tO" = ( /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/blood/gibs/body, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "tX" = ( @@ -829,18 +829,18 @@ /area/ruin/space/powered/requires_power_space) "ue" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "ug" = ( /obj/effect/decal/cleanable/blood/drip, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/organ/external/chest, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "ul" = ( /obj/structure/table_frame, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/stack/sheet/metal, /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) @@ -849,7 +849,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/white/line, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/generic, /obj/item/trash/spentcasing/bullet, /turf/simulated/floor/mineral/plastitanium/red, @@ -862,7 +862,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /mob/living/simple_animal/hostile/alien, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) @@ -883,7 +883,7 @@ "vL" = ( /obj/effect/turf_decal/stripes/white/line, /obj/effect/decal/cleanable/blood/gibs/xeno/body, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "vX" = ( @@ -891,13 +891,13 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "wO" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/organ/internal/beard, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "wY" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/dirt/often, +/obj/effect/spawner/random/blood/often, /obj/item/trash/spentcasing/bullet, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) @@ -912,7 +912,7 @@ dir = 4 }, /obj/effect/decal/cleanable/blood/gibs/xeno/body, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/trash/spentcasing/bullet, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) @@ -922,7 +922,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/blood/gibs/xeno, /obj/item/trash/spentcasing/bullet, @@ -935,7 +935,7 @@ "xG" = ( /obj/machinery/light_construct/directional/west, /obj/item/paper/crumpled, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/storage/secure/briefcase/syndie, /obj/item/trash/spentcasing/bullet, /turf/simulated/floor/mineral/plastitanium, @@ -965,13 +965,13 @@ /obj/structure/rack, /obj/effect/spawner/random/maintenance, /obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "zq" = ( /obj/machinery/light_construct/directional/east, /obj/effect/decal/cleanable/blood/splatter, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium/red/airless{ icon_state = "plastitanium" }, @@ -987,7 +987,7 @@ dir = 4 }, /obj/effect/turf_decal/stripes/white/line, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "zK" = ( @@ -1000,7 +1000,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/white/line, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/organ/internal/body_egg/alien_embryo{ icon_state = "facehugger_dead" }, @@ -1010,9 +1010,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/dirt/blackpowder, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "As" = ( @@ -1032,8 +1032,8 @@ /obj/effect/decal/cleanable/blood/drip{ icon_state = "4" }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "AV" = ( @@ -1046,7 +1046,7 @@ dir = 4 }, /obj/effect/turf_decal/stripes/white/line, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "BA" = ( @@ -1057,7 +1057,7 @@ "BK" = ( /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/blood/gibs/xeno/body, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "stage_left" }, @@ -1101,14 +1101,14 @@ /obj/effect/decal/cleanable/blood/drip{ icon_state = "4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/blood/gibs/body, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "FH" = ( /obj/structure/table_frame/wood, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "stage_left" }, @@ -1124,8 +1124,8 @@ /area/ruin/space/powered/requires_power_space) "FS" = ( /obj/effect/decal/cleanable/blood/gibs/xeno/body, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "FT" = ( @@ -1142,7 +1142,7 @@ pixel_y = 14; pixel_x = 6 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "stage_left" }, @@ -1160,7 +1160,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "He" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/paintkit/gygax_syndie, /turf/simulated/floor/pod, /area/ruin/space/powered/requires_power_space) @@ -1205,7 +1205,7 @@ /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "Ie" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/structure/alien/resin/door{ dir = 4 }, @@ -1216,13 +1216,13 @@ /turf/template_noop, /area/template_noop) "IH" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/blood/gibs/body, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "IR" = ( /obj/effect/decal/cleanable/blood/splatter, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "IX" = ( @@ -1239,12 +1239,12 @@ /area/ruin/space/powered/requires_power_space) "Je" = ( /obj/machinery/light_construct/directional/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/trash/spentcasing/bullet, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "Jp" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/blood/gibs/body, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) @@ -1258,7 +1258,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "JK" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "JO" = ( @@ -1268,7 +1268,7 @@ "JS" = ( /mob/living/simple_animal/hostile/alien/sentinel, /obj/effect/decal/cleanable/blood/gibs/xeno/body, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "Kv" = ( @@ -1296,7 +1296,7 @@ /area/ruin/space/powered/requires_power_space) "LA" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "stage_left" }, @@ -1306,7 +1306,7 @@ dir = 4 }, /obj/effect/decal/cleanable/blood/drip, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/blood/gibs/body, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) @@ -1340,14 +1340,14 @@ /obj/effect/turf_decal/stripes/white/corner{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "Nj" = ( /obj/structure/barricade/security, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "NN" = ( @@ -1373,8 +1373,8 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/item/organ/external/hand, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) @@ -1383,7 +1383,7 @@ /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "OA" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/sign/poster/contraband/random/south, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) @@ -1392,7 +1392,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "Pm" = ( @@ -1406,7 +1406,7 @@ "Po" = ( /obj/structure/closet/crate/engineering, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "Pq" = ( @@ -1480,7 +1480,7 @@ "SA" = ( /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/blood/gibs/body, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/trash/spentcasing/bullet, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) @@ -1493,8 +1493,8 @@ }, /area/ruin/space/powered/requires_power_space) "Tn" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/dirt/often, +/obj/effect/spawner/random/blood/often, /obj/structure/barricade/security, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) @@ -1516,12 +1516,12 @@ /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "TV" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "Us" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/table_frame, /obj/item/organ/internal/body_egg/alien_embryo{ icon_state = "facehugger_impregnated" @@ -1548,22 +1548,22 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/dirt/often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "Vc" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium/red/airless{ icon_state = "plastitanium" }, /area/ruin/space/powered/requires_power_space) "Vn" = ( /obj/structure/barricade/security, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) "VF" = ( @@ -1578,13 +1578,13 @@ /area/ruin/space/powered/requires_power_space) "VN" = ( /obj/item/organ/external/chest, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/dirt/often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/pod, /area/ruin/space/powered/requires_power_space) "Wd" = ( /obj/item/trash/spentcasing/bullet, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "We" = ( @@ -1595,8 +1595,8 @@ "Ww" = ( /obj/item/clothing/suit/fire/firefighter, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "WQ" = ( @@ -1609,7 +1609,7 @@ /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "WR" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/blood/drip{ icon_state = "5" }, @@ -1620,8 +1620,8 @@ /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "Xe" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/item/trash/spentcasing/bullet, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) @@ -1635,14 +1635,14 @@ /area/ruin/space/powered/requires_power_space) "XL" = ( /obj/structure/bed/nest, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "XW" = ( /obj/structure/kitchenspike_frame, /obj/item/stack/rods, /obj/item/stack/rods, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/freezer, /area/ruin/space/powered/requires_power_space) "Ye" = ( @@ -1680,7 +1680,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "Zc" = ( @@ -1689,8 +1689,8 @@ dir = 1 }, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/dirt/often, +/obj/effect/spawner/random/blood/often, /obj/item/trash/spentcasing/shotgun, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered/requires_power_space) @@ -1701,8 +1701,8 @@ /obj/structure/toilet{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/dirt/often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/ruin/space/powered/requires_power_space) "ZA" = ( diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm index 2b88ee64a886e..d8d1b6b9515aa 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm @@ -335,7 +335,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered) "iG" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/flashlight{ on = 1 }, @@ -507,7 +507,7 @@ /turf/template_noop, /area/template_noop) "lR" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) "lS" = ( @@ -575,7 +575,7 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) "nx" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/ruin/space/powered) "nA" = ( @@ -612,7 +612,7 @@ /area/ruin/space/powered) "oh" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/powered) "ol" = ( @@ -624,7 +624,7 @@ "ov" = ( /obj/effect/decal/cleanable/ash, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/powered) "oE" = ( @@ -834,8 +834,8 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) "to" = ( -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/powered) "tv" = ( @@ -988,7 +988,7 @@ /area/ruin/space/powered) "wv" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/powered) "wF" = ( @@ -1034,7 +1034,7 @@ }, /obj/effect/decal/cleanable/glass, /obj/item/shard, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/powered) "xY" = ( @@ -1081,7 +1081,7 @@ /turf/simulated/wall/indestructible/syndishuttle/nodiagonal, /area/ruin/space/powered) "yt" = ( -/obj/machinery/constructable_frame/machine_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, /turf/simulated/floor/bluegrid, @@ -1182,7 +1182,7 @@ /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "AS" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stock_parts/cell/hyper/empty, /obj/item/stack/cable_coil{ amount = 5 @@ -1623,7 +1623,7 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) "HQ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/powered) "HU" = ( @@ -1684,7 +1684,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/ruin/space/powered) "IK" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/stack/sheet/mineral/titanium, /obj/item/stack/rods, /turf/simulated/floor/plating, @@ -1694,7 +1694,7 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) "Ja" = ( -/obj/machinery/constructable_frame/machine_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, /obj/effect/decal/cleanable/dirt, @@ -1770,7 +1770,7 @@ /turf/simulated/floor/carpet/blue, /area/ruin/space/powered) "KW" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/railing{ dir = 5 }, @@ -1847,7 +1847,7 @@ /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "LV" = ( -/obj/machinery/constructable_frame/machine_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, /obj/item/stack/cable_coil{ @@ -1879,8 +1879,8 @@ /turf/simulated/floor/mech_bay_recharge_floor, /area/ruin/space/powered) "Mp" = ( -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/sheet/mineral/titanium, /turf/simulated/floor/plating, /area/ruin/space/powered) @@ -2058,7 +2058,7 @@ /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "QD" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/powered) "QF" = ( @@ -2078,7 +2078,7 @@ /obj/item/cigbutt/roach, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/powered) "QS" = ( @@ -2103,7 +2103,7 @@ /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "Ry" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/powered) "RF" = ( @@ -2157,7 +2157,7 @@ /area/ruin/space/powered) "SA" = ( /obj/structure/fans/tiny/invisible, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/ruin/space/powered) "SH" = ( @@ -2217,7 +2217,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/powered) "Ty" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/bluegrid, /area/ruin/space/powered) "TR" = ( @@ -2285,7 +2285,7 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) "UH" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stock_parts/cell/hyper/empty, /obj/item/stock_parts/cell/hyper/empty{ pixel_y = 8; @@ -2366,7 +2366,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/ruin/space/powered) "VO" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/powered) "VQ" = ( @@ -2388,7 +2388,7 @@ /obj/item/circuitboard/atmoscontrol{ icon_state = "command_broken" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light_construct/directional/north, /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) @@ -2455,7 +2455,7 @@ /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "Xy" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light_construct/directional/north, /obj/structure/closet/secure_closet/engineering_electrical, /turf/simulated/floor/plating, diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm index ea87acb0a8804..b3facde06aeaf 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm @@ -98,7 +98,7 @@ icon_state = "4-8" }, /obj/machinery/light/small/directional/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "aQ" = ( @@ -157,7 +157,7 @@ "bd" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "bh" = ( @@ -212,7 +212,7 @@ /area/ruin/space/spacehotelv1/entryhallway) "bz" = ( /obj/machinery/light/small/directional/west, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) @@ -322,7 +322,7 @@ /area/ruin/space/spacehotelv1/centralhallway) "cp" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "cr" = ( @@ -350,7 +350,7 @@ /obj/structure/rack, /obj/effect/spawner/random/maintenance, /obj/machinery/light/small/directional/east, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "cE" = ( @@ -411,7 +411,7 @@ "de" = ( /obj/structure/rack, /obj/random/toolbox, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/sign/poster/random{ pixel_x = -32 }, @@ -497,7 +497,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "dH" = ( @@ -579,7 +579,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "ez" = ( @@ -606,7 +606,7 @@ /obj/structure/sign/poster/random{ pixel_y = -32 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "eE" = ( @@ -743,7 +743,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "fF" = ( @@ -775,7 +775,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/sign/poster/random{ pixel_x = -32 }, @@ -783,7 +783,7 @@ /area/ruin/space/spacehotelv1/engi1) "fP" = ( /obj/machinery/atmospherics/portable/pump, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "fV" = ( @@ -796,7 +796,7 @@ /area/ruin/space/spacehotelv1/guestroom4) "gb" = ( /obj/machinery/suit_storage_unit/standard_unit, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "gd" = ( @@ -848,7 +848,7 @@ /area/ruin/space/spacehotelv1/bar) "gA" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "gC" = ( @@ -975,7 +975,7 @@ /area/space/nearstation) "hy" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "hD" = ( @@ -1104,7 +1104,7 @@ icon_state = "2-8" }, /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "it" = ( @@ -1247,7 +1247,7 @@ /area/ruin/space/spacehotelv1/reception) "jw" = ( /obj/structure/dispenser/oxygen, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "jx" = ( @@ -1324,7 +1324,7 @@ /obj/structure/sign/securearea{ pixel_y = -32 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "jZ" = ( @@ -1502,7 +1502,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "lj" = ( @@ -1513,7 +1513,7 @@ /turf/simulated/floor/wood/oak, /area/ruin/space/spacehotelv1/bar) "ll" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/portable/canister/oxygen, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) @@ -1537,7 +1537,7 @@ /turf/template_noop, /area/space/nearstation) "lr" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/sign/poster/random{ pixel_y = 32 }, @@ -1717,7 +1717,7 @@ /area/ruin/space/spacehotelv1/bar) "mA" = ( /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "mC" = ( @@ -1758,7 +1758,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) @@ -1780,7 +1780,7 @@ id = "ext_eva_door2"; pixel_x = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "nd" = ( @@ -1800,7 +1800,7 @@ "nj" = ( /obj/machinery/door/airlock/external, /obj/structure/fans/tiny, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "nl" = ( @@ -1825,7 +1825,7 @@ dir = 4 }, /obj/structure/window/reinforced, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "no" = ( @@ -1845,7 +1845,7 @@ icon_state = "4-8" }, /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "nx" = ( @@ -1954,7 +1954,7 @@ /obj/structure/sign/vacuum{ pixel_y = 32 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "ok" = ( @@ -2050,7 +2050,7 @@ /area/ruin/space/spacehotelv1/bar) "oR" = ( /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "oU" = ( @@ -2087,7 +2087,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "pg" = ( @@ -2107,7 +2107,7 @@ /obj/item/holder/mouse{ name = "Elliot" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "pq" = ( @@ -2152,7 +2152,7 @@ dir = 1 }, /obj/machinery/door/window/reinforced/normal, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "pC" = ( @@ -2197,7 +2197,7 @@ "pM" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "pN" = ( @@ -2288,7 +2288,7 @@ "qu" = ( /obj/machinery/door/airlock/external, /obj/structure/fans/tiny, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "qA" = ( @@ -2544,7 +2544,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "sF" = ( @@ -2558,7 +2558,7 @@ /turf/simulated/floor/carpet, /area/ruin/space/spacehotelv1/restoraunt1) "sM" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "sQ" = ( @@ -2598,14 +2598,14 @@ "tg" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "tj" = ( /obj/structure/disposalpipe/segment/corner{ dir = 2 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "tk" = ( @@ -2627,8 +2627,8 @@ }, /area/ruin/space/spacehotelv1/guestroom3) "tm" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/cobweb/left/rare, +/obj/effect/spawner/random/dirt/often, /obj/structure/rack, /obj/random/tool, /obj/effect/spawner/random/maintenance, @@ -2641,7 +2641,7 @@ /area/ruin/space/spacehotelv1/restoraunt1) "to" = ( /obj/machinery/door/airlock/maintenance, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -2909,7 +2909,7 @@ dir = 4; id_tag = "hotelstrash" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "vf" = ( @@ -2934,7 +2934,7 @@ "vk" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "vp" = ( @@ -3168,7 +3168,7 @@ /obj/structure/rack, /obj/random/tool, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "wL" = ( @@ -3195,7 +3195,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "wS" = ( @@ -3209,7 +3209,7 @@ /obj/structure/sign/poster/random{ pixel_y = 32 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "wZ" = ( @@ -3294,7 +3294,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "xs" = ( @@ -3371,7 +3371,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "xO" = ( @@ -3468,7 +3468,7 @@ /obj/structure/sign/poster/random{ pixel_y = -32 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "yF" = ( @@ -3674,7 +3674,7 @@ /obj/machinery/conveyor_switch/oneway{ id = "hotelsdisposal" }, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "zR" = ( @@ -3738,7 +3738,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "Ak" = ( @@ -3787,7 +3787,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "AK" = ( @@ -3913,7 +3913,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "Bz" = ( @@ -3924,7 +3924,7 @@ /area/ruin/space/spacehotelv1/bar) "BG" = ( /obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "BI" = ( @@ -4048,7 +4048,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "CC" = ( @@ -4103,7 +4103,7 @@ /area/ruin/space/spacehotelv1/guestroom1) "Dk" = ( /obj/machinery/light/small/directional/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "Dl" = ( @@ -4136,7 +4136,7 @@ /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "DA" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "DD" = ( @@ -4156,7 +4156,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "DF" = ( @@ -4205,7 +4205,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "DW" = ( @@ -4229,7 +4229,7 @@ /turf/simulated/floor/wood/oak, /area/ruin/space/spacehotelv1/centralhallway) "Ec" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/sign/poster/random{ pixel_y = -32 }, @@ -4249,7 +4249,7 @@ locked = 1 }, /obj/structure/fans/tiny, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "Ek" = ( @@ -4271,7 +4271,7 @@ name = "Push me"; id_tag = "hotelstrash" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "Es" = ( @@ -4411,7 +4411,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "Fo" = ( @@ -4510,8 +4510,8 @@ icon_state = "1-2" }, /obj/machinery/light/small/directional/east, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "FV" = ( @@ -4530,7 +4530,7 @@ }, /area/ruin/space/spacehotelv1/cargostorage) "Gb" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/sign/vacuum{ pixel_y = -32 }, @@ -4584,7 +4584,7 @@ /turf/simulated/floor/wood/oak, /area/ruin/space/spacehotelv1/forehallway) "Gm" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "Gs" = ( @@ -4725,7 +4725,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "Hr" = ( @@ -4750,7 +4750,7 @@ pixel_x = 32 }, /obj/random/toolbox, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "HB" = ( @@ -4772,7 +4772,7 @@ dir = 4 }, /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "HP" = ( @@ -4846,7 +4846,7 @@ icon_state = "1-2" }, /obj/machinery/light/small/directional/east, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "Iv" = ( @@ -4867,7 +4867,7 @@ /obj/structure/rack, /obj/random/tool, /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "IE" = ( @@ -5166,8 +5166,8 @@ /area/ruin/space/spacehotelv1/guestroom1) "KR" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/cobweb/left/frequent, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "KU" = ( @@ -5177,7 +5177,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "KX" = ( @@ -5269,7 +5269,7 @@ /turf/simulated/floor/plasteel/grimy, /area/ruin/space/spacehotelv1/forehallway) "Ls" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "Lv" = ( @@ -5314,7 +5314,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) @@ -5341,7 +5341,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "Ma" = ( @@ -5438,7 +5438,7 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "ME" = ( @@ -5479,7 +5479,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "MX" = ( @@ -5599,8 +5599,8 @@ /area/ruin/space/spacehotelv1/guestroom2) "NN" = ( /obj/structure/rack, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/cobweb/left/frequent, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "NR" = ( @@ -5644,7 +5644,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "NY" = ( @@ -5770,7 +5770,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "OU" = ( @@ -5786,7 +5786,7 @@ /obj/machinery/computer/monitor{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/sign/poster/random{ pixel_y = -32 }, @@ -5851,7 +5851,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "Ps" = ( @@ -5875,7 +5875,7 @@ /obj/structure/disposaloutlet{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "Pw" = ( @@ -5884,7 +5884,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc/off_station/directional/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/portable/canister/nitrogen, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) @@ -5927,7 +5927,7 @@ /obj/structure/rack, /obj/random/toolbox, /obj/random/tool, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "PQ" = ( @@ -5942,7 +5942,7 @@ /turf/simulated/floor/wood/oak, /area/ruin/space/spacehotelv1/centralhallway) "Qc" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/circuitboard/tcomms/core, /turf/simulated/floor/greengrid/airless{ icon_state = "bcircuit" @@ -5954,7 +5954,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "Qo" = ( @@ -6112,13 +6112,13 @@ /turf/simulated/floor/carpet/red, /area/ruin/space/spacehotelv1/guestroom4) "RL" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/space_heater, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "RP" = ( /obj/machinery/light/small/directional/west, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "RR" = ( @@ -6162,7 +6162,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "Sd" = ( @@ -6229,7 +6229,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "SL" = ( @@ -6270,7 +6270,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) @@ -6285,7 +6285,7 @@ pixel_y = 32 }, /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "Tv" = ( @@ -6379,12 +6379,12 @@ /area/ruin/space/spacehotelv1/forehallway) "TT" = ( /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "TV" = ( /obj/machinery/suit_storage_unit/standard_unit, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "TW" = ( @@ -6410,7 +6410,7 @@ pixel_y = 8 }, /obj/machinery/light/small/directional/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "Uh" = ( @@ -6439,7 +6439,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "UH" = ( @@ -6693,7 +6693,7 @@ "Wa" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "We" = ( @@ -6774,12 +6774,12 @@ /area/ruin/space/spacehotelv1/janitor) "Wy" = ( /obj/machinery/atmospherics/portable/scrubber, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "WD" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "WM" = ( @@ -6794,7 +6794,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "WU" = ( @@ -6998,11 +6998,11 @@ icon_state = "0-8" }, /obj/machinery/power/apc/off_station/directional/east, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) "YA" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi2) @@ -7037,7 +7037,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "YS" = ( @@ -7152,7 +7152,7 @@ /area/space/nearstation) "ZP" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/engi1) "ZR" = ( @@ -7164,7 +7164,7 @@ /area/ruin/space/spacehotelv1/entryhallway) "ZS" = ( /obj/machinery/atmospherics/portable/canister/oxygen, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/ruin/space/spacehotelv1/forestarboardmaints) "ZU" = ( diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm index 567b8ccf3e80d..cc8e771d706cc 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm @@ -5,7 +5,7 @@ /area/ruin/space/unpowered/unpowered_structures) "bu" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "bG" = ( @@ -164,7 +164,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "ot" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "oL" = ( diff --git a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm index 2632008b70781..72c89df87c0c3 100644 --- a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm +++ b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm @@ -33,7 +33,7 @@ /area/awaymission/BMPship/TurretsSouth) "al" = ( /obj/item/stack/sheet/mineral/titanium, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "am" = ( @@ -111,7 +111,7 @@ maxHealth = 150; name = "Angry giant spider" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/awaymission/BMPship/CommonArea) "aA" = ( @@ -145,7 +145,7 @@ icon_state = "small" }, /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TurretsNorth) "aF" = ( @@ -163,7 +163,7 @@ "aG" = ( /obj/machinery/light_construct/small/north, /obj/structure/alien/weeds, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/BMPship/Armory) "aH" = ( @@ -172,7 +172,7 @@ dir = 4 }, /obj/structure/grille, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TurretsNorth) "aI" = ( @@ -208,7 +208,7 @@ /turf/simulated/wall/indestructible/whiteshuttle, /area/awaymission/BMPship/Gate) "aR" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/apc_electronics, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TurretsNorth) @@ -238,7 +238,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/MedBay) "bb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/ash, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Buffer) @@ -293,7 +293,7 @@ pixel_x = -5; pixel_y = 12 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/BMPship/Fore) "bm" = ( @@ -384,16 +384,16 @@ /area/awaymission/BMPship/Fore) "bw" = ( /obj/structure/alien/weeds, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/spider/stickyweb, /turf/simulated/floor/vault, /area/awaymission/BMPship/Buffer) "by" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/MedBay) "bz" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/MedBay) "bA" = ( @@ -651,7 +651,7 @@ /area/awaymission/BMPship/Containment) "ci" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/circuitboard/smes, /obj/item/stack/cable_coil/green, /turf/simulated/floor/greengrid, @@ -784,7 +784,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship/Engines) "cE" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/tile/plasteel, /obj/item/stack/sheet/mineral/titanium, /turf/simulated/floor/plating/airless, @@ -996,7 +996,7 @@ name = "MAXIMUM ATTENTION"; pixel_x = -32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/awaymission/BMPship/CommonArea) "dl" = ( @@ -1089,7 +1089,7 @@ /turf/simulated/floor/grass, /area/awaymission/BMPship/Kitchen) "dw" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/stock_parts/cell, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/MedBay) @@ -1298,7 +1298,7 @@ /area/awaymission/BMPship/Containment) "dU" = ( /obj/item/reagent_containers/drinks/sillycup, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/awaymission/BMPship/CommonArea) "dV" = ( @@ -1437,7 +1437,7 @@ /obj/machinery/economy/vending/boozeomat{ layer = 3.1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/BMPship/Fore) "en" = ( @@ -1505,13 +1505,13 @@ /area/awaymission/BMPship/Fore) "eC" = ( /obj/effect/decal/cleanable/ash, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/cable_coil, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TurretsNorth) "eD" = ( /obj/structure/spider/stickyweb, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/awaymission/BMPship/CommonArea) "eE" = ( @@ -1679,7 +1679,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "fc" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/ore/iron, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) @@ -2000,7 +2000,7 @@ }, /area/awaymission/BMPship/Kitchen) "fT" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -2176,14 +2176,14 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "gs" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "gt" = ( /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "gu" = ( @@ -2213,7 +2213,7 @@ /area/space) "gz" = ( /obj/item/shard, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "gA" = ( @@ -2241,14 +2241,14 @@ /area/awaymission/BMPship/Fore) "gD" = ( /obj/structure/chair/stool, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "gE" = ( /obj/structure/computerframe{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "gF" = ( @@ -2306,7 +2306,7 @@ /area/awaymission/BMPship/Fore) "gP" = ( /obj/item/multitool, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission) "gQ" = ( @@ -2324,7 +2324,7 @@ /area/awaymission/BMPship/Fore) "gS" = ( /obj/structure/cable, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/tank/internals/emergency_oxygen/empty, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) @@ -2353,7 +2353,7 @@ /obj/structure/closet/fireaxecabinet{ pixel_x = -30 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/awaymission/BMPship/CommonArea) "gX" = ( @@ -2364,21 +2364,21 @@ }, /area/awaymission/BMPship/Dormitories) "gY" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Mining) "gZ" = ( /obj/effect/landmark/awaystart, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Mining) "ha" = ( /obj/effect/gibspawner/robot, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Mining) "hb" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/clothing/mask/gas/explorer, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Mining) @@ -2440,7 +2440,7 @@ /turf/simulated/floor/vault, /area/awaymission/BMPship/Buffer) "hr" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/spider/stickyweb, /obj/structure/cable{ icon_state = "2-8" @@ -2503,7 +2503,7 @@ /area/awaymission/BMPship/Containment) "hB" = ( /obj/machinery/light_construct/small/north, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "hC" = ( @@ -2604,7 +2604,7 @@ icon_state = "small" }, /obj/item/shard, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/grille/broken, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) @@ -2667,7 +2667,7 @@ /area/awaymission/BMPship/CommonArea) "ih" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/spider/stickyweb, /turf/simulated/floor/plating, /area/awaymission/BMPship/Armory) @@ -2679,7 +2679,7 @@ pixel_x = -7; pixel_y = -10 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "ij" = ( @@ -2964,7 +2964,7 @@ "jm" = ( /obj/effect/decal/cleanable/ash, /obj/effect/decal/cleanable/blood/oil, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TurretsNorth) "jn" = ( @@ -3217,7 +3217,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/grille/broken, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) @@ -3403,7 +3403,7 @@ /area/awaymission) "mJ" = ( /obj/structure/girder, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "mL" = ( @@ -3458,7 +3458,7 @@ /area/awaymission/BMPship/TurretsNorth) "nD" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ icon_state = "4-8" }, @@ -3469,7 +3469,7 @@ layer = 2.8 }, /obj/effect/mob_spawn/human/corpse/syndicatesoldier/trader, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TraderShuttle) "nH" = ( @@ -3576,7 +3576,7 @@ /obj/effect/turf_decal/delivery/red/partial{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) "os" = ( @@ -3593,7 +3593,7 @@ icon_state = "0-4" }, /obj/item/mounted/frame/apc_frame, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/BMPship/Armory) "ov" = ( @@ -3627,11 +3627,11 @@ pixel_y = 13 }, /obj/item/clothing/head/collectable/captain, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/BMPship/Fore) "oD" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stock_parts/cell/empty, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Buffer) @@ -3700,7 +3700,7 @@ /turf/simulated/floor/wood/oak, /area/awaymission/BMPship/Armory) "pn" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/apc_electronics, /obj/item/clothing/mask/gas/explorer, /turf/simulated/floor/plating/airless, @@ -3836,7 +3836,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship/Engines) "qb" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/circuitboard/smes, /obj/item/stack/cable_coil/blue, /turf/simulated/floor/greengrid, @@ -3853,7 +3853,7 @@ /turf/simulated/floor/carpet, /area/awaymission/BMPship/Dormitories) "qp" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/ash, /obj/item/stack/sheet/mineral/titanium, /turf/simulated/floor/plating/airless, @@ -3927,12 +3927,12 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "qS" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/firealarm/no_alarm/directional/north, /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Bath) "qX" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/crowbar/fluff/zelda_creedy_1, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Mining) @@ -3941,7 +3941,7 @@ /turf/simulated/floor/mineral/plastitanium/red/airless, /area/awaymission/BMPship/TraderShuttle) "rg" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/delivery/red/partial{ dir = 8 }, @@ -3980,7 +3980,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship/TurretsSouth) "rE" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Buffer) "rJ" = ( @@ -4044,7 +4044,7 @@ pixel_x = -13 }, /obj/item/wrench, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/BMPship/Fore) "sq" = ( @@ -4059,14 +4059,14 @@ /turf/simulated/floor/carpet, /area/awaymission/BMPship/Dormitories) "su" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/bodyanalyzer, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/MedBay) "sv" = ( /obj/item/stack/tile/plasteel, -/obj/effect/landmark/damageturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "sF" = ( @@ -4090,7 +4090,7 @@ maxHealth = 150; name = "Angry giant spider" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "sQ" = ( @@ -4151,7 +4151,7 @@ }, /area/awaymission/BMPship/Engines) "tw" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/MedBay) @@ -4178,7 +4178,7 @@ /turf/simulated/wall/indestructible/whiteshuttle, /area/awaymission/BMPship/Kitchen) "tE" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light_construct/directional/east, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) @@ -4222,7 +4222,7 @@ "tY" = ( /obj/structure/alien/weeds, /obj/item/skeleton/r_arm, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/BMPship/Armory) "uj" = ( @@ -4244,7 +4244,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "uo" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/wall/indestructible/whiteshuttle, /area/awaymission/BMPship/Buffer) "ur" = ( @@ -4363,7 +4363,7 @@ faction = list("alien"); layer = 2.6 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/BMPship/Armory) "vl" = ( @@ -4451,7 +4451,7 @@ /obj/machinery/light_construct/small/south, /obj/effect/decal/cleanable/ash, /obj/effect/decal/cleanable/blood/oil, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TurretsNorth) "wg" = ( @@ -4472,7 +4472,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "wk" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TurretsNorth) "wo" = ( @@ -4514,7 +4514,7 @@ /turf/simulated/floor/mineral/plastitanium/red/airless, /area/awaymission/BMPship/TraderShuttle) "wB" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/BMPship/CommonArea) "wG" = ( @@ -4693,7 +4693,7 @@ /area/awaymission/BMPship/Containment) "ye" = ( /obj/effect/decal/cleanable/ash, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /mob/living/simple_animal/hostile/carp{ maxHealth = 50; name = "Annoyed space carp"; @@ -4721,7 +4721,7 @@ /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) "yv" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/wall/indestructible/whiteshuttle, /area/awaymission/BMPship/Fore) "yw" = ( @@ -4786,7 +4786,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) "zb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/engine/vacuum, /area/awaymission/BMPship/Buffer) "zf" = ( @@ -4931,7 +4931,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/BMPship/Armory) "AI" = ( @@ -4969,7 +4969,7 @@ /area/awaymission/BMPship/TraderShuttle) "AW" = ( /obj/effect/decal/cleanable/ash, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "AZ" = ( @@ -5021,7 +5021,7 @@ /turf/simulated/floor/vault, /area/awaymission/BMPship/Fore) "BC" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/ash, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Mining) @@ -5046,7 +5046,7 @@ /obj/structure/window/reinforced{ color = "green" }, -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil/yellow, /turf/simulated/floor/plasteel{ dir = 6; @@ -5372,7 +5372,7 @@ }, /area/awaymission/BMPship/CommonArea) "EA" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkyellowalt" @@ -5495,7 +5495,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Gate) "FQ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/spider/stickyweb, /turf/simulated/floor/plasteel{ icon_state = "darkredaltstrip" @@ -5697,7 +5697,7 @@ /area/awaymission/BMPship/MedBay) "HE" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /mob/living/simple_animal/hostile/poison/giant_spider{ health = 250; maxHealth = 250; @@ -5795,7 +5795,7 @@ }, /area/awaymission/BMPship/CommonArea) "IF" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/shard{ icon_state = "small" }, @@ -5809,7 +5809,7 @@ name = "MAXIMUM ATTENTION"; pixel_x = -32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/awaymission/BMPship/CommonArea) "IH" = ( @@ -5857,7 +5857,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) "Jh" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/mounted/frame/apc_frame, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TurretsNorth) @@ -5925,7 +5925,7 @@ /obj/item/shard{ icon_state = "small" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TraderShuttle) "KF" = ( @@ -6171,7 +6171,7 @@ "ND" = ( /obj/item/stack/ore/iron, /obj/effect/decal/cleanable/ash, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TraderShuttle) "NI" = ( @@ -6196,7 +6196,7 @@ /area/awaymission/BMPship/Containment) "Oj" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/firealarm/no_alarm/directional/north, /obj/structure/spider/stickyweb, /obj/structure/spider/stickyweb, @@ -6245,7 +6245,7 @@ }, /area/awaymission/BMPship/Engines) "OS" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TraderShuttle) "OU" = ( @@ -6423,7 +6423,7 @@ /obj/item/shard{ icon_state = "medium" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TraderShuttle) "QQ" = ( @@ -6494,7 +6494,7 @@ }, /area/awaymission/BMPship/CommonArea) "Rk" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/BMPship/TurretsNorth) "Rm" = ( @@ -6504,7 +6504,7 @@ /turf/simulated/floor/wood/oak, /area/awaymission/BMPship/Fore) "Rn" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/wall/indestructible/whiteshuttle, /area/awaymission/BMPship/MedBay) "RB" = ( @@ -6532,7 +6532,7 @@ /area/awaymission/BMPship/Buffer) "RK" = ( /obj/structure/girder, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TraderShuttle) "Sd" = ( @@ -6568,12 +6568,12 @@ /area/awaymission/BMPship/MedBay) "Sn" = ( /obj/effect/decal/cleanable/ash, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TraderShuttle) "Sq" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -6667,7 +6667,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "TJ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/wall/r_wall, /area/awaymission/BMPship/Containment) "TM" = ( @@ -6707,7 +6707,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "Ug" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/wall/indestructible/whiteshuttle, /area/awaymission/BMPship/Armory) "Uh" = ( @@ -6720,7 +6720,7 @@ /area/awaymission/BMPship/Containment) "Uj" = ( /obj/item/shard, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/TraderShuttle) "Un" = ( @@ -6835,7 +6835,7 @@ /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) "Vw" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/spider/stickyweb, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -6876,16 +6876,16 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) "VO" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/clothing/mask/gas/explorer, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Mining) "VQ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/BMPship/Gate) "VV" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/wall/indestructible/whiteshuttle, /area/awaymission/BMPship/TurretsNorth) "VX" = ( @@ -6954,7 +6954,7 @@ pixel_y = 32 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/engine, /area/awaymission/BMPship/Armory) "Xa" = ( @@ -7161,7 +7161,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/BMPship/Containment) "YX" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/tile/plasteel, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Fore) @@ -7206,7 +7206,7 @@ /turf/simulated/floor/engine, /area/awaymission/BMPship/Containment) "ZB" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/MedBay) diff --git a/_maps/map_files220/RandomZLevels/blackmesa.dmm b/_maps/map_files220/RandomZLevels/blackmesa.dmm index a0ef94ba7dcd2..993765d6f6176 100644 --- a/_maps/map_files220/RandomZLevels/blackmesa.dmm +++ b/_maps/map_files220/RandomZLevels/blackmesa.dmm @@ -123,7 +123,7 @@ /area/awaymission/black_mesa/entrance_lobby) "alh" = ( /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/employee_dorm_room) "alo" = ( @@ -461,8 +461,8 @@ /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/black_mesa/xen/vortigaunt_village_nihilanth) "aED" = ( -/obj/effect/landmark/damageturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/gibspawner/human, /turf/simulated/floor/plating, /area/awaymission/black_mesa/hecu_zone_infirmary) @@ -533,7 +533,7 @@ }, /area/awaymission/black_mesa/deep_sci_turret) "aKG" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/awaymission/black_mesa/cryo_room) "aKT" = ( @@ -570,7 +570,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_medbay) "aOq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/black_ops_entrance) "aOA" = ( @@ -732,7 +732,7 @@ /turf/simulated/floor/plating/ironsand, /area/awaymission/black_mesa) "aYk" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/hecu_zone_external_hall) @@ -977,7 +977,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/hecu_zone_external_sec) "bry" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/smooth{ icon_state = "smooth_large" }, @@ -1044,12 +1044,12 @@ /turf/simulated/floor/plating, /area/awaymission/black_mesa/hecu_zone_camp) "buj" = ( -/obj/effect/landmark/damageturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/hecu_zone_external_hall) "bun" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_hallway) "buK" = ( @@ -1214,7 +1214,7 @@ /area/awaymission/black_mesa/high_security_hallway) "bEF" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/railing{ dir = 1 }, @@ -1468,7 +1468,7 @@ /area/awaymission/black_mesa/lambda_teleporter) "bOB" = ( /obj/item/aicard, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_feesh) "bPs" = ( @@ -1556,7 +1556,7 @@ /area/awaymission/black_mesa/hecu_zone_camp) "bSp" = ( /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa) "bTt" = ( @@ -1714,7 +1714,7 @@ /area/awaymission/black_mesa/xen/freeman_puzzle) "cdE" = ( /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/high_security_servers) "cdV" = ( @@ -1763,12 +1763,12 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/hecu_zone_test_chambers) "ciE" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/ammo_box/magazine/enforcer/lethal, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/cryo_storage) "ciM" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/machinery/light_construct/directional/north, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/xen/lost_camp) @@ -2010,7 +2010,7 @@ /turf/simulated/floor/mineral/titanium, /area/awaymission/black_mesa/entrance) "cuC" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/storage/firstaid/ancient, /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/black_mesa/xen/vortigaunt_village) @@ -2150,7 +2150,7 @@ /area/awaymission/black_mesa/science_labs) "cFH" = ( /obj/structure/chair/office/dark, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_servers) @@ -2215,8 +2215,8 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_surgery) "cKB" = ( -/obj/effect/landmark/damageturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/hecu_zone_infirmary) "cKL" = ( @@ -2371,7 +2371,7 @@ /area/awaymission/black_mesa/hecu_zone_bathroom) "cUv" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_hallway) "cUI" = ( @@ -2407,7 +2407,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_turret) "cXa" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/employee_dorm_room) "cXr" = ( @@ -3281,7 +3281,7 @@ /area/awaymission/black_mesa/entrance_large_office) "dYH" = ( /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/high_security_hallway) "dZj" = ( @@ -3480,7 +3480,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/genetics) "eji" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_feesh) "ejL" = ( @@ -3919,7 +3919,7 @@ "eLv" = ( /obj/effect/gibspawner/human, /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/employee_dorm_room) "eLD" = ( @@ -3941,7 +3941,7 @@ /turf/simulated/floor/plating, /area/awaymission/black_mesa/security_outpost) "eMu" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_medbay) "eMQ" = ( @@ -4186,7 +4186,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/hecu_zone_atrium) "feI" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/hecu_zone_external_hall) "feK" = ( @@ -4272,7 +4272,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_lobby) "fiC" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/food/meat, /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/black_mesa/xen/vortigaunt_village) @@ -4282,7 +4282,7 @@ /area/awaymission/black_mesa/deep_sci_medbay) "fjl" = ( /obj/machinery/light/directional/south, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/tram_room) @@ -4319,7 +4319,7 @@ /area/awaymission/black_mesa/tram_tunnel) "flK" = ( /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/railing{ dir = 4 }, @@ -4553,7 +4553,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/hecu_zone_external_sec) "fBh" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/cryo_room) @@ -4610,7 +4610,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_storage) "fDF" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/high_security_servers) "fDU" = ( @@ -4801,7 +4801,7 @@ /area/awaymission/black_mesa/security_outpost) "fQV" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/high_security_hallway) "fRD" = ( @@ -5167,7 +5167,7 @@ /turf/simulated/floor/plating/xen, /area/awaymission/black_mesa/xen/acid_lake_hallway) "goD" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/salvage/ruin/brick, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_servers) @@ -5273,7 +5273,7 @@ /area/awaymission/black_mesa/high_security_emitter) "gvl" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mob_spawn/human/corpse/damaged, /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel/smooth, @@ -5425,7 +5425,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/entrance_internal_hall) "gBL" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/ammo_box/magazine/enforcer/lethal, /obj/item/ammo_box/shotgun/buck, /obj/effect/decal/cleanable/dirt, @@ -5486,7 +5486,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_turret) "gHe" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/hecu_zone_infirmary) "gHk" = ( @@ -5740,7 +5740,7 @@ /turf/simulated/floor/plating/xen, /area/awaymission/black_mesa/xen/vortigaunt_village) "gXU" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/glass, /obj/structure/chair/office/dark{ dir = 4 @@ -5919,7 +5919,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_hallway) "hiI" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/flashlight, /turf/simulated/floor/plating, /area/awaymission/black_mesa/entrance_tunnel) @@ -6276,7 +6276,7 @@ }, /area/awaymission/black_mesa/scientist_hall) "hIO" = ( -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_2" }, /turf/simulated/floor/plating, @@ -6364,7 +6364,7 @@ "hOh" = ( /obj/item/ammo_box/magazine/enforcer/lethal, /obj/item/ammo_box/magazine/enforcer/lethal, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /turf/simulated/floor/plating, /area/awaymission/black_mesa/science_internal) "hOn" = ( @@ -6673,7 +6673,7 @@ /area/awaymission/black_mesa/xen/lost_camp) "ilz" = ( /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/deep_sci_medbay) "ilL" = ( @@ -6867,7 +6867,7 @@ }, /area/awaymission/black_mesa/deep_sci_hall) "iAP" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/kitchen/knife/combat, /turf/simulated/floor/plating, /area/awaymission/black_mesa/entrance_tunnel) @@ -7202,7 +7202,7 @@ /area/awaymission/black_mesa/employee_dorm_room) "iUe" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light_construct/directional/west, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_hallway) @@ -7273,7 +7273,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_lobby) "iXT" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/stack/rods, /obj/effect/gibspawner/human, /turf/simulated/floor/plating, @@ -7376,7 +7376,7 @@ /turf/simulated/wall/indestructible/rock/mineral, /area/awaymission/black_mesa/xen/village_hallway) "jgb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/smooth{ icon_state = "smooth_large" }, @@ -7494,7 +7494,7 @@ /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/xen/acid_lake_building) "jka" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/food/fancy/doshik_spicy, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_storage) @@ -7715,7 +7715,7 @@ /area/awaymission/black_mesa/hecu_zone_camp) "jxZ" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mob_spawn/human/corpse/damaged, /obj/effect/gibspawner/human, /turf/simulated/floor/plating, @@ -7920,7 +7920,7 @@ /area/awaymission/black_mesa/science_labs) "jKh" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_servers) "jKr" = ( @@ -8027,7 +8027,7 @@ /area/awaymission/black_mesa/xen/vortigaunt_village_nihilanth) "jRH" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/gibspawner/human, /turf/simulated/floor/plating, /area/awaymission/black_mesa/deep_sci_medbay) @@ -8074,7 +8074,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_lobby) "jVr" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/sign/securearea{ pixel_x = 32 }, @@ -8139,7 +8139,7 @@ /area/awaymission/black_mesa/entrance_internal_hall) "jZT" = ( /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/railing, /turf/simulated/floor/plating, /area/awaymission/black_mesa/high_security_servers) @@ -8274,7 +8274,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_lobby) "kfX" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_servers) @@ -8307,7 +8307,7 @@ /area/awaymission/black_mesa/xen/village_hallway) "khN" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/railing/corner, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_servers) @@ -8335,7 +8335,7 @@ /turf/simulated/floor/plating, /area/awaymission/black_mesa/xen/lost_camp) "kiu" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/flora/rock/pile, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/tram_room) @@ -8486,7 +8486,7 @@ /area/awaymission/black_mesa/high_security_servers) "krR" = ( /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/railing{ dir = 1 }, @@ -8703,7 +8703,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/dorm_computers) "kEO" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/deep_sci_hall) "kFR" = ( @@ -8768,7 +8768,7 @@ /turf/simulated/floor/plating, /area/awaymission/black_mesa/hecu_zone_tunnel) "kMr" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/cryo_storage) "kMu" = ( @@ -8994,7 +8994,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/hecu_zone_atrium) "kYD" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/black_ops_downstairs_atrium) "kZm" = ( @@ -9118,7 +9118,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_lobby) "ljT" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/hecu_zone_infirmary) "lkl" = ( @@ -9202,7 +9202,7 @@ /area/awaymission/black_mesa/black_ops_entrance) "lnj" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/employee_dorm_room) "lnI" = ( @@ -9313,7 +9313,7 @@ "lte" = ( /obj/machinery/light_construct/directional/east, /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/deep_sci_medbay) "ltj" = ( @@ -9595,7 +9595,7 @@ /turf/simulated/floor/plating/ironsand, /area/awaymission/black_mesa/hecu_zone_towards_facility) "lIs" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/cryo_room) "lIL" = ( @@ -9669,7 +9669,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/cryo_room) "lNH" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/blood/old, /obj/item/assembly/signaler/anomaly/pyro, /turf/simulated/floor/plasteel, @@ -10049,7 +10049,7 @@ /area/awaymission/black_mesa/equipment_room) "mmv" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/salvage/ruin/brick, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_servers) @@ -10305,7 +10305,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/lambda_teleporter) "mFF" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/hecu_zone_external_hall) "mFY" = ( @@ -10348,8 +10348,8 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_hallway) "mJu" = ( -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/hecu_zone_infirmary) "mJw" = ( @@ -10450,8 +10450,8 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/cryo_room) "mOG" = ( -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/hecu_zone_external_hall) "mOJ" = ( @@ -10558,7 +10558,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/hecu_zone_atrium) "mTm" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_medbay) @@ -10819,7 +10819,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/black_ops_armory) "nhf" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mob_spawn/human/corpse/damaged, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel/smooth, @@ -11119,7 +11119,7 @@ /area/awaymission/black_mesa/high_security_servers) "nAw" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/deep_sci_hall) "nAy" = ( @@ -11272,7 +11272,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/employee_dorm_room) "nKH" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/employee_dorm_room) "nLg" = ( @@ -11385,7 +11385,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/cryo_room) "nSk" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel/stairs/left{ dir = 4 @@ -11504,7 +11504,7 @@ }, /area/awaymission/black_mesa/entrance_lobby) "nZK" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/stack/rods, /turf/simulated/floor/plating, /area/awaymission/black_mesa/cryo_room) @@ -11758,7 +11758,7 @@ /turf/simulated/floor/mineral/titanium, /area/awaymission/black_mesa/entrance) "oon" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/xen/lost_camp) "ooy" = ( @@ -11850,7 +11850,7 @@ /area/awaymission/black_mesa/deep_sci_chem) "ouG" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/employee_dorm_room) "ouJ" = ( @@ -11876,7 +11876,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/cryo_storage) "owC" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_servers) "owG" = ( @@ -12003,7 +12003,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/security_outpost) "oFm" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/tram_room) "oFn" = ( @@ -12074,7 +12074,7 @@ /area/awaymission/black_mesa/tram_tunnel) "oHU" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/stairs/left{ dir = 4 }, @@ -12239,7 +12239,7 @@ /turf/simulated/floor/catwalk, /area/awaymission/black_mesa/xen/acid_lake) "oQS" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/kitchen/knife/combat/survival/bone, /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/black_mesa/xen/vortigaunt_village_nihilanth) @@ -12259,7 +12259,7 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_servers) "oSj" = ( @@ -12772,7 +12772,7 @@ "pxs" = ( /obj/machinery/light_construct/directional/east, /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_servers) "pxF" = ( @@ -13290,7 +13290,7 @@ /area/awaymission/black_mesa/security_outpost) "qgG" = ( /obj/item/ammo_box/n762, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_feesh) "qhG" = ( @@ -13338,11 +13338,11 @@ }, /area/awaymission/black_mesa/entrance_internal_hall) "qjE" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/catwalk, /area/awaymission/black_mesa/deep_sci_hall) "qjI" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light_construct/directional/west, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_servers) @@ -13419,7 +13419,7 @@ /turf/simulated/floor/beach/away/water/deep/xen, /area/awaymission/black_mesa/xen/acid_lake_hallway) "qoz" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/deep_sci_medbay) "qpe" = ( @@ -13442,7 +13442,7 @@ /area/awaymission/black_mesa/xen/lost_camp) "qqB" = ( /obj/effect/mob_spawn/human/corpse/charredskeleton, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/awaymission/black_mesa/cryo_room) "qqP" = ( @@ -13656,7 +13656,7 @@ /area/awaymission/black_mesa/security_outpost) "qEe" = ( /obj/machinery/light/directional/west, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/employee_dorm_room) "qEj" = ( @@ -13915,7 +13915,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_large_office) "qPE" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/food/fancy/doshik, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_storage) @@ -14257,7 +14257,7 @@ /turf/simulated/floor/plating, /area/awaymission/black_mesa/resonant_chamber) "rmQ" = ( -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_2" }, /turf/simulated/floor/plasteel/smooth, @@ -14425,7 +14425,7 @@ /area/awaymission/black_mesa/entrance_internal_hall) "rzP" = ( /obj/item/ammo_box/magazine/enforcer/lethal, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/employee_dorm_room) "rAG" = ( @@ -14699,12 +14699,12 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_lobby) "rPN" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/cryo_room) "rQk" = ( /obj/machinery/light/directional/east, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/smooth{ icon_state = "smooth_large" }, @@ -14713,7 +14713,7 @@ /turf/simulated/wall/indestructible/rock/mineral/xen, /area/awaymission/black_mesa/xen/village_hallway) "rQu" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/black_ops_entrance) "rQO" = ( @@ -14846,7 +14846,7 @@ /area/awaymission/black_mesa/deep_sci_chem) "rZF" = ( /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/deep_sci_hall) "rZJ" = ( @@ -14947,7 +14947,7 @@ }, /area/awaymission/black_mesa/high_security_hallway) "sfi" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/clothing/under/pants/shorts/red, /obj/item/stack/spacecash/c1000, /obj/item/ammo_box/shotgun/buck, @@ -14976,7 +14976,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/hecu_zone_atrium) "sgF" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/fireaxe, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/cryo_storage) @@ -16042,7 +16042,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/hecu_zone_external_sec) "tBV" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/landmark/awaymissions/black_mesa/random_mob_placer, /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel/smooth, @@ -16168,7 +16168,7 @@ /turf/simulated/wall/indestructible/rock/mineral, /area/awaymission/black_mesa/science_labs) "tIM" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/stairs/right{ dir = 4 }, @@ -16257,14 +16257,14 @@ /turf/simulated/floor/plasteel/white, /area/awaymission/black_mesa/hecu_zone_camp) "tNR" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/salvage/ruin/brick, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/tram_room) "tON" = ( /obj/structure/table_frame, /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/deep_sci_medbay) "tPQ" = ( @@ -16615,7 +16615,7 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/tram_room) "urb" = ( @@ -16691,7 +16691,7 @@ /turf/simulated/floor/plating/xen, /area/awaymission/black_mesa/xen/lost_camp) "uuS" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/landmark/awaymissions/black_mesa/random_mob_placer, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/hecu_zone_external_hall) @@ -17163,7 +17163,7 @@ /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/hecu_zone_camp) "uUV" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/pickaxe/silver, /turf/simulated/floor/plasteel/smooth{ icon_state = "smooth_large" @@ -17264,7 +17264,7 @@ "vdm" = ( /obj/item/ammo_box/magazine/wt550m9, /obj/item/ammo_box/magazine/wt550m9, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /turf/simulated/floor/plating, /area/awaymission/black_mesa/science_internal) "vdn" = ( @@ -17288,7 +17288,7 @@ }, /area/awaymission/black_mesa/science_internal) "vdy" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/stack/spacecash/c1000, /obj/item/stack/spacecash/c1000, /obj/effect/decal/cleanable/dirt, @@ -17428,7 +17428,7 @@ /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/hecu_zone_camp) "vlH" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -17592,7 +17592,7 @@ /area/awaymission/black_mesa/lambda_teleporter) "vxK" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/smooth{ icon_state = "smooth_large" }, @@ -17723,7 +17723,7 @@ /area/awaymission/black_mesa/security_outpost) "vHh" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/high_security_servers) "vHz" = ( @@ -18074,7 +18074,7 @@ "wde" = ( /obj/machinery/light/directional/west, /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/high_security_servers) "weJ" = ( @@ -18423,7 +18423,7 @@ /turf/simulated/floor/plating, /area/awaymission/black_mesa/resonant_chamber) "wAc" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/ash, /turf/simulated/floor/plating, /area/awaymission/black_mesa/cryo_room) @@ -19264,7 +19264,7 @@ }, /area/awaymission/black_mesa/resonant_chamber) "xxB" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/stack/spacecash/c1000, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/black_ops_downstairs_atrium) @@ -19427,7 +19427,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/employee_dorm_room) "xKX" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/food/beans, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_storage) @@ -19490,7 +19490,7 @@ /area/awaymission/black_mesa/hecu_zone_atrium) "xQU" = ( /obj/structure/table_frame, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/stack/sheet/metal{ amount = 40 }, @@ -19535,7 +19535,7 @@ /turf/simulated/floor/chasm/straight_down/lava_land_surface/normal_air/normal_temp, /area/awaymission/black_mesa/entrance) "xTU" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/high_security_hallway) "xUr" = ( @@ -19657,7 +19657,7 @@ "xZJ" = ( /obj/effect/gibspawner/human, /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/black_mesa/employee_dorm_room) "xZT" = ( diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm index 689743ab5bbc4..c175a28064240 100644 --- a/_maps/map_files220/RandomZLevels/caves.dmm +++ b/_maps/map_files220/RandomZLevels/caves.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "ac" = ( @@ -17,7 +17,7 @@ /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/shreds, /obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/carpet/green, /area/awaymission/caves/build/reqpower_build) "af" = ( @@ -36,7 +36,7 @@ pixel_y = 5 }, /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -46,7 +46,7 @@ /obj/structure/chair/sofa/right{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "al" = ( @@ -61,7 +61,7 @@ /obj/structure/table/wood, /obj/item/newspaper, /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "an" = ( @@ -72,7 +72,7 @@ }, /area/awaymission/caves/build/reqpower_build) "ao" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build) "ap" = ( @@ -82,13 +82,13 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "as" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/awaymission/caves/build/reqpower_build) "au" = ( /obj/effect/decal/cleanable/glass/plasma, -/obj/effect/landmark/damageturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/shard, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) @@ -105,7 +105,7 @@ /area/awaymission/caves) "aw" = ( /obj/structure/curtain/black, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredcornersalt" }, @@ -116,12 +116,12 @@ icon_state = "destroyed_target_prism" }, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "aD" = ( /obj/machinery/optable, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -156,7 +156,7 @@ /area/awaymission/caves/build) "aH" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "aJ" = ( @@ -164,7 +164,7 @@ req_access = list(271); opened = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) @@ -191,24 +191,24 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "aV" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "aW" = ( /obj/structure/cult/archives, /obj/item/spellbook/oneuse/fake_gib, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "aX" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/salvage/ruin/tablet, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "aY" = ( /obj/item/stock_parts/micro_laser, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -221,7 +221,7 @@ /obj/effect/turf_decal{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/east, /obj/item/salvage/ruin/nanotrasen, /turf/simulated/floor/plasteel/dark{ @@ -235,7 +235,7 @@ /area/awaymission/caves) "bd" = ( /obj/structure/constructshell, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) @@ -246,12 +246,12 @@ }, /obj/item/organ/external/chest, /obj/effect/gibspawner/human, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "bf" = ( -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 1; icon_state = "darkredaltstrip" @@ -261,12 +261,12 @@ /obj/structure/fluff/divine/conduit{ icon_state = "nexus-red" }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "bh" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 4; icon_state = "darkredalt" @@ -274,7 +274,7 @@ /area/awaymission/caves/build/reqpower_build) "bi" = ( /obj/effect/decal/cleanable/blood/gibs/body, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 8; icon_state = "darkredalt" @@ -282,7 +282,7 @@ /area/awaymission/caves/build/reqpower_build) "bk" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -295,13 +295,13 @@ dir = 4 }, /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "bo" = ( /obj/structure/curtain/black, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredcornersalt"; dir = 8 @@ -320,7 +320,7 @@ /obj/structure/door_assembly/door_assembly_min{ anchored = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "bw" = ( @@ -351,16 +351,16 @@ "bE" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "bG" = ( /obj/structure/flora/rock/pile, /obj/item/stack/sheet/metal, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 4; icon_state = "darkredalt" @@ -378,7 +378,7 @@ /area/awaymission/caves) "bM" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -399,7 +399,7 @@ /obj/item/stack/cable_coil{ amount = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/west, /turf/simulated/floor/plasteel{ dir = 4; @@ -416,7 +416,7 @@ /area/awaymission/caves/build/reqpower_build) "bS" = ( /obj/item/reagent_containers/iv_bag/salglu, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/stack/rods, /turf/simulated/floor/plasteel{ dir = 4; @@ -425,7 +425,7 @@ /area/awaymission/caves/build/reqpower_build) "bT" = ( /obj/item/stack/rods, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -443,7 +443,7 @@ /obj/item/toy/character/wizard{ pixel_y = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/food/grown/apple/poisoned, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) @@ -455,8 +455,8 @@ /obj/effect/turf_decal/siding/wood/neutral/corner{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "ca" = ( @@ -466,17 +466,17 @@ /area/awaymission/caves) "cc" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "cg" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /mob/living/simple_animal/pet/cat/Runtime{ name = "Witches Familiar"; desc = "A witch!"; maxbodytemp = 500 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "ci" = ( @@ -487,7 +487,7 @@ dir = 5 }, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/solgov_logo{ icon_state = "sol_logo20" }, @@ -502,7 +502,7 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "ck" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/crowbar, /obj/item/salvage/ruin/brick, /turf/simulated/floor/wood/lavaland_air, @@ -522,7 +522,7 @@ /obj/structure/toilet{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -533,8 +533,8 @@ /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "cs" = ( -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -550,25 +550,25 @@ pixel_x = 6 }, /obj/item/pen, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "cv" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 4; icon_state = "darkredalt" }, /area/awaymission/caves/build/reqpower_build) "cz" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, /area/awaymission/caves) "cA" = ( /obj/effect/decal/cleanable/shreds, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/east, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) @@ -603,8 +603,8 @@ /obj/structure/sign/fire{ pixel_x = 32 }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "cF" = ( @@ -626,7 +626,7 @@ /obj/structure/sign/securearea{ pixel_y = -30 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -652,7 +652,7 @@ /area/awaymission/caves) "cW" = ( /obj/structure/dresser, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/south, /turf/simulated/floor/carpet/purple, /area/awaymission/caves/build/reqpower_build) @@ -665,7 +665,7 @@ /obj/structure/stone_tile/slab/cracked{ dir = 1 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "da" = ( @@ -678,7 +678,7 @@ /area/awaymission/caves) "db" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "dd" = ( @@ -705,7 +705,7 @@ dir = 4 }, /obj/effect/turf_decal/delivery/hollow, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 10; icon_state = "darkredalt" @@ -719,12 +719,12 @@ dir = 5 }, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "dk" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "do" = ( @@ -767,16 +767,16 @@ /area/awaymission/caves) "du" = ( /obj/structure/flora/rock/pile, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredcornersalt" }, /area/awaymission/caves/build/reqpower_build) "dw" = ( /obj/structure/girder, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "dz" = ( @@ -807,24 +807,24 @@ /obj/structure/closet, /obj/item/clothing/suit/browntrenchcoat, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/stack/spacecash/c20, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "dG" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, /area/awaymission/caves) "dI" = ( /obj/machinery/atmospherics/unary/tank/oxygen, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "dP" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "dQ" = ( @@ -836,7 +836,7 @@ anchored = 1 }, /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -845,8 +845,8 @@ /obj/structure/sign/biohazard{ pixel_y = -30 }, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "dS" = ( @@ -857,7 +857,7 @@ }, /obj/item/flashlight/lamp, /obj/effect/turf_decal/siding/wood/neutral, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "dU" = ( @@ -868,7 +868,7 @@ /obj/structure/bed, /obj/item/bedsheet/green, /obj/structure/curtain/black, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/carpet/purple, /area/awaymission/caves/build/reqpower_build) "dX" = ( @@ -893,12 +893,12 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "ef" = ( /obj/structure/sink/directional/west, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/stack/rods, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" @@ -909,7 +909,7 @@ icon_state = "comp_frame_2" }, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -917,7 +917,7 @@ /area/awaymission/caves/build/reqpower_build) "ek" = ( /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -925,7 +925,7 @@ /area/awaymission/caves/build/reqpower_build) "eo" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -934,7 +934,7 @@ "eq" = ( /obj/structure/table/wood/fancy/black, /obj/item/tome, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) @@ -945,12 +945,12 @@ "ew" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/light/small/directional/east, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "eA" = ( /obj/item/stack/sheet/metal, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/dark{ dir = 5; icon_state = "darkredaltstrip" @@ -958,7 +958,7 @@ /area/awaymission/caves/build/reqpower_build) "eB" = ( /obj/structure/railing, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" }, @@ -968,7 +968,7 @@ /obj/structure/fence{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -986,12 +986,12 @@ }, /obj/item/mining_scanner, /obj/item/mining_voucher, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "eG" = ( /obj/item/kirbyplants, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/north, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) @@ -999,7 +999,7 @@ /mob/living/simple_animal/hostile/abomination/altform4{ maxbodytemp = 1500 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 4; icon_state = "darkredalt" @@ -1014,7 +1014,7 @@ /mob/living/simple_animal/hostile/abomination/altform1{ maxbodytemp = 1500 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "eO" = ( @@ -1030,7 +1030,7 @@ dir = 8 }, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/turf_decal/miscellaneous/goldensiding{ dir = 4 }, @@ -1045,7 +1045,7 @@ "eR" = ( /obj/effect/decal/cleanable/generic, /obj/machinery/light_construct/small/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/remains/robot, /turf/simulated/floor/plasteel, /area/awaymission/caves/build) @@ -1060,14 +1060,14 @@ dir = 4 }, /obj/item/bikehorn/rubberducky, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/awaymission/caves/build/reqpower_build) "eZ" = ( /obj/structure/curtain/black, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -1075,7 +1075,7 @@ /area/awaymission/caves/build/reqpower_build) "fa" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/stack/medical/splint, /obj/item/stack/medical/splint, /turf/simulated/floor/plasteel/lavaland_air{ @@ -1091,7 +1091,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "fc" = ( @@ -1101,14 +1101,14 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "fe" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dust, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "ff" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plasteel{ dir = 4; @@ -1126,7 +1126,7 @@ anchored = 1 }, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "fl" = ( @@ -1138,7 +1138,7 @@ /area/awaymission/caves) "fm" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -1162,7 +1162,7 @@ }, /obj/structure/coatrack, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "fs" = ( @@ -1171,8 +1171,8 @@ pixel_x = 9; pixel_y = -9 }, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "fu" = ( @@ -1183,12 +1183,12 @@ /area/awaymission/caves) "fw" = ( /obj/item/storage/firstaid/brute/empty, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves/build) "fz" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -1233,18 +1233,18 @@ /obj/effect/turf_decal/siding/wood/neutral/corner{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "fQ" = ( /obj/structure/table_frame, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "fS" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "elevatorshaft" }, @@ -1258,8 +1258,8 @@ /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "fV" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/solgov_logo{ icon_state = "sol_logo19" }, @@ -1273,15 +1273,15 @@ opened = 1 }, /obj/item/clothing/mask/breath, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" }, /area/awaymission/caves/build/reqpower_build) "fX" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 6; icon_state = "darkredalt" @@ -1289,7 +1289,7 @@ /area/awaymission/caves/build/reqpower_build) "ga" = ( /obj/structure/closet/l3closet/general, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -1317,7 +1317,7 @@ "gg" = ( /obj/structure/table, /obj/item/mod/module/visor/night, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "gh" = ( @@ -1328,7 +1328,7 @@ /obj/structure/closet/crate/freezer{ opened = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -1336,7 +1336,7 @@ /area/awaymission/caves/build/reqpower_build) "gk" = ( /obj/structure/dresser, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/north, /turf/simulated/floor/carpet/purple, /area/awaymission/caves/build/reqpower_build) @@ -1363,14 +1363,14 @@ "gq" = ( /obj/effect/turf_decal/delivery, /obj/structure/ore_box, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, /area/awaymission/caves/build) "gs" = ( /obj/item/stack/sheet/metal, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "gu" = ( @@ -1379,7 +1379,7 @@ icon_screen = "broken"; icon_keyboard = "generic_key_broken" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 4; @@ -1392,21 +1392,16 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "gB" = ( /obj/item/salvage/ruin/nanotrasen, /turf/simulated/floor/plasteel, /area/awaymission/caves/build) -"gC" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/turf/simulated/floor/wood/lavaland_air, -/obj/effect/landmark/damageturf, -/area/awaymission/caves) "gI" = ( /obj/item/rack_parts, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -1424,7 +1419,7 @@ /area/awaymission/caves/build/reqpower_build) "gN" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 4; icon_state = "darkredalt" @@ -1446,7 +1441,7 @@ /obj/item/storage/box/handcuffs{ pixel_x = -9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 8; icon_state = "darkredalt" @@ -1454,19 +1449,19 @@ /area/awaymission/caves/build/reqpower_build) "hb" = ( /obj/structure/flora/rock, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "hd" = ( /obj/item/storage/firstaid/surgery, /obj/structure/spider/stickyweb, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves/build) "he" = ( -/obj/machinery/constructable_frame/machine_frame{ +/obj/structure/machine_frame{ icon_state = "box_2" }, /obj/effect/decal/cleanable/cobweb, @@ -1497,7 +1492,7 @@ pixel_x = 9; pixel_y = -9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/east, /turf/simulated/floor/plasteel{ dir = 4; @@ -1513,7 +1508,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "hp" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/salvage/ruin/brick, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) @@ -1555,7 +1550,7 @@ "hG" = ( /obj/item/shard/plasma, /obj/effect/decal/cleanable/glass/plasma, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "hH" = ( @@ -1571,12 +1566,12 @@ /area/awaymission/caves) "hI" = ( /obj/effect/decal/cleanable/blood/gibs/down, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "hJ" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "hL" = ( @@ -1595,7 +1590,7 @@ /obj/structure/stone_tile/slab/cracked{ dir = 9 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "hP" = ( @@ -1638,13 +1633,13 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "hZ" = ( -/obj/machinery/constructable_frame/machine_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, /obj/item/stack/cable_coil{ amount = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -1652,7 +1647,7 @@ /area/awaymission/caves/build/reqpower_build) "ie" = ( /obj/machinery/light/small/directional/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/turf_decal/arrows{ dir = 8 }, @@ -1662,7 +1657,7 @@ /area/awaymission/caves/build) "if" = ( /obj/item/kirbyplants, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "ig" = ( @@ -1686,7 +1681,7 @@ }, /obj/structure/table, /obj/item/storage/fancy/donut_box, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -1694,14 +1689,14 @@ /area/awaymission/caves/build/reqpower_build) "ij" = ( /obj/machinery/light_construct/small/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, /area/awaymission/caves) "ik" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 5; icon_state = "darkredalt" @@ -1710,7 +1705,7 @@ "ip" = ( /obj/structure/railing, /obj/structure/sink/directional/east, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" }, @@ -1724,12 +1719,12 @@ /obj/structure/spider/stickyweb, /obj/machinery/iv_drip, /obj/item/storage/firstaid/toxin, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves/build) "iu" = ( /obj/item/flag/solgov, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -1754,7 +1749,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "iy" = ( @@ -1762,7 +1757,7 @@ pixel_y = -15; pixel_x = -5 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "iA" = ( @@ -1783,7 +1778,7 @@ /area/awaymission/caves) "iD" = ( /mob/living/simple_animal/hostile/abomination, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 1; icon_state = "darkredaltstrip" @@ -1813,7 +1808,7 @@ density = 1; anchored = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/greengrid{ icon_state = "bcircuit" }, @@ -1827,7 +1822,7 @@ /area/awaymission/caves) "iM" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "iQ" = ( @@ -1842,7 +1837,7 @@ /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/ants, /obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -1850,14 +1845,14 @@ /area/awaymission/caves/build/reqpower_build) "iW" = ( /obj/structure/flora/rock/pile, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" }, /area/awaymission/caves/build/reqpower_build) "iZ" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/east, /turf/simulated/floor/plasteel/stairs/left{ dir = 1 @@ -1865,13 +1860,13 @@ /area/awaymission/caves/build/reqpower_build) "ja" = ( /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "je" = ( /obj/machinery/economy/vending/snack/free, /obj/effect/mapping_helpers/machinery/damaged, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 1; icon_state = "darkredalt" @@ -1883,15 +1878,15 @@ /area/awaymission/caves) "jh" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/landmark/awaystart, /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "ji" = ( /obj/effect/decal/cleanable/generic, /obj/machinery/light_construct/small/east, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "jm" = ( @@ -1908,7 +1903,7 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "jn" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/structure/stone_tile/slab/cracked, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) @@ -1920,7 +1915,7 @@ pixel_x = 3 }, /obj/item/reagent_containers/syringe/insulin, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/dnascrambler, /turf/simulated/floor/plasteel{ dir = 4; @@ -1932,7 +1927,7 @@ /obj/effect/turf_decal/siding/wood/neutral{ dir = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/south, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) @@ -1968,7 +1963,7 @@ /turf/simulated/floor/plating, /area/awaymission/caves/build) "jC" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/closet/crate/miningcar, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" @@ -1983,11 +1978,11 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "jF" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/dark{ dir = 6; icon_state = "darkredalt" @@ -1997,12 +1992,12 @@ /obj/effect/turf_decal/siding/wood/neutral/corner{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "jM" = ( /obj/structure/closet/radiation, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 5; icon_state = "darkredalt" @@ -2010,21 +2005,21 @@ /area/awaymission/caves/build/reqpower_build) "jN" = ( /obj/item/stack/sheet/metal, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "jP" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 8; icon_state = "darkredaltstrip" }, /area/awaymission/caves/build/reqpower_build) "jQ" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 8; icon_state = "darkredalt" @@ -2039,19 +2034,19 @@ /obj/structure/railing{ dir = 6 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "jX" = ( /obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "jY" = ( /obj/machinery/light/small/directional/south, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves/build) "jZ" = ( @@ -2063,7 +2058,7 @@ "ka" = ( /obj/effect/decal/cleanable/glass, /obj/structure/windoor_assembly, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "kc" = ( @@ -2099,7 +2094,7 @@ /obj/structure/sign/securearea{ pixel_x = -30 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "km" = ( @@ -2119,7 +2114,7 @@ pixel_x = -6; pixel_y = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/card/id/away/old{ name = "Miner's Personal ID"; pixel_x = 5 @@ -2133,7 +2128,7 @@ "kp" = ( /obj/machinery/optable, /obj/item/clothing/gloves/color/latex, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -2145,7 +2140,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "kC" = ( @@ -2155,7 +2150,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "kD" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -2168,7 +2163,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "kG" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/awaymission/caves/build) "kH" = ( @@ -2178,7 +2173,7 @@ pixel_x = -7; pixel_y = -10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "kI" = ( @@ -2193,7 +2188,7 @@ wander = 0; maxbodytemp = 1500 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "white" }, @@ -2204,7 +2199,7 @@ dir = 8 }, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "kV" = ( @@ -2234,7 +2229,7 @@ /area/awaymission/caves/build/reqpower_build) "lk" = ( /obj/item/stack/sheet/metal, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -2253,7 +2248,7 @@ /mob/living/simple_animal/hostile/abomination/altform3{ maxbodytemp = 1500 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "lp" = ( @@ -2268,14 +2263,14 @@ /area/awaymission/caves/build) "lq" = ( /obj/machinery/door/firedoor, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "lr" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/solgov_logo{ icon_state = "sol_logo9" }, @@ -2285,7 +2280,7 @@ }, /area/awaymission/caves/build/reqpower_build) "ls" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 4; icon_state = "darkredaltstrip" @@ -2323,8 +2318,8 @@ pixel_y = 5 }, /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "lx" = ( @@ -2337,7 +2332,7 @@ storage_type = null; locked = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/awaymission/caves/build) @@ -2353,7 +2348,7 @@ /obj/item/stack/cable_coil{ amount = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 9; icon_state = "darkredalt" @@ -2361,17 +2356,17 @@ /area/awaymission/caves/build/reqpower_build) "lG" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "lJ" = ( /obj/item/organ/external/chest, /obj/item/kitchen/knife/butcher, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "lL" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/chair/office/dark{ dir = 1 }, @@ -2411,7 +2406,7 @@ /area/awaymission/caves) "lU" = ( /obj/item/chair/wood, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "lV" = ( @@ -2424,8 +2419,8 @@ /area/awaymission/caves/build/reqpower_build) "lW" = ( /obj/structure/railing, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" }, @@ -2455,13 +2450,13 @@ dir = 6 }, /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "mj" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "ml" = ( @@ -2476,7 +2471,7 @@ wander = 0; maxbodytemp = 1500 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "white" }, @@ -2530,7 +2525,7 @@ /obj/structure/barricade/wooden/crude{ layer = 3.01 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "mJ" = ( @@ -2555,7 +2550,7 @@ /area/awaymission/caves) "mM" = ( /obj/item/stack/rods, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -2596,14 +2591,14 @@ "nc" = ( /obj/effect/decal/cleanable/generic, /obj/machinery/light_construct/small/east, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "ng" = ( /obj/effect/turf_decal/miscellaneous/goldensiding, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/solgov_logo{ icon_state = "sol_logo3" }, @@ -2612,20 +2607,16 @@ icon_state = "dark" }, /area/awaymission/caves/build/reqpower_build) -"nh" = ( -/turf/simulated/floor/wood/lavaland_air, -/obj/effect/landmark/damageturf, -/area/awaymission/caves) "nj" = ( /obj/structure/chair/wood/wings{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "nl" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredaltstrip" }, @@ -2635,7 +2626,7 @@ icon_state = "comp_frame_5"; dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 4; @@ -2651,12 +2642,12 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "nt" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/gibspawner/human, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "nu" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/awaymission/caves) "nv" = ( @@ -2679,7 +2670,7 @@ /area/awaymission/caves) "nB" = ( /obj/structure/bed/roller, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "white" }, @@ -2700,11 +2691,11 @@ icon_state = "conduit-red" }, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "nE" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "white" }, @@ -2724,7 +2715,7 @@ /obj/item/stack/cable_coil{ amount = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/east, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ @@ -2733,7 +2724,7 @@ }, /area/awaymission/caves/build/reqpower_build) "nJ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light_construct/small/east, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) @@ -2742,25 +2733,25 @@ /obj/machinery/power/terminal, /obj/structure/cable, /obj/machinery/light/small/directional/east, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "nN" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredcornersalt" }, /area/awaymission/caves/build/reqpower_build) "nO" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "nP" = ( /obj/structure/flora/rock/pile, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/rods, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) @@ -2770,7 +2761,7 @@ /area/awaymission/caves) "nR" = ( /obj/item/chair/stool, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "nU" = ( @@ -2789,19 +2780,19 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "nZ" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/stairs/right{ dir = 1 }, /area/awaymission/caves/build/reqpower_build) "oa" = ( /obj/structure/chair/comfy/black, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "oc" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/item/stack/rods, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" @@ -2814,14 +2805,14 @@ "om" = ( /obj/structure/flora/rock/pile, /obj/machinery/light_construct/small/south, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "oo" = ( /obj/structure/flora/rock/pile, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -2832,8 +2823,8 @@ /area/awaymission/caves) "or" = ( /obj/structure/closet/walllocker/firelocker/south, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "ot" = ( @@ -2845,11 +2836,11 @@ /area/awaymission/caves/build/reqpower_build) "ow" = ( /obj/machinery/light_construct/small/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "oz" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 1; icon_state = "darkredalt" @@ -2859,8 +2850,8 @@ /mob/living/simple_animal/hostile/abomination/super{ maxbodytemp = 1500 }, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredcornersalt"; dir = 8 @@ -2872,8 +2863,8 @@ /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "oG" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/item/radio, /turf/simulated/floor/plasteel/dark{ dir = 10; @@ -2894,7 +2885,7 @@ /area/awaymission/caves/build/reqpower_build) "oM" = ( /obj/effect/decal/cleanable/shreds, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "oN" = ( @@ -2918,7 +2909,7 @@ /area/awaymission/caves/build/reqpower_build) "oR" = ( /obj/item/stack/rods, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/salvage/ruin/nanotrasen, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) @@ -2936,7 +2927,7 @@ /obj/item/stack/cable_coil{ amount = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/west, /turf/simulated/floor/plasteel/dark{ dir = 8; @@ -2956,7 +2947,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -2970,8 +2961,8 @@ /obj/structure/table/tray, /obj/item/scalpel/laser/laser3, /obj/item/retractor, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 6; icon_state = "darkredalt" @@ -2990,14 +2981,14 @@ icon_state = "small"; pixel_x = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" }, /area/awaymission/caves/build/reqpower_build) "pi" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plasteel/dark{ @@ -3006,7 +2997,7 @@ }, /area/awaymission/caves/build/reqpower_build) "pk" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/carpet/purple, /area/awaymission/caves/build/reqpower_build) "pm" = ( @@ -3017,23 +3008,23 @@ /area/awaymission/caves) "pq" = ( /obj/effect/turf_decal/box, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" }, /area/awaymission/caves/build/reqpower_build) "pr" = ( -/obj/machinery/constructable_frame/machine_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "ps" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/salvage/ruin/brick, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "pt" = ( @@ -3047,24 +3038,24 @@ /obj/item/shard{ icon_state = "small" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "pw" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredcornersalt" }, /area/awaymission/caves/build/reqpower_build) "pB" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "pE" = ( /obj/item/stack/rods, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "pH" = ( @@ -3084,13 +3075,13 @@ /area/awaymission/caves) "pJ" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, /area/awaymission/caves) "pQ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/dark{ dir = 10; icon_state = "darkredalt" @@ -3101,7 +3092,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "pU" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/east, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) @@ -3141,7 +3132,7 @@ /area/awaymission/caves/build/reqpower_build) "qe" = ( /obj/structure/closet/l3closet/general, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/west, /turf/simulated/floor/plasteel{ dir = 8; @@ -3152,15 +3143,15 @@ /obj/structure/bed, /obj/item/bedsheet/fluff, /obj/structure/curtain/black, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/carpet/purple, /area/awaymission/caves/build/reqpower_build) "qg" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/carpet/black, /area/awaymission/caves/build/reqpower_build) "qi" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/awaymission/caves) "qj" = ( @@ -3188,13 +3179,13 @@ /obj/structure/closet, /obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "qt" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/stack/rods, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "qx" = ( @@ -3203,14 +3194,14 @@ storage_type = null; locked = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build) "qE" = ( /obj/structure/bed{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "qH" = ( @@ -3220,8 +3211,8 @@ /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "qI" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel/dark{ dir = 9; @@ -3237,8 +3228,8 @@ /area/awaymission/caves) "qP" = ( /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -3246,7 +3237,7 @@ /area/awaymission/caves/build/reqpower_build) "qQ" = ( /obj/structure/closet/firecloset/full, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "qS" = ( @@ -3261,7 +3252,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "qT" = ( @@ -3274,7 +3265,7 @@ pixel_y = 32 }, /obj/structure/closet/l3closet/general, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 1; icon_state = "darkredalt" @@ -3291,7 +3282,7 @@ /area/awaymission/caves) "qZ" = ( /obj/structure/mineral_door/wood, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "ra" = ( @@ -3302,7 +3293,7 @@ /obj/item/stack/sheet/runed_metal{ amount = 10 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) @@ -3320,7 +3311,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel{ dir = 4; @@ -3354,7 +3345,7 @@ icon_state = "4-8" }, /obj/structure/railing, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "rq" = ( @@ -3369,7 +3360,7 @@ id = "cave4_flash" }, /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -3399,8 +3390,8 @@ flickering = 1; icon_state = "candle1_flicker" }, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "rA" = ( @@ -3444,13 +3435,13 @@ dir = 4 }, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/west, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "rZ" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 10; icon_state = "darkredaltstrip" @@ -3464,7 +3455,7 @@ dir = 1 }, /obj/structure/spider/stickyweb, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "white" }, @@ -3475,19 +3466,19 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "sh" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "si" = ( -/obj/machinery/constructable_frame/machine_frame{ +/obj/structure/machine_frame{ icon_state = "box_2" }, /obj/machinery/light_construct/small/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "sj" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 9; icon_state = "darkredaltstrip" @@ -3501,7 +3492,7 @@ /obj/structure/gunrack, /obj/item/gun/energy/laser/retro, /obj/item/gun/energy/laser/retro, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ @@ -3510,17 +3501,17 @@ }, /area/awaymission/caves/build/reqpower_build) "so" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "sq" = ( /obj/item/chair/wood{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "sr" = ( @@ -3530,8 +3521,8 @@ "sw" = ( /obj/structure/spider/stickyweb, /obj/machinery/light_construct/small/east, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "sy" = ( @@ -3554,12 +3545,12 @@ /obj/structure/railing{ dir = 5 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "sF" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" }, @@ -3590,8 +3581,8 @@ /turf/simulated/floor/plating, /area/awaymission/caves/build) "sO" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/salvage/ruin/brick, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) @@ -3603,8 +3594,8 @@ /area/awaymission/caves) "sU" = ( /obj/item/storage/box/monkeycubes/neaeracubes, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "sV" = ( @@ -3640,7 +3631,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "th" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "elevatorshaft" }, @@ -3650,7 +3641,7 @@ icon_state = "trap-fire"; density = 0 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) @@ -3662,7 +3653,7 @@ flickering = 1; icon_state = "candle1_flicker" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "tm" = ( @@ -3677,7 +3668,7 @@ /area/awaymission/caves) "tn" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -3701,14 +3692,14 @@ /obj/effect/turf_decal/arrows{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, /area/awaymission/caves/build) "tw" = ( /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -3723,7 +3714,7 @@ /area/awaymission/caves) "ty" = ( /obj/structure/stone_tile/slab/cracked, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "tB" = ( @@ -3731,20 +3722,20 @@ anchored = 1 }, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "tC" = ( /obj/effect/turf_decal/stripes{ dir = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, /area/awaymission/caves) "tD" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) @@ -3752,7 +3743,7 @@ /obj/effect/turf_decal/miscellaneous/goldensiding{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/kirbyplants, /obj/structure/railing, /turf/simulated/floor/plating, @@ -3789,17 +3780,17 @@ /area/awaymission/caves) "tP" = ( /obj/item/bedsheet/blue, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "tQ" = ( /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "tT" = ( /obj/structure/dresser, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/carpet/black, /area/awaymission/caves/build/reqpower_build) "tU" = ( @@ -3818,7 +3809,7 @@ /area/awaymission/caves) "tW" = ( /obj/effect/turf_decal/delivery, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -3857,7 +3848,7 @@ /obj/effect/turf_decal/siding/wood/neutral{ dir = 6 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "ue" = ( @@ -3871,7 +3862,7 @@ /obj/item/stack/cable_coil{ amount = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "uh" = ( @@ -3887,29 +3878,29 @@ /obj/structure/bed, /obj/item/bedsheet/orange, /obj/structure/curtain/black, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/carpet/purple, /area/awaymission/caves/build/reqpower_build) "uk" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 5; icon_state = "darkredaltstrip" }, /area/awaymission/caves/build/reqpower_build) "un" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/east, /turf/simulated/floor/plasteel/stairs/right, /area/awaymission/caves/build/reqpower_build) "uo" = ( /obj/effect/decal/cleanable/ants, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "up" = ( /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) @@ -3917,15 +3908,15 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" }, /area/awaymission/caves/build/reqpower_build) "uu" = ( /obj/structure/flora/rock/pile, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 8; icon_state = "darkredalt" @@ -3933,14 +3924,14 @@ /area/awaymission/caves/build/reqpower_build) "uv" = ( /obj/effect/decal/cleanable/glass/plasma, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, /area/awaymission/caves) "ux" = ( /obj/structure/flora/rock/pile, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "uy" = ( @@ -3965,14 +3956,14 @@ /obj/effect/turf_decal/siding/wood/neutral{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "uJ" = ( /obj/structure/chair/wood{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "uL" = ( @@ -3987,7 +3978,7 @@ /obj/item/stack/cable_coil{ amount = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/greengrid{ icon_state = "bcircuit" }, @@ -4000,15 +3991,15 @@ /area/awaymission/caves) "uP" = ( /obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, /area/awaymission/caves) "uR" = ( /obj/effect/decal/cleanable/ash, -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "uS" = ( @@ -4022,7 +4013,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "uW" = ( @@ -4033,7 +4024,7 @@ /area/awaymission/caves) "uX" = ( /obj/effect/decal/cleanable/blood/gibs/old, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredaltstrip" }, @@ -4042,7 +4033,7 @@ /obj/structure/chair/office/dark{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/solgov_logo{ icon_state = "sol_logo14" }, @@ -4060,7 +4051,7 @@ /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "vc" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/portable/canister/oxygen, /turf/simulated/floor/plasteel/dark{ dir = 5; @@ -4068,7 +4059,7 @@ }, /area/awaymission/caves/build/reqpower_build) "vg" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/east, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) @@ -4076,7 +4067,7 @@ /obj/structure/bed, /obj/item/bedsheet/red, /obj/structure/curtain/black, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/carpet/purple, /area/awaymission/caves/build/reqpower_build) "vi" = ( @@ -4109,22 +4100,22 @@ /obj/structure/railing{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "vr" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 6; icon_state = "darkredaltstrip" }, /area/awaymission/caves/build/reqpower_build) "vx" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "vy" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredaltstrip" }, @@ -4132,14 +4123,14 @@ "vC" = ( /obj/structure/table, /obj/effect/turf_decal/siding/wood/neutral, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/south, /obj/item/salvage/ruin/nanotrasen, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "vE" = ( /obj/structure/closet/crate/freezer, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -4172,7 +4163,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -4193,7 +4184,7 @@ /obj/effect/turf_decal/siding/wood/neutral{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "vS" = ( @@ -4203,11 +4194,11 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "vV" = ( -/obj/machinery/constructable_frame/machine_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, /obj/item/stock_parts/capacitor, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/greengrid{ icon_state = "bcircuit" }, @@ -4220,7 +4211,7 @@ density = 1; anchored = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/greengrid{ icon_state = "bcircuit" }, @@ -4238,21 +4229,21 @@ /obj/effect/turf_decal/miscellaneous/goldensiding{ dir = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" }, /area/awaymission/caves/build/reqpower_build) "vZ" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, /area/awaymission/caves) "wd" = ( /obj/machinery/light/small/directional/west, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -4261,7 +4252,7 @@ /obj/structure/chair/sofa/corp/right{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 10; icon_state = "darkredalt" @@ -4274,17 +4265,17 @@ locked = 1 }, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "wi" = ( -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "wo" = ( -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, /obj/item/assembly/igniter, @@ -4296,12 +4287,12 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "ws" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "wu" = ( /obj/structure/stone_tile/slab/cracked, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "ww" = ( @@ -4317,7 +4308,7 @@ /obj/structure/chair/comfy/black{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/east, /turf/simulated/floor/plasteel{ dir = 4; @@ -4326,8 +4317,8 @@ /area/awaymission/caves/build/reqpower_build) "wy" = ( /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "wB" = ( @@ -4346,7 +4337,7 @@ pixel_y = 5; pixel_x = -5 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -4386,7 +4377,7 @@ /area/awaymission/caves) "wH" = ( /obj/structure/sink/directional/east, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) @@ -4396,7 +4387,7 @@ icon_state = "destroyed_target_prism" }, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) @@ -4423,7 +4414,7 @@ /obj/item/clothing/under/rank/medical/scrubs, /obj/item/clothing/mask/surgical, /obj/item/gun/syringe/rapidsyringe, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 9; icon_state = "darkredalt" @@ -4438,8 +4429,8 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "wV" = ( -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "elevatorshaft" }, @@ -4453,30 +4444,30 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "xd" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "xf" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/indestructible/riveted, /area/awaymission/caves/build/reqpower_build) "xg" = ( -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "xh" = ( /obj/structure/closet/crate, /obj/item/mecha_parts/mecha_equipment/drill, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "xi" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves/build/reqpower_build) "xk" = ( @@ -4487,8 +4478,8 @@ /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "xq" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel/dark{ dir = 5; @@ -4497,7 +4488,7 @@ /area/awaymission/caves/build/reqpower_build) "xy" = ( /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves/build) "xz" = ( @@ -4529,7 +4520,7 @@ /obj/structure/spawner/skeleton{ max_mobs = 5 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "xJ" = ( @@ -4538,7 +4529,7 @@ /obj/item/reagent_containers/iv_bag/blood/vox, /obj/item/reagent_containers/iv_bag/salglu, /obj/item/reagent_containers/iv_bag/salglu, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/reagent_containers/iv_bag/blood/OMinus, /obj/item/reagent_containers/iv_bag/blood/OPlus, /turf/simulated/floor/plasteel/lavaland_air{ @@ -4553,13 +4544,13 @@ dir = 4 }, /obj/effect/turf_decal/siding/wood/neutral/corner, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "xS" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -4573,7 +4564,7 @@ pixel_y = 5 }, /obj/machinery/light/small/directional/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "white" }, @@ -4587,8 +4578,8 @@ }, /obj/effect/turf_decal/siding/wood/neutral/corner, /obj/structure/barricade/wooden, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "ye" = ( @@ -4602,7 +4593,7 @@ "yf" = ( /obj/structure/rack, /obj/item/shield/mirror, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) @@ -4612,7 +4603,7 @@ /area/awaymission/caves/build) "yo" = ( /obj/structure/flora/rock/pile, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -4630,14 +4621,14 @@ /area/awaymission/caves) "yt" = ( /obj/structure/spider/stickyweb, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "white" }, /area/awaymission/caves/build) "yw" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "yz" = ( @@ -4647,12 +4638,12 @@ /area/awaymission/caves) "yD" = ( /obj/item/storage/box/gloves, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/east, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "yF" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plasteel{ dir = 4; @@ -4664,7 +4655,7 @@ pixel_y = 32; id = "cave4_flash" }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ dir = 4; @@ -4681,7 +4672,7 @@ pixel_y = -3; pixel_x = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "yJ" = ( @@ -4689,7 +4680,7 @@ pixel_y = 30 }, /obj/effect/decal/cleanable/shreds, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 1; icon_state = "darkredalt" @@ -4702,7 +4693,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "yN" = ( @@ -4717,7 +4708,7 @@ /area/awaymission/caves/build) "yO" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -4731,7 +4722,7 @@ /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "yR" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -4760,14 +4751,14 @@ }, /area/awaymission/caves/build/reqpower_build) "yY" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/stairs/medium{ dir = 4 }, /area/awaymission/caves/build/reqpower_build) "za" = ( /obj/structure/closet/walllocker/emerglocker/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/stack/sheet/metal, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) @@ -4776,7 +4767,7 @@ dir = 1 }, /obj/effect/decal/cleanable/blood/gibs/body, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredcornersalt"; dir = 4 @@ -4790,8 +4781,8 @@ dir = 4 }, /obj/structure/table/wood, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "zg" = ( @@ -4799,8 +4790,8 @@ /obj/item/flashlight/lantern{ pixel_y = 18 }, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "zk" = ( @@ -4813,7 +4804,7 @@ /area/awaymission/caves/build/reqpower_build) "zl" = ( /obj/item/organ/external/arm, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "zm" = ( @@ -4824,7 +4815,7 @@ /area/awaymission/caves) "zp" = ( /obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "zq" = ( @@ -4842,7 +4833,7 @@ pixel_x = -3; pixel_y = 3 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 4; @@ -4860,14 +4851,14 @@ icon_state = "candle1_flicker" }, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "zx" = ( /obj/structure/table, /obj/item/trash/tray, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/west, /turf/simulated/floor/plasteel{ dir = 8; @@ -4879,8 +4870,8 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "zA" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "zD" = ( @@ -4918,7 +4909,7 @@ /area/awaymission/caves) "zT" = ( /obj/structure/spider/stickyweb, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "zU" = ( @@ -4940,7 +4931,7 @@ /obj/structure/closet/radiation{ opened = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 6; icon_state = "darkredalt" @@ -4982,7 +4973,7 @@ /area/awaymission/caves) "Ar" = ( /obj/machinery/light_construct/small/east, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves/build) "At" = ( @@ -5023,7 +5014,7 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "AE" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /mob/living/simple_animal/hostile/clown/mutant{ maxbodytemp = 1500 }, @@ -5082,20 +5073,20 @@ /area/awaymission/caves) "AO" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "AP" = ( /obj/effect/decal/cleanable/glass, /obj/structure/spider/cocoon, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "white" }, /area/awaymission/caves/build) "AQ" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel/stairs/left, /area/awaymission/caves/build/reqpower_build) @@ -5105,7 +5096,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "AV" = ( @@ -5145,9 +5136,9 @@ "Bc" = ( /obj/structure/flora/rock, /obj/item/stack/sheet/metal, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/west, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) @@ -5157,7 +5148,7 @@ /obj/item/clothing/suit/armor/vest/old, /obj/item/clothing/mask/balaclava, /obj/item/clothing/mask/balaclava, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -5177,7 +5168,7 @@ /obj/structure/stone_tile/slab/cracked{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "Bl" = ( @@ -5192,8 +5183,8 @@ /obj/structure/closet/crate/can, /obj/item/soulstone/anybody/purified, /obj/item/storage/bible, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "Bo" = ( @@ -5211,7 +5202,7 @@ icon_screen = "guest_broken" }, /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/dark{ dir = 8; icon_state = "darkredalt" @@ -5238,7 +5229,7 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "By" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/solgov_logo{ icon_state = "sol_logo12" }, @@ -5260,7 +5251,7 @@ /obj/item/chair/wood{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "BE" = ( @@ -5280,8 +5271,8 @@ pixel_y = -32; id = "cave4_flash" }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" }, @@ -5290,7 +5281,7 @@ /obj/structure/sign/securearea{ pixel_x = 30 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -5364,7 +5355,7 @@ /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "Cf" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/structure/flora/rock, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) @@ -5373,7 +5364,7 @@ pixel_y = 32; id = "cave4_flash" }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -5397,7 +5388,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/rods, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) @@ -5413,7 +5404,7 @@ flickering = 1; icon_state = "candle1_flicker" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "Cn" = ( @@ -5425,7 +5416,7 @@ max_integrity = 150; name = "Invoker's Shield" }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) @@ -5433,7 +5424,7 @@ /obj/structure/stone_tile/slab/cracked{ dir = 10 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "Cx" = ( @@ -5448,7 +5439,7 @@ pixel_y = 30 }, /obj/structure/chair/comfy, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "white" }, @@ -5456,7 +5447,7 @@ "CA" = ( /obj/machinery/door/airlock/survival_pod, /obj/effect/mapping_helpers/machinery/damaged, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -5470,7 +5461,7 @@ /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "CE" = ( -/obj/machinery/constructable_frame/machine_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, /obj/item/stack/cable_coil{ @@ -5487,7 +5478,7 @@ /obj/effect/turf_decal/miscellaneous/goldensiding{ dir = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -5507,7 +5498,7 @@ /obj/structure/closet, /obj/item/clothing/mask/breath, /obj/item/gun/energy/kinetic_accelerator, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "CO" = ( @@ -5517,15 +5508,15 @@ "CP" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "CQ" = ( /obj/structure/chair/wood/wings{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "CU" = ( @@ -5557,7 +5548,7 @@ /area/awaymission/caves/build) "Do" = ( /obj/effect/decal/cleanable/glass/plasma, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/shard{ icon_state = "small"; pixel_x = 10 @@ -5580,13 +5571,13 @@ /area/awaymission/caves) "Dw" = ( /obj/machinery/light/small/directional/west, -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil{ amount = 5 }, /obj/item/stock_parts/capacitor/adv, /obj/item/circuitboard/holopad, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -5611,7 +5602,7 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "DM" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/south, /turf/simulated/floor/plasteel/dark{ dir = 10; @@ -5650,7 +5641,7 @@ /area/awaymission/caves/build/reqpower_build) "DZ" = ( /obj/machinery/light_construct/small/east, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "Ea" = ( @@ -5668,7 +5659,7 @@ dir = 6 }, /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Ed" = ( @@ -5676,7 +5667,7 @@ dir = 1 }, /obj/machinery/light_construct/small/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/railing/cap{ dir = 8 }, @@ -5699,7 +5690,7 @@ /area/awaymission/caves/build) "Ei" = ( /obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -5709,7 +5700,7 @@ /obj/effect/turf_decal/caution{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -5736,7 +5727,7 @@ pixel_y = 10 }, /obj/item/reagent_containers/syringe/sarin, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -5750,7 +5741,7 @@ /area/awaymission/caves) "Eu" = ( /obj/item/flash, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "Ew" = ( @@ -5775,7 +5766,7 @@ /area/awaymission/caves) "EB" = ( /obj/structure/closet/crate/can, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "ED" = ( @@ -5803,7 +5794,7 @@ /area/awaymission/caves) "EJ" = ( /mob/living/simple_animal/hostile/abomination/altform4, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/solgov_logo{ icon_state = "sol_logo6" }, @@ -5828,14 +5819,14 @@ pixel_x = 7; pixel_y = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" }, /area/awaymission/caves/build/reqpower_build) "ES" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/flashlight/flare, /obj/item/flashlight/flare, /obj/item/flashlight/flare, @@ -5853,8 +5844,8 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "EV" = ( -/obj/effect/landmark/burnturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "EW" = ( @@ -5863,7 +5854,7 @@ /area/awaymission/caves) "EY" = ( /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "EZ" = ( @@ -5872,8 +5863,8 @@ /area/awaymission/caves) "Fe" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "Fi" = ( @@ -5882,7 +5873,7 @@ /obj/item/stack/sheet/mineral/diamond{ amount = 15 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -5899,7 +5890,7 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "Fl" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/stack/sheet/mineral/adamantine{ amount = 5 }, @@ -5920,7 +5911,7 @@ /obj/effect/turf_decal{ dir = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/salvage/ruin/nanotrasen, /turf/simulated/floor/plasteel/dark{ dir = 4; @@ -5935,7 +5926,7 @@ }, /area/awaymission/caves/build/reqpower_build) "Fr" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light_construct/small/west, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" @@ -5953,13 +5944,13 @@ /obj/item/paper_bin, /obj/item/pen, /obj/effect/turf_decal/siding/wood/neutral, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "FA" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 4; icon_state = "darkredalt" @@ -5967,21 +5958,21 @@ /area/awaymission/caves/build/reqpower_build) "FE" = ( /obj/structure/closet/walllocker/emerglocker/east, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "FF" = ( /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "FG" = ( -/obj/machinery/constructable_frame/machine_frame{ +/obj/structure/machine_frame{ icon_state = "box_2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "FJ" = ( @@ -5996,7 +5987,7 @@ /area/awaymission/caves/build) "FK" = ( /obj/structure/sink/directional/east, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -6027,12 +6018,12 @@ "FP" = ( /obj/structure/mecha_wreckage/ripley, /obj/machinery/light_construct/small/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "FR" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "FY" = ( @@ -6044,11 +6035,11 @@ /obj/structure/railing{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "FZ" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "Gc" = ( @@ -6060,15 +6051,15 @@ /area/awaymission/caves) "Gg" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" }, /area/awaymission/caves/build/reqpower_build) "Gh" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/stack/sheet/runed_metal{ amount = 5 }, @@ -6094,7 +6085,7 @@ icon_keyboard = null }, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" }, @@ -6104,7 +6095,7 @@ dir = 8 }, /obj/structure/spider/stickyweb, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "Go" = ( @@ -6129,8 +6120,8 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "GA" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 6; icon_state = "darkredaltstrip" @@ -6152,17 +6143,17 @@ "GD" = ( /obj/item/stack/rods, /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "GF" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "GG" = ( /obj/item/stack/rods, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plasteel/dark{ dir = 1; @@ -6173,7 +6164,7 @@ /obj/machinery/iv_drip{ pixel_y = -14 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -6187,12 +6178,12 @@ /area/awaymission/caves) "GN" = ( /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/carpet/green, /area/awaymission/caves/build/reqpower_build) "GR" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/structure/stone_tile/slab, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) @@ -6219,7 +6210,7 @@ "Hc" = ( /obj/structure/table_frame, /obj/item/storage/firstaid/fire, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "white" }, @@ -6231,11 +6222,11 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "He" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/mob_spawn/human/corpse/damaged, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) @@ -6253,7 +6244,7 @@ icon_state = "comp_frame_2"; dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) @@ -6267,9 +6258,9 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "Hi" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 8; icon_state = "darkredalt" @@ -6277,11 +6268,11 @@ /area/awaymission/caves/build/reqpower_build) "Hj" = ( /obj/effect/decal/remains/robot, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "Hk" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/salvage/ruin/brick, /turf/simulated/floor/plasteel{ dir = 4; @@ -6300,7 +6291,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Hn" = ( @@ -6312,9 +6303,9 @@ icon_keyboard = null }, /obj/structure/flora/rock, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "Hr" = ( @@ -6336,7 +6327,7 @@ /area/awaymission/caves) "Hx" = ( /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/salvage/ruin/tablet, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) @@ -6350,12 +6341,12 @@ pixel_y = -30 }, /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "HD" = ( /obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "HF" = ( @@ -6371,7 +6362,7 @@ /turf/simulated/wall/indestructible/necropolis, /area/awaymission/caves) "HH" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/structure/stone_tile/slab, /obj/item/toy/character/lich, /obj/effect/decal/cleanable/dust, @@ -6393,7 +6384,7 @@ /area/awaymission/caves/build/reqpower_build) "HL" = ( /obj/structure/closet/l3closet/general, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ @@ -6415,23 +6406,23 @@ dir = 8 }, /obj/item/storage/belt/medical/surgery, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredaltstrip" }, /area/awaymission/caves/build/reqpower_build) "HV" = ( /obj/effect/turf_decal/caution, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 1; icon_state = "darkredaltstrip" }, /area/awaymission/caves/build/reqpower_build) "HW" = ( -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 9; icon_state = "darkredalt" @@ -6451,8 +6442,8 @@ /area/awaymission/caves/build) "HZ" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 1; icon_state = "darkredalt" @@ -6470,17 +6461,17 @@ /area/awaymission/caves) "Ih" = ( /obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "Ii" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Ik" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -6499,10 +6490,10 @@ /area/awaymission/caves) "Is" = ( /obj/effect/decal/cleanable/cobweb, -/obj/machinery/constructable_frame/machine_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "white" }, @@ -6514,7 +6505,7 @@ /obj/item/bedsheet/brown{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "Ix" = ( @@ -6528,7 +6519,7 @@ /area/awaymission/caves) "IF" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 1; icon_state = "darkredalt" @@ -6542,8 +6533,8 @@ dir = 4 }, /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "IK" = ( @@ -6568,7 +6559,7 @@ /area/awaymission/caves/build/reqpower_build) "IM" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "IP" = ( @@ -6578,7 +6569,7 @@ /obj/effect/turf_decal/siding/wood/neutral{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "IS" = ( @@ -6587,8 +6578,8 @@ /obj/item/shard{ pixel_x = 9 }, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -6622,7 +6613,7 @@ /area/awaymission/caves) "Jd" = ( /obj/machinery/mech_bay_recharge_port, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/mapping_helpers/machinery/damaged, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) @@ -6631,7 +6622,7 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "Jf" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/salvage/ruin/brick, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredcornersalt"; @@ -6646,11 +6637,11 @@ icon = 'icons/obj/power.dmi'; density = 1 }, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Jh" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/stack/sheet/mineral/bananium{ amount = 5 }, @@ -6658,7 +6649,7 @@ /area/awaymission/caves) "Jj" = ( /obj/structure/chair/sofa/corp/left, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 1; icon_state = "darkredalt" @@ -6667,14 +6658,14 @@ "Jl" = ( /obj/machinery/door/airlock/survival_pod, /obj/machinery/door/firedoor/closed, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" }, /area/awaymission/caves/build/reqpower_build) "Jn" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel/dark{ dir = 4; @@ -6692,7 +6683,7 @@ /obj/item/stack/cable_coil{ amount = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/east, /turf/simulated/floor/plasteel{ dir = 4; @@ -6705,7 +6696,7 @@ /area/awaymission/caves) "Jv" = ( /obj/structure/chair/sofa/corp/right, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 1; icon_state = "darkredalt" @@ -6715,7 +6706,7 @@ /obj/structure/spider/stickyweb, /obj/machinery/optable, /obj/machinery/light_construct/small/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves/build) "Jz" = ( @@ -6725,11 +6716,11 @@ }, /area/awaymission/caves) "JC" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "JD" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 6; icon_state = "darkredalt" @@ -6740,7 +6731,7 @@ dir = 10 }, /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "JN" = ( @@ -6780,7 +6771,7 @@ dir = 8 }, /obj/effect/decal/cleanable/blood/gibs/old, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredaltstrip" }, @@ -6799,7 +6790,7 @@ pixel_x = -5; pixel_y = -8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel/dark{ dir = 5; @@ -6814,8 +6805,8 @@ "Ka" = ( /obj/effect/decal/cleanable/shreds, /obj/machinery/light_construct/small/east, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "Kc" = ( @@ -6831,7 +6822,7 @@ /mob/living/simple_animal/hostile/abomination/altform2{ maxbodytemp = 1500 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -6839,8 +6830,8 @@ /area/awaymission/caves/build/reqpower_build) "Ke" = ( /obj/item/reagent_scanner, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -6858,7 +6849,7 @@ icon_state = "2-8" }, /obj/structure/railing, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Ki" = ( @@ -6867,7 +6858,7 @@ /area/awaymission/caves) "Kl" = ( /obj/machinery/power/port_gen/pacman, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -6876,7 +6867,7 @@ /obj/effect/turf_decal{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -6922,13 +6913,13 @@ "Kz" = ( /obj/structure/table, /obj/random/toolbox, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "KB" = ( /obj/item/stack/rods, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" }, @@ -6954,8 +6945,8 @@ /area/awaymission/caves) "KL" = ( /obj/structure/table_frame/wood, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "KN" = ( @@ -6971,7 +6962,7 @@ icon_state = "comp_frame_2"; dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 4; @@ -6983,7 +6974,7 @@ wander = 0; maxbodytemp = 1500 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves/build) "KQ" = ( @@ -6991,7 +6982,7 @@ /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "KR" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plasteel/dark{ dir = 1; @@ -7008,7 +6999,7 @@ /obj/item/clothing/head/witchwig, /obj/item/clothing/gloves/ring/gold, /obj/effect/gibspawner/human, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "KX" = ( @@ -7042,7 +7033,7 @@ /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Lf" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/clothing/suit/hooded/fluff/bone, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) @@ -7062,7 +7053,7 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "Ll" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "Lm" = ( @@ -7073,9 +7064,9 @@ /area/awaymission/caves) "Ln" = ( /obj/structure/flora/rock/pile, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 4; icon_state = "darkredalt" @@ -7088,7 +7079,7 @@ /obj/structure/fence/cut/large{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -7106,7 +7097,7 @@ /obj/structure/sign/securearea{ pixel_x = -30 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -7126,7 +7117,7 @@ /obj/structure/railing{ dir = 6 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Lv" = ( @@ -7137,8 +7128,8 @@ /area/awaymission/caves) "Lz" = ( /obj/machinery/light_construct/small/east, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "LB" = ( @@ -7146,7 +7137,7 @@ dir = 8 }, /obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "LH" = ( @@ -7154,14 +7145,14 @@ /area/awaymission/caves/build) "LI" = ( /obj/item/tank/internals/emergency_oxygen, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "LJ" = ( /obj/structure/table, /obj/item/gun/projectile/revolver/russian, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "LM" = ( @@ -7189,7 +7180,7 @@ /turf/simulated/wall/indestructible/rock/mineral, /area/awaymission/caves) "LV" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/west, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" @@ -7197,7 +7188,7 @@ /area/awaymission/caves) "Md" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /mob/living/simple_animal/hostile/abomination/super{ maxbodytemp = 1500 }, @@ -7208,7 +7199,7 @@ /area/awaymission/caves/build/reqpower_build) "Me" = ( /obj/item/toy/crayon/red, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "Mh" = ( @@ -7217,7 +7208,7 @@ /area/awaymission/caves) "Mi" = ( /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Mo" = ( @@ -7225,7 +7216,7 @@ dir = 9 }, /obj/effect/turf_decal/miscellaneous/goldensiding, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) @@ -7234,19 +7225,19 @@ /turf/simulated/floor/carpet/green, /area/awaymission/caves/build/reqpower_build) "Mq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/rods, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Mu" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/stairs/right{ dir = 8 }, /area/awaymission/caves/build/reqpower_build) "MA" = ( /obj/structure/spider/cocoon, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "white" }, @@ -7268,7 +7259,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/east, /turf/simulated/floor/plasteel{ dir = 4; @@ -7286,12 +7277,12 @@ icon_state = "trap-fire"; density = 0 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "MV" = ( /obj/item/stack/sheet/metal, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "MX" = ( @@ -7299,7 +7290,7 @@ pixel_x = -3; pixel_y = 3 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -7323,7 +7314,7 @@ /obj/effect/decal/cleanable/generic, /obj/effect/decal/cleanable/cobweb, /obj/machinery/light_construct/small/west, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "Nm" = ( @@ -7334,7 +7325,7 @@ "Nn" = ( /obj/structure/table, /obj/item/ashtray/bronze, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel/dark{ dir = 1; @@ -7358,12 +7349,12 @@ /obj/structure/stone_tile/slab/cracked{ icon_state = "cracked_block1" }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "Nx" = ( /obj/machinery/light_construct/small/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build) "NA" = ( @@ -7371,7 +7362,7 @@ /obj/effect/turf_decal/siding/wood/neutral{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "NE" = ( @@ -7388,7 +7379,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/stack/rods, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) @@ -7401,7 +7392,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "NJ" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -7411,7 +7402,7 @@ dir = 4 }, /obj/effect/turf_decal/delivery/hollow, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -7422,7 +7413,7 @@ /obj/effect/turf_decal/miscellaneous/goldensiding{ dir = 5 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/solgov_logo{ icon_state = "sol_logo24" }, @@ -7443,7 +7434,7 @@ /obj/item/stack/sheet/mineral/gold{ amount = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -7455,7 +7446,7 @@ }, /area/awaymission/caves) "NS" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/card/id/away/old{ name = "Miner's Personal ID"; pixel_x = -5 @@ -7463,14 +7454,14 @@ /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "NU" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light_construct/small/north, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, /area/awaymission/caves) "NX" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/seeds/berry/poison, /obj/item/seeds/nettle/death, /obj/item/seeds/cannabis/death, @@ -7494,25 +7485,25 @@ }, /mob/living/simple_animal/mouse, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "Od" = ( /obj/effect/turf_decal/delivery, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, /area/awaymission/caves/build) "Oi" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "Ok" = ( /obj/structure/spider/cocoon, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves/build) "Ol" = ( @@ -7522,7 +7513,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -7541,11 +7532,11 @@ /area/awaymission/caves/build/reqpower_build) "Os" = ( /obj/structure/table/wood, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "Ot" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/indestructible, /area/awaymission/caves/build) "Ox" = ( @@ -7557,7 +7548,7 @@ /area/awaymission/caves) "OA" = ( /obj/machinery/atmospherics/unary/tank/air, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "OF" = ( @@ -7585,8 +7576,8 @@ /area/awaymission/caves/build/reqpower_build) "OM" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "ON" = ( @@ -7597,7 +7588,7 @@ icon_state = "medium"; pixel_y = 9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "OR" = ( @@ -7610,23 +7601,23 @@ /area/awaymission/caves/build/reqpower_build) "OS" = ( /obj/effect/decal/cleanable/shreds, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "OV" = ( /obj/machinery/door/window/reinforced/normal{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" }, /area/awaymission/caves/build/reqpower_build) "OZ" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 4; icon_state = "darkredaltstrip" @@ -7658,7 +7649,7 @@ /obj/effect/turf_decal/siding/wood/neutral{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "Pf" = ( @@ -7673,7 +7664,7 @@ /obj/structure/chair/sofa/corp/left{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 9; icon_state = "darkredalt" @@ -7705,19 +7696,19 @@ /area/awaymission/caves/build) "Pp" = ( /obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Pq" = ( /obj/structure/closet/walllocker/medlocker/south, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" }, /area/awaymission/caves/build/reqpower_build) "Pv" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredcornersalt"; dir = 8 @@ -7728,8 +7719,8 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "Py" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/solgov_logo{ icon_state = "sol_logo13" }, @@ -7749,7 +7740,7 @@ icon_screen = "broken"; icon_keyboard = "generic_key_broken" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 8; icon_state = "darkredalt" @@ -7759,14 +7750,14 @@ /mob/living/simple_animal/hostile/abomination/altform3{ maxbodytemp = 1500 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "PE" = ( /obj/structure/stone_tile/slab/cracked{ icon_state = "cracked_center4" }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "PF" = ( @@ -7783,7 +7774,7 @@ "PJ" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/sign/nosmoking_2{ pixel_y = 30 }, @@ -7797,7 +7788,7 @@ /obj/item/shard{ pixel_x = 9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -7817,14 +7808,14 @@ dir = 6 }, /obj/item/kirbyplants, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" }, /area/awaymission/caves/build/reqpower_build) "PR" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/closet/crate/miningcar, /obj/item/stack/sheet/mineral/plasma{ amount = 30 @@ -7838,13 +7829,13 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "PY" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/south, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "PZ" = ( /obj/effect/turf_decal/delivery/hollow, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/suit_storage_unit/lavaland{ req_access = list(271); storage_type = null; @@ -7856,8 +7847,8 @@ /obj/machinery/computer/nonfunctional{ dir = 1 }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel/dark{ dir = 6; @@ -7866,7 +7857,7 @@ /area/awaymission/caves/build/reqpower_build) "Qg" = ( /obj/effect/decal/cleanable/glass/plasma, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/shard{ icon_state = "medium"; pixel_x = -7; @@ -7877,7 +7868,7 @@ "Qm" = ( /obj/structure/table_frame, /obj/random/tool, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -7899,7 +7890,7 @@ /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "Qr" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/stack/sheet/plasteel{ amount = 5 }, @@ -7911,7 +7902,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "Qu" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/flora/rock/pile, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) @@ -7919,7 +7910,7 @@ /obj/structure/rack, /obj/item/melee/cultblade, /obj/item/whetstone/cult, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) @@ -7929,14 +7920,14 @@ /area/awaymission/caves) "QF" = ( /obj/structure/dresser, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/carpet/purple, /area/awaymission/caves/build/reqpower_build) "QN" = ( /obj/structure/stone_tile/slab/cracked{ icon_state = "cracked_tile9" }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "QO" = ( @@ -7976,8 +7967,8 @@ dir = 8 }, /obj/item/shard, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredaltstrip" }, @@ -7993,7 +7984,7 @@ /turf/simulated/floor/engine, /area/awaymission/caves/build/reqpower_build) "Rk" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -8024,13 +8015,13 @@ /area/awaymission/caves) "Rq" = ( /obj/item/chair/wood, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Rv" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "Rw" = ( @@ -8058,7 +8049,7 @@ /obj/item/bedsheet/patriot{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/carpet/black, /area/awaymission/caves/build/reqpower_build) "RD" = ( @@ -8075,14 +8066,14 @@ /obj/structure/sign/securearea{ pixel_x = 30 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "RH" = ( /obj/item/stack/cable_coil{ amount = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 1; icon_state = "darkredaltstrip" @@ -8099,7 +8090,7 @@ icon_state = "pod_cloning"; desc = "Some sort of pod filled with... What is this?" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 10; icon_state = "darkredalt" @@ -8113,7 +8104,7 @@ pixel_y = 32; density = 0 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 1; icon_state = "darkredalt" @@ -8133,7 +8124,7 @@ /area/awaymission/caves) "RR" = ( /obj/item/hemostat, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -8160,7 +8151,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Se" = ( @@ -8181,7 +8172,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/flora/rock/pile, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) @@ -8198,7 +8189,7 @@ "Sp" = ( /obj/structure/table, /obj/item/mod/module/active_sonar, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "Sq" = ( @@ -8213,8 +8204,8 @@ "Sr" = ( /mob/living/simple_animal/hostile/hellhound/tear, /obj/effect/gibspawner/human, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "Su" = ( @@ -8226,7 +8217,7 @@ /obj/structure/railing{ dir = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Sx" = ( @@ -8234,7 +8225,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "SA" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/east, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" @@ -8242,7 +8233,7 @@ /area/awaymission/caves) "SB" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "SC" = ( @@ -8251,7 +8242,7 @@ max_integrity = 150; name = "Invoker's Shield" }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "SD" = ( @@ -8260,7 +8251,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/indestructible, /area/awaymission/caves/build) "SH" = ( @@ -8270,7 +8261,7 @@ "SI" = ( /obj/machinery/economy/vending/cigarette/free, /obj/effect/mapping_helpers/machinery/damaged, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel/dark{ dir = 9; @@ -8279,33 +8270,33 @@ /area/awaymission/caves/build/reqpower_build) "SM" = ( /obj/machinery/atmospherics/binary/valve, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "SO" = ( /obj/item/stack/sheet/metal, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "SR" = ( /obj/structure/mopbucket, /obj/item/mop, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "SS" = ( /obj/structure/flora/rock/pile, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "SU" = ( /obj/item/stack/sheet/wood{ amount = 3 }, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "SV" = ( @@ -8325,7 +8316,7 @@ "SY" = ( /obj/structure/table/glass, /obj/item/surgicaldrill, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/bonesetter, /turf/simulated/floor/plasteel{ dir = 4; @@ -8344,7 +8335,7 @@ "Tc" = ( /obj/effect/spawner/random/maintenance, /obj/structure/rack, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "Te" = ( @@ -8357,7 +8348,7 @@ dir = 8 }, /obj/effect/turf_decal/delivery/hollow, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -8378,8 +8369,8 @@ "Th" = ( /obj/effect/decal/cleanable/glass/plasma, /obj/item/stack/rods, -/obj/effect/landmark/damageturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Tk" = ( @@ -8397,13 +8388,13 @@ /obj/structure/stone_tile/slab/cracked{ dir = 5 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "Tp" = ( /obj/structure/flora/rock/pile, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 8; icon_state = "darkredalt" @@ -8424,7 +8415,7 @@ dir = 10 }, /obj/machinery/light_construct/small/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Tu" = ( @@ -8437,7 +8428,7 @@ /area/awaymission/caves/build) "Tv" = ( /obj/item/stock_parts/matter_bin, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -8450,8 +8441,8 @@ /area/awaymission/caves) "Ty" = ( /obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plasteel/dark{ dir = 8; @@ -8462,11 +8453,11 @@ /obj/structure/stone_tile/slab/cracked{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "TB" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 1; icon_state = "darkredaltstrip" @@ -8484,7 +8475,7 @@ id = "cave_base"; pixel_x = -8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -8511,15 +8502,15 @@ /obj/item/organ/internal/heart{ pixel_y = -6 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "TN" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/kitchen/knife/ritual, /obj/item/staff/broom, /obj/item/clothing/accessory/necklace/locket/fluff/fethasnecklace, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/salvage/ruin/tablet, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) @@ -8531,12 +8522,12 @@ /obj/structure/stone_tile/slab/cracked{ dir = 9 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "TV" = ( /obj/effect/turf_decal/delivery/white, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" @@ -8550,7 +8541,7 @@ /area/awaymission/caves) "TZ" = ( /obj/effect/decal/cleanable/ash, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Ud" = ( @@ -8576,7 +8567,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "Uj" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -8584,21 +8575,21 @@ "Uk" = ( /obj/structure/rack/skeletal_bar/left, /obj/item/clothing/suit/hooded/cultrobes, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/salvage/ruin/tablet, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "Um" = ( /obj/effect/decal/cleanable/generic, /obj/effect/decal/cleanable/blood/gibs/old, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" }, /area/awaymission/caves/build/reqpower_build) "Un" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/flora/rock/pile, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" @@ -8608,7 +8599,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/south, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) @@ -8627,7 +8618,7 @@ "Ut" = ( /obj/structure/bed/roller, /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "white" }, @@ -8644,7 +8635,7 @@ pixel_x = 10; pixel_y = 9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 4; @@ -8684,7 +8675,7 @@ icon_state = "comp_frame_5"; dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -8692,11 +8683,11 @@ /area/awaymission/caves/build/reqpower_build) "UF" = ( /obj/effect/decal/cleanable/ash, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "UH" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "UI" = ( @@ -8706,8 +8697,8 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "UJ" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plasteel/dark{ dir = 4; @@ -8735,7 +8726,7 @@ pixel_y = 8; id = "cave4_solgov" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/solgov_logo{ icon_state = "sol_logo15" }, @@ -8745,7 +8736,7 @@ }, /area/awaymission/caves/build/reqpower_build) "UM" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "UN" = ( @@ -8761,9 +8752,9 @@ /obj/effect/mob_spawn/human/corpse/damaged, /obj/effect/decal/cleanable/glass, /obj/effect/turf_decal/miscellaneous/goldensiding, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/solgov_logo{ icon_state = "sol_logo4" }, @@ -8778,7 +8769,7 @@ }, /area/awaymission/caves) "US" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) @@ -8813,7 +8804,7 @@ /area/awaymission/caves) "Vc" = ( /obj/structure/closet/walllocker/emerglocker/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "Vd" = ( @@ -8850,7 +8841,7 @@ dir = 8 }, /obj/effect/turf_decal/delivery/hollow, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/south, /turf/simulated/floor/plasteel{ dir = 4; @@ -8858,8 +8849,8 @@ }, /area/awaymission/caves/build/reqpower_build) "Vn" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 8; icon_state = "darkredaltstrip" @@ -8867,7 +8858,7 @@ /area/awaymission/caves/build/reqpower_build) "Vq" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "Vs" = ( @@ -8878,7 +8869,7 @@ /area/awaymission/caves) "Vt" = ( /obj/effect/gibspawner/human, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "Vv" = ( @@ -8886,7 +8877,7 @@ dir = 1 }, /obj/structure/computerframe, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -8904,12 +8895,12 @@ /area/awaymission/caves/build/reqpower_build) "VC" = ( /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "VD" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "VG" = ( @@ -8917,22 +8908,22 @@ /obj/structure/closet, /obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "VK" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/flora/rock, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "VL" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" }, /area/awaymission/caves/build/reqpower_build) "VM" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/turf_decal/arrows{ dir = 8 }, @@ -8954,8 +8945,8 @@ /obj/item/stack/cable_coil{ amount = 1 }, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 8; icon_state = "darkredaltstrip" @@ -8969,12 +8960,12 @@ "VT" = ( /obj/machinery/light_construct/small/south, /obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves) "VV" = ( /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "VX" = ( @@ -8987,20 +8978,20 @@ /obj/effect/turf_decal/caution{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, /area/awaymission/caves) "VZ" = ( /obj/structure/bookcase/random, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "Wb" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" }, @@ -9013,7 +9004,7 @@ pixel_x = 3; list_reagents = list("methamphetamine" = 30) }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/dnascrambler, /turf/simulated/floor/plasteel{ dir = 4; @@ -9032,7 +9023,7 @@ }, /obj/item/reagent_containers/applicator/burn, /obj/item/storage/box/monkeycubes/stokcubes, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "Wg" = ( @@ -9041,7 +9032,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/indestructible, /area/awaymission/caves/build) "Wj" = ( @@ -9083,7 +9074,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "Wv" = ( @@ -9091,7 +9082,7 @@ dir = 8 }, /mob/living/simple_animal/hostile/abomination/altform1, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredaltstrip" }, @@ -9100,8 +9091,8 @@ /obj/structure/sign/securearea{ pixel_x = -30 }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 9; icon_state = "darkredalt" @@ -9109,7 +9100,7 @@ /area/awaymission/caves/build/reqpower_build) "Wz" = ( /obj/structure/janitorialcart, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "WA" = ( @@ -9121,7 +9112,7 @@ id = "cave_elevator"; pixel_x = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -9139,7 +9130,7 @@ /obj/structure/table, /obj/item/reagent_containers/applicator/brute, /obj/item/reagent_containers/applicator/burn, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "white" }, @@ -9169,23 +9160,23 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "WO" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/mod/module/springlock, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "WP" = ( /obj/structure/spider/stickyweb, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves/build) "WR" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/awaymission/caves) "WS" = ( /obj/structure/rack/skeletal_bar/right, /obj/item/clothing/suit/hooded/cultrobes, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/salvage/ruin/tablet, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) @@ -9196,7 +9187,7 @@ pixel_x = -5; pixel_y = -8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "WW" = ( @@ -9204,8 +9195,8 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves/build) "WX" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" @@ -9225,8 +9216,8 @@ /obj/effect/turf_decal/siding/wood/neutral{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "Xc" = ( @@ -9241,7 +9232,7 @@ /area/awaymission/caves/build) "Xe" = ( /mob/living/simple_animal/hostile/hellhound, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) @@ -9262,7 +9253,7 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "Xn" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/chasm/straight_down/lava_land_surface{ light_color = null; light_power = 0; @@ -9288,8 +9279,8 @@ name = "cauldron" }, /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "Xx" = ( @@ -9313,11 +9304,11 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Xz" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/stairs/left{ dir = 8 }, @@ -9346,7 +9337,7 @@ /area/awaymission/caves) "XH" = ( /obj/effect/turf_decal/miscellaneous/goldensiding/corner, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -9377,7 +9368,7 @@ /area/awaymission/caves) "XL" = ( /obj/effect/decal/cleanable/glass/plasma, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "XN" = ( @@ -9397,7 +9388,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) @@ -9410,11 +9401,11 @@ /area/awaymission/caves) "XS" = ( /obj/structure/bookcase/random, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "XT" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/carpet/green, /area/awaymission/caves/build/reqpower_build) "XU" = ( @@ -9422,7 +9413,7 @@ used = 1 }, /obj/structure/cult/forge, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "XW" = ( @@ -9441,7 +9432,7 @@ /area/awaymission/caves) "Yb" = ( /obj/item/kirbyplants, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" }, @@ -9457,7 +9448,7 @@ icon_state = "conduit-red" }, /obj/effect/decal/cleanable/cobweb, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "Yf" = ( @@ -9478,7 +9469,7 @@ /obj/effect/turf_decal/stripes{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -9496,7 +9487,7 @@ "Yo" = ( /obj/structure/table, /obj/machinery/recharger, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/east, /turf/simulated/floor/plasteel{ dir = 8; @@ -9504,8 +9495,8 @@ }, /area/awaymission/caves/build/reqpower_build) "Yq" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 9; icon_state = "darkredaltstrip" @@ -9520,7 +9511,7 @@ }, /area/awaymission/caves/build/reqpower_build) "Yu" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light_construct/small/west, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) @@ -9534,7 +9525,7 @@ /area/awaymission/caves) "Yx" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "YC" = ( @@ -9550,7 +9541,7 @@ /obj/effect/turf_decal/siding/wood/neutral{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "YI" = ( @@ -9559,7 +9550,7 @@ /obj/item/clothing/under/rank/medical/scrubs/green, /obj/item/clothing/mask/surgical, /obj/item/clothing/suit/apron/surgical, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 4; @@ -9568,7 +9559,7 @@ /area/awaymission/caves/build/reqpower_build) "YL" = ( /obj/structure/dresser, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) "YM" = ( @@ -9583,7 +9574,7 @@ "YS" = ( /obj/structure/gunrack, /obj/item/gun/energy/disabler, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 10; icon_state = "darkredalt" @@ -9599,14 +9590,14 @@ /area/awaymission/caves) "Za" = ( /obj/item/stack/sheet/metal, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, /area/awaymission/caves) "Ze" = ( /obj/effect/decal/cleanable/shreds, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "Zg" = ( @@ -9623,8 +9614,8 @@ /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves/build) "Zm" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredcornersalt"; dir = 8 @@ -9632,8 +9623,8 @@ /area/awaymission/caves/build/reqpower_build) "Zn" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "Zq" = ( @@ -9653,8 +9644,8 @@ }, /area/awaymission/caves/build/reqpower_build) "Zu" = ( -/obj/effect/landmark/damageturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light_construct/small/east, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) @@ -9669,12 +9660,12 @@ dir = 1 }, /obj/structure/table/wood, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "Zz" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/structure/stone_tile/slab, /obj/item/reagent_containers/drinks/trophy/bronze_cup, /obj/item/reagent_containers/drinks/bottle/wine{ @@ -9690,7 +9681,7 @@ /turf/simulated/floor/engine/cult/lavaland_air, /area/awaymission/caves) "ZC" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/flora/rock, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) @@ -9701,7 +9692,7 @@ icon_state = "small"; pixel_x = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "ZF" = ( @@ -9710,14 +9701,14 @@ }, /obj/machinery/optable, /obj/effect/decal/cleanable/blood/gibs/body, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel/dark{ dir = 5; icon_state = "darkredalt" }, /area/awaymission/caves/build/reqpower_build) "ZG" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "ZH" = ( @@ -9742,20 +9733,20 @@ /area/awaymission/caves/build) "ZP" = ( /obj/structure/windoor_assembly, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "ZU" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "ZZ" = ( /obj/effect/decal/cleanable/shreds, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm index fe643a0327552..9e6ebfa39f390 100644 --- a/_maps/map_files220/RandomZLevels/gate_lizard.dmm +++ b/_maps/map_files220/RandomZLevels/gate_lizard.dmm @@ -51,7 +51,7 @@ /area/awaymission/jungle_planet/outside) "adt" = ( /obj/machinery/light_construct/small/south, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -89,14 +89,14 @@ /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, /obj/item/clothing/mask/surgical, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/awaymission/jungle_planet/inside/complex) "ahk" = ( /obj/effect/turf_decal/stripes/line, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "ahF" = ( @@ -104,7 +104,7 @@ dir = 8; pixel_x = -12 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -149,7 +149,7 @@ /area/awaymission/jungle_planet/inside/complex) "ajt" = ( /obj/item/reagent_containers/drinks/oilcan, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "ajx" = ( @@ -198,7 +198,7 @@ pixel_x = -3; pixel_y = 7 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -218,7 +218,7 @@ /obj/structure/falsewall/reinforced{ name = "Suspicious-looking wall" }, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "aoh" = ( @@ -248,7 +248,7 @@ id = "CMDgate"; req_access = list(301) }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -306,7 +306,7 @@ /area/awaymission/jungle_planet/outside/cave/pirate) "ati" = ( /obj/item/reagent_containers/drinks/cans/cola, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "atM" = ( @@ -394,7 +394,7 @@ "aEA" = ( /obj/machinery/firealarm/directional/east, /obj/item/reagent_containers/glass/beaker/waterbottle, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "aFo" = ( @@ -422,7 +422,7 @@ pixel_x = 12 }, /obj/machinery/light/directional/west, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "aGN" = ( @@ -446,7 +446,7 @@ /obj/structure/sign/explosives/alt{ pixel_x = -32 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -477,7 +477,7 @@ /obj/effect/turf_decal/delivery, /obj/structure/closet/crate, /obj/item/stack/sheet/metal/fifty, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "aIU" = ( @@ -490,7 +490,7 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "aJz" = ( @@ -541,7 +541,7 @@ /obj/item/clothing/accessory/necklace/talisman, /obj/item/clothing/accessory/necklace/skullcodpiece, /obj/item/clothing/accessory/necklace/talisman, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "aPj" = ( @@ -553,8 +553,8 @@ /area/awaymission/jungle_planet/outside/cave) "aPo" = ( /obj/effect/turf_decal/arrows, -/obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/frequent, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -602,7 +602,7 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "aVe" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside/abandoned) "aVq" = ( @@ -614,7 +614,7 @@ /area/awaymission/jungle_planet/outside/abandoned) "aVr" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -638,7 +638,7 @@ /obj/item/shield/riot/buckler, /obj/item/shield/riot/buckler, /obj/item/shield/riot/buckler, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "aYE" = ( @@ -659,7 +659,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -674,8 +674,8 @@ "bbp" = ( /obj/item/clothing/head/helmet/skull, /obj/item/clothing/head/helmet/skull, -/obj/structure/closet/crate/wooden/wooden_crate, -/obj/effect/landmark/damageturf, +/obj/structure/closet/crate/wooden, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "bbq" = ( @@ -736,7 +736,7 @@ }, /area/awaymission/jungle_planet/inside/complex) "bdW" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "bec" = ( @@ -769,7 +769,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "bhj" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside) "bhA" = ( @@ -786,7 +786,7 @@ /obj/structure/chair/office/dark{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -822,14 +822,14 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) "bkg" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "browncorner" }, /area/awaymission/jungle_planet/inside/complex) "bkL" = ( /obj/structure/closet/secure_closet/medical2, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -871,7 +871,7 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -922,7 +922,7 @@ name = "dorm"; req_access = list(271) }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "bqo" = ( @@ -949,7 +949,7 @@ pixel_x = -3; pixel_y = 18 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "bqH" = ( @@ -1003,7 +1003,7 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 20 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -1017,11 +1017,11 @@ /obj/item/stack/sheet/leather, /obj/item/stack/sheet/leather, /obj/item/clothing/accessory/necklace/dope, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "bti" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "bty" = ( @@ -1042,14 +1042,14 @@ pixel_y = -10; pixel_x = 31 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "btI" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "btQ" = ( @@ -1109,7 +1109,7 @@ /area/awaymission/jungle_planet/inside/complex) "bwB" = ( /obj/structure/bonfire/lit, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "bxc" = ( @@ -1130,7 +1130,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "byv" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) @@ -1171,7 +1171,7 @@ amount = 2 }, /obj/item/stock_parts/manipulator, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "purple" }, @@ -1202,7 +1202,7 @@ /obj/item/food/grown/onion, /obj/item/food/grown/potato, /obj/item/food/grown/potato, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/small) "bCI" = ( @@ -1221,8 +1221,8 @@ desc = "A clip on ID Badge, has one of those fancy new magnetic strips built in." }, /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/blood/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "bEz" = ( @@ -1232,7 +1232,7 @@ /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "bES" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/kirbyplants, /mob/living/simple_animal/hostile/poison_snake{ wander = 0 @@ -1333,7 +1333,7 @@ /obj/item/shard, /obj/item/clothing/mask/surgical, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -1355,8 +1355,8 @@ }, /area/awaymission/jungle_planet/outside/river) "bMV" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/awaymission/jungle_planet/outside/cave) "bNa" = ( @@ -1376,11 +1376,11 @@ pixel_x = -9; pixel_y = -7 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "bNI" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkbluefull" @@ -1435,8 +1435,8 @@ }, /area/awaymission/jungle_planet/inside) "bSK" = ( -/obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/oil/maybe, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -1468,8 +1468,8 @@ /obj/item/coin/gold, /obj/item/coin/gold, /obj/item/coin/gold, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/effect/spawner/random/dirt/often, +/obj/structure/closet/crate/wooden, /obj/item/salvage/loot/pirate, /obj/item/salvage/loot/pirate, /obj/item/salvage/loot/pirate, @@ -1508,12 +1508,12 @@ state_open = 1; interact_offline = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/awaymission/jungle_planet/outside/abandoned) "bYg" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -1538,7 +1538,7 @@ /obj/item/stack/cable_coil{ amount = 2 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -1558,12 +1558,12 @@ /obj/item/reagent_containers/drinks/drinkingglass{ pixel_x = -5 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "cbj" = ( /obj/machinery/light_construct/directional/south, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -1573,7 +1573,7 @@ /obj/structure/chair/wood{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "cbY" = ( @@ -1599,7 +1599,7 @@ "cdh" = ( /obj/structure/gunrack, /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "cfb" = ( @@ -1620,7 +1620,7 @@ /obj/structure/computerframe{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -1653,12 +1653,12 @@ "cge" = ( /obj/structure/table/wood, /obj/item/trash/tray, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "cgI" = ( /obj/item/flashlight, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "chq" = ( @@ -1668,7 +1668,7 @@ }, /area/awaymission/jungle_planet/outside/river) "cjo" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -1695,14 +1695,14 @@ /area/awaymission/jungle_planet/outside) "cll" = ( /obj/structure/flora/ausbushes/lavendergrass, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) "clv" = ( /obj/machinery/bodyscanner{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -1744,7 +1744,7 @@ /obj/effect/turf_decal/caution/stand_clear{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "cnW" = ( @@ -1821,7 +1821,7 @@ /area/awaymission/jungle_planet/outside/river) "crR" = ( /obj/machinery/light_construct/directional/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "csE" = ( @@ -1849,7 +1849,7 @@ /area/awaymission/jungle_planet/outside) "cum" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -1876,7 +1876,7 @@ /obj/structure/railing/corner{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "cxR" = ( @@ -1895,7 +1895,7 @@ "cyh" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "czz" = ( @@ -1906,7 +1906,7 @@ }, /obj/machinery/light/small/directional/east, /obj/structure/cable, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "cAA" = ( @@ -1938,7 +1938,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -1949,7 +1949,7 @@ pixel_x = -1; pixel_y = -11 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/cautery, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) @@ -1976,7 +1976,7 @@ }, /area/awaymission/jungle_planet/outside/cave) "cDs" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside) "cDS" = ( @@ -2036,7 +2036,7 @@ /obj/effect/turf_decal/arrows{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "cFz" = ( @@ -2047,7 +2047,7 @@ /area/awaymission/jungle_planet/outside) "cFB" = ( /obj/effect/turf_decal/box, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -2140,7 +2140,7 @@ /area/awaymission/jungle_planet/outside) "cJO" = ( /obj/effect/turf_decal/caution, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "cKa" = ( @@ -2150,7 +2150,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -2179,7 +2179,7 @@ }, /area/awaymission/jungle_planet/inside) "cNf" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "cNM" = ( @@ -2202,7 +2202,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/awaymission/jungle_planet/outside/abandoned) "cPg" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/bluegrid{ icon_state = "gcircuitoff" }, @@ -2258,7 +2258,7 @@ /area/awaymission/jungle_planet/outside/river) "cUf" = ( /obj/item/camera_assembly, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "purple" @@ -2309,8 +2309,8 @@ /obj/effect/decal/cleanable/blood/writing{ dir = 6 }, -/obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/frequent, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "cWx" = ( @@ -2321,7 +2321,7 @@ /obj/effect/decal/nanotrasen_logo{ icon_state = "logo6" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/newspaper, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -2359,7 +2359,7 @@ /area/awaymission/jungle_planet/outside/abandoned) "dbJ" = ( /obj/structure/dispenser/oxygen, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "dbU" = ( @@ -2389,7 +2389,7 @@ }, /area/awaymission/jungle_planet/inside/complex) "deq" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "purple" }, @@ -2442,7 +2442,7 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "djG" = ( @@ -2452,7 +2452,7 @@ /area/awaymission/jungle_planet/outside) "djO" = ( /obj/item/cigbutt, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "djW" = ( @@ -2472,7 +2472,7 @@ /area/awaymission/jungle_planet/outside/cave) "dkt" = ( /obj/machinery/light/directional/north, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -2480,14 +2480,14 @@ /area/awaymission/jungle_planet/inside/complex) "dkV" = ( /obj/effect/turf_decal/arrows, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "dla" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -2549,7 +2549,7 @@ /obj/structure/railing/corner{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "doc" = ( @@ -2562,7 +2562,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "dph" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/stock_parts/cell/high, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" @@ -2579,7 +2579,7 @@ /obj/item/flashlight/seclite, /obj/item/clothing/shoes/combat, /obj/item/storage/belt/security, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -2588,7 +2588,7 @@ /obj/effect/turf_decal/grass{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "drb" = ( @@ -2657,7 +2657,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -2688,7 +2688,7 @@ "dwN" = ( /obj/structure/bed, /obj/item/bedsheet/brown, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside) "dxA" = ( @@ -2711,7 +2711,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/waterfall) "dBV" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/awaymission/jungle_planet/outside/cave) "dCq" = ( @@ -2728,7 +2728,7 @@ /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "dGF" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -2750,7 +2750,7 @@ /obj/item/bedsheet/black{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "dKi" = ( @@ -2760,7 +2760,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "dKU" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "dLx" = ( @@ -2771,7 +2771,7 @@ /area/awaymission/jungle_planet/outside/cave) "dLG" = ( /obj/item/chair, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -2789,7 +2789,7 @@ /obj/structure/railing/corner{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "dMT" = ( @@ -2821,17 +2821,17 @@ /obj/effect/turf_decal/caution{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "dNU" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/radio, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "dOI" = ( /obj/item/flag/syndi, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/awaymission/jungle_planet/outside/abandoned) "dPd" = ( @@ -2901,7 +2901,7 @@ /area/awaymission/jungle_planet/outside/waterfall) "dSf" = ( /obj/item/reagent_containers/glass/rag, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -2914,7 +2914,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -2924,7 +2924,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -2956,7 +2956,7 @@ id = "Arm in"; req_access = list(301) }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -2989,12 +2989,12 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "dXw" = ( /obj/machinery/light_construct/small/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "dYL" = ( @@ -3006,7 +3006,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -3024,7 +3024,7 @@ amount = 2 }, /obj/item/assembly/prox_sensor, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/river) "dZH" = ( @@ -3039,7 +3039,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "eay" = ( @@ -3049,7 +3049,7 @@ }, /obj/item/gun/energy/laser/retro/old, /obj/item/fireaxe, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/small) "eaA" = ( @@ -3092,7 +3092,7 @@ /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "edO" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -3104,12 +3104,12 @@ /obj/structure/railing{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "efM" = ( /obj/machinery/light_construct/directional/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "efS" = ( @@ -3148,7 +3148,7 @@ pixel_x = 30; density = 0 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "eis" = ( @@ -3158,8 +3158,8 @@ /obj/item/bedsheet/black{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "ejI" = ( @@ -3176,12 +3176,12 @@ "elg" = ( /obj/structure/bed, /obj/item/stack/sheet/cloth, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "elw" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "elP" = ( @@ -3209,7 +3209,7 @@ /area/awaymission/jungle_planet/outside/abandoned) "enb" = ( /obj/item/cigbutt, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "enG" = ( @@ -3230,7 +3230,7 @@ /area/awaymission/jungle_planet/inside/complex) "epj" = ( /obj/item/camera_assembly, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -3238,7 +3238,7 @@ /area/awaymission/jungle_planet/inside/complex) "epz" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "epR" = ( @@ -3312,7 +3312,7 @@ /obj/structure/closet/crate, /obj/item/poster/syndicate_recruitment, /obj/item/taperecorder/empty, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/awaymission/jungle_planet/outside/abandoned) "etK" = ( @@ -3367,7 +3367,7 @@ pixel_y = -9 }, /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -3379,7 +3379,7 @@ id = "gatelizard_piratcaptain"; name = "hidden button" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "ewJ" = ( @@ -3387,7 +3387,7 @@ dir = 8; pixel_x = -27 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "ewM" = ( @@ -3409,7 +3409,7 @@ "eyi" = ( /obj/effect/turf_decal/delivery/red/hollow, /obj/structure/mecha_wreckage/ripley, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "ezc" = ( @@ -3421,12 +3421,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "eAh" = ( /obj/machinery/light_construct/small/west, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "eBs" = ( @@ -3454,7 +3454,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/waterfall) "eDn" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil{ pixel_y = -11; amount = 2 @@ -3515,9 +3515,9 @@ /area/awaymission/jungle_planet/inside/complex) "eGY" = ( /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/landmark/awaystart, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "eHa" = ( @@ -3549,7 +3549,7 @@ dir = 4; pixel_x = 8 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "eIQ" = ( @@ -3607,7 +3607,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) "eKx" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside/river) "eLl" = ( @@ -3641,8 +3641,8 @@ "eOG" = ( /obj/structure/bed, /obj/item/bedsheet/black, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "eOP" = ( @@ -3663,7 +3663,7 @@ /obj/effect/turf_decal/delivery, /obj/structure/closet/crate, /obj/item/stack/sheet/metal/fifty, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -3729,13 +3729,13 @@ "eSa" = ( /obj/structure/mineral_door/wood, /obj/structure/barricade/wooden/crude, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "eSc" = ( -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /obj/item/stock_parts/micro_laser, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "eTu" = ( @@ -3771,7 +3771,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside) "eUG" = ( @@ -3860,7 +3860,7 @@ /area/awaymission/jungle_planet/outside/river) "ffh" = ( /obj/item/ammo_casing/caseless/arrow, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "ffL" = ( @@ -3874,7 +3874,7 @@ /obj/effect/turf_decal/arrows{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -3884,7 +3884,7 @@ /obj/structure/bed{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -3921,7 +3921,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "fiw" = ( @@ -3933,8 +3933,8 @@ /area/awaymission/jungle_planet/outside/waterfall) "fiM" = ( /obj/effect/turf_decal/box, -/obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -3987,7 +3987,7 @@ /area/awaymission/jungle_planet/inside/complex) "fnP" = ( /obj/structure/spider/stickyweb, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "fpm" = ( @@ -4005,7 +4005,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "fpQ" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -4119,7 +4119,7 @@ /obj/effect/turf_decal/arrows{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "fyJ" = ( @@ -4216,7 +4216,7 @@ }, /area/awaymission/jungle_planet/outside/cave) "fEq" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "fET" = ( @@ -4261,7 +4261,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "fFk" = ( @@ -4283,13 +4283,13 @@ /obj/item/clothing/mask/cigarette/pipe, /obj/item/stack/spacecash/c100, /obj/item/lighter/zippo/fluff/purple, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/ammo_box/shotgun/buck, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "fGf" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside) "fGg" = ( @@ -4330,12 +4330,12 @@ /area/awaymission/jungle_planet/outside) "fJc" = ( /obj/structure/chair/comfy/brown, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "fJs" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -4352,12 +4352,12 @@ pixel_x = 9; pixel_y = -9 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "fKx" = ( /obj/machinery/light_construct/directional/west, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purple" @@ -4387,7 +4387,7 @@ /obj/effect/turf_decal/arrows{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "purplecorner" }, @@ -4399,7 +4399,7 @@ }, /area/awaymission/jungle_planet/outside/cave) "fMh" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside) "fMq" = ( @@ -4438,7 +4438,7 @@ max_amount = 5 }, /obj/item/ammo_casing/caseless/arrow, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside/river) "fPe" = ( @@ -4459,13 +4459,13 @@ /turf/simulated/floor/indestructible/grass/no_creep, /area/awaymission/jungle_planet/outside) "fRW" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/salvage/ruin/pirate, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "fSp" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside/river) "fSv" = ( @@ -4521,18 +4521,18 @@ /area/awaymission/jungle_planet/inside/complex) "fYj" = ( /obj/structure/railing, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside/river) "fYG" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/reagent_containers/drinks/bottle/rum{ list_reagents = list("rum" = 0) }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "fZj" = ( @@ -4561,7 +4561,7 @@ /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "gaK" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/awaymission/jungle_planet/inside/complex) "gbK" = ( @@ -4578,14 +4578,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "gck" = ( -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /obj/item/stock_parts/capacitor, /obj/item/stock_parts/capacitor{ pixel_x = 14 @@ -4604,7 +4604,7 @@ }, /area/awaymission/jungle_planet/inside/complex) "gdv" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mech_bay_recharge_floor, /area/awaymission/jungle_planet/inside/complex) "gdK" = ( @@ -4616,7 +4616,7 @@ dir = 8 }, /obj/effect/turf_decal/arrows, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -4632,7 +4632,7 @@ /area/awaymission/jungle_planet/outside/waterfall) "gfM" = ( /obj/machinery/light/directional/north, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "gge" = ( @@ -4649,11 +4649,11 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "giu" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -4678,7 +4678,7 @@ /area/awaymission/jungle_planet/outside) "gkO" = ( /obj/item/toy/crayon/spraycan, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "glo" = ( @@ -4686,14 +4686,14 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "glO" = ( /obj/structure/railing{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "gmI" = ( @@ -4753,7 +4753,7 @@ layer = 5; pixel_y = 14 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -4809,7 +4809,7 @@ "gvS" = ( /obj/structure/bed, /obj/item/bedsheet/brown, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "gwC" = ( @@ -4827,12 +4827,12 @@ /area/awaymission/jungle_planet/outside) "gxN" = ( /obj/machinery/door/firedoor/closed, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "gxQ" = ( /obj/effect/turf_decal/delivery/red/hollow, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "gxU" = ( @@ -4855,12 +4855,12 @@ /area/awaymission/jungle_planet/inside/complex) "gyH" = ( /obj/structure/railing/corner, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside) "gzp" = ( /obj/structure/curtain/medical, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -4886,7 +4886,7 @@ "gAk" = ( /obj/effect/turf_decal/box, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "gAD" = ( @@ -4901,7 +4901,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -4926,7 +4926,7 @@ "gDF" = ( /obj/structure/closet, /obj/item/clothing/under/color/red, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -4965,7 +4965,7 @@ /area/awaymission/jungle_planet/outside/cave) "gGu" = ( /obj/structure/table/wood, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "gGN" = ( @@ -4982,7 +4982,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "gHN" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/broken_bottle, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/wood/oak, @@ -5001,15 +5001,15 @@ /obj/structure/chair/sofa/right{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/frequent, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "gJG" = ( /obj/item/storage/belt/medical{ pixel_y = 18 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -5103,7 +5103,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -5134,7 +5134,7 @@ /obj/structure/closet{ opened = 1 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/clothing/suit/blacktrenchcoat, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside) @@ -5178,7 +5178,7 @@ }, /area/awaymission/jungle_planet/inside) "gUQ" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/shovel{ pixel_x = -5 }, @@ -5192,25 +5192,25 @@ density = 1; climbable = 1 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/claymore/ceremonial, /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) "gVX" = ( /obj/item/stack/rods, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside/river) "gWs" = ( /obj/structure/railing{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "gWu" = ( /obj/structure/flora/rock, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/bluegrid{ icon_state = "gcircuitoff" }, @@ -5251,7 +5251,7 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -5275,14 +5275,14 @@ }, /area/awaymission/jungle_planet/outside/river) "haC" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/awaymission/jungle_planet/inside/complex) "haX" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "hbb" = ( @@ -5307,7 +5307,7 @@ /area/awaymission/jungle_planet/inside/complex) "hcz" = ( /obj/item/paper/crumpled, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "hdm" = ( @@ -5321,7 +5321,7 @@ /area/awaymission/jungle_planet/inside/complex) "hdu" = ( /obj/effect/turf_decal/stripes/line, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "heb" = ( @@ -5353,7 +5353,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil{ amount = 5 }, @@ -5387,7 +5387,7 @@ /obj/structure/chair/wood{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "hga" = ( @@ -5438,7 +5438,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil{ amount = 5 }, @@ -5472,7 +5472,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "hlm" = ( @@ -5481,8 +5481,8 @@ icon_state = "mirror_broke"; pixel_x = 28 }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" @@ -5492,14 +5492,14 @@ /obj/structure/grille/broken, /obj/effect/decal/cleanable/spiderling_remains, /obj/item/cigbutt, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "hmu" = ( /obj/item/chair{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "hnr" = ( @@ -5529,7 +5529,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "hoX" = ( @@ -5596,7 +5596,7 @@ pixel_x = 6 }, /obj/item/stack/medical/bruise_pack, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -5634,7 +5634,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -5656,7 +5656,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "huL" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "purplecorner" @@ -5668,7 +5668,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /turf/simulated/floor/engine, /area/awaymission/jungle_planet/inside/complex) "hvD" = ( @@ -5707,7 +5707,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -5733,8 +5733,8 @@ /obj/item/bedsheet/blue{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/frequent, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "hAv" = ( @@ -5745,7 +5745,7 @@ /obj/item/storage/backpack/industrial, /obj/item/storage/belt/utility, /obj/item/storage/bag/ore, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "browncorner" }, @@ -5772,7 +5772,7 @@ "hDZ" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/brflowers, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) "hEw" = ( @@ -5799,7 +5799,7 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "hFQ" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "hGt" = ( @@ -5818,7 +5818,7 @@ /area/awaymission/jungle_planet/outside/cave) "hHj" = ( /obj/structure/chair/wood, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "hHM" = ( @@ -5863,7 +5863,7 @@ /area/awaymission/jungle_planet/outside/river) "hIW" = ( /mob/living/simple_animal/hostile/jungle_lizard/meele, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "hJI" = ( @@ -5890,7 +5890,7 @@ dir = 4; pixel_y = -7 }, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/awaymission/jungle_planet/inside/complex) "hKc" = ( @@ -5929,7 +5929,7 @@ "hNN" = ( /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) @@ -6072,11 +6072,11 @@ }, /area/awaymission/jungle_planet/outside/river) "hYQ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/awaymission/jungle_planet/outside/cave/pirate) "iad" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/awaymission/jungle_planet/outside/abandoned) "iah" = ( @@ -6100,7 +6100,7 @@ /obj/effect/turf_decal/arrows{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -6118,7 +6118,7 @@ dir = 8 }, /obj/machinery/light_construct/directional/north, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -6134,7 +6134,7 @@ dir = 1 }, /obj/machinery/light_construct/directional/west, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/landmark/awaystart, /turf/simulated/floor/plasteel{ dir = 4; @@ -6143,7 +6143,7 @@ /area/awaymission/jungle_planet/inside) "ibX" = ( /obj/item/chair, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside) "icJ" = ( @@ -6168,7 +6168,7 @@ pixel_y = 10; amount = 2 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "iek" = ( @@ -6207,7 +6207,7 @@ }, /area/awaymission/jungle_planet/outside/cave) "ifJ" = ( -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, /obj/effect/decal/cleanable/cobweb2{ @@ -6217,7 +6217,7 @@ /area/awaymission/jungle_planet/inside/complex) "igf" = ( /obj/effect/turf_decal/box, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "igC" = ( @@ -6270,7 +6270,7 @@ /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "ikb" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -6301,7 +6301,7 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "ilA" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -6323,7 +6323,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil{ amount = 5 }, @@ -6391,7 +6391,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) "isG" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/beach/away/sand, /area/awaymission/jungle_planet/outside/river) "isU" = ( @@ -6435,7 +6435,7 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "iuK" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside/river) "iuL" = ( @@ -6444,7 +6444,7 @@ /obj/item/stack/sheet/mineral/bananium{ amount = 30 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -6501,7 +6501,7 @@ /area/awaymission/jungle_planet/outside) "iyT" = ( /obj/item/chair, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/ammo_casing/caseless/arrow, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/abandoned) @@ -6509,7 +6509,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "iAq" = ( @@ -6521,7 +6521,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "iAY" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -6574,7 +6574,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "iEF" = ( @@ -6598,7 +6598,7 @@ /obj/effect/landmark/awaymissions/gate_lizard/mob_spawn/ranged{ id = "cave4" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "iGn" = ( @@ -6614,7 +6614,7 @@ "iGS" = ( /obj/structure/chair, /obj/item/newspaper, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "iGT" = ( @@ -6643,8 +6643,8 @@ }, /area/awaymission/jungle_planet/outside/river) "iJu" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -6652,8 +6652,8 @@ /area/awaymission/jungle_planet/inside/complex) "iJL" = ( /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "iKa" = ( @@ -6675,7 +6675,7 @@ /obj/item/storage/fancy/cigarettes/cigpack_robust, /obj/item/razor, /obj/item/clothing/glasses/sunglasses, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -6689,7 +6689,7 @@ anchored = 1; desc = "A mysterious gateway built by unknown hands, it allows for faster than light travel to far-flung locations." }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "iKW" = ( @@ -6715,7 +6715,7 @@ /area/awaymission/jungle_planet/outside/cave) "iMH" = ( /obj/effect/turf_decal/delivery, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -6755,7 +6755,7 @@ pixel_y = -11; amount = 2 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "purplecorner" @@ -6770,9 +6770,9 @@ }, /area/awaymission/jungle_planet/outside/cave) "iPQ" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/ammo_casing/caseless/arrow, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/storage/firstaid/regular/empty, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -6791,14 +6791,14 @@ pixel_x = -6; pixel_y = 4 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/awaymission/jungle_planet/inside/complex) "iQn" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "iRg" = ( @@ -6816,12 +6816,12 @@ /obj/item/storage/backpack/industrial, /obj/item/storage/belt/utility, /obj/item/storage/bag/ore, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "iRJ" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/maybe, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "iTk" = ( @@ -6833,7 +6833,7 @@ /obj/item/stack/sheet/wood{ amount = 30 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "iUc" = ( @@ -6848,7 +6848,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -6889,7 +6889,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -6905,13 +6905,13 @@ icon_state = "medium" }, /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "iXN" = ( /obj/item/ammo_casing/caseless/arrow, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "iYQ" = ( @@ -6962,7 +6962,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "jck" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -6991,7 +6991,7 @@ /area/awaymission/jungle_planet/outside) "jei" = ( /obj/effect/turf_decal/caution/stand_clear/red, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "jeC" = ( @@ -7022,7 +7022,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/machinery/power/apc/off_station/empty_charge/directional/east, /turf/simulated/floor/plasteel{ dir = 4; @@ -7033,7 +7033,7 @@ /obj/effect/decal/cleanable/blood/writing{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -7074,7 +7074,7 @@ /area/awaymission/jungle_planet/outside/abandoned) "jiB" = ( /obj/effect/decal/cleanable/ash, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "jiZ" = ( @@ -7093,7 +7093,7 @@ /area/awaymission/jungle_planet/inside/complex) "jlc" = ( /obj/effect/turf_decal/delivery, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "jlv" = ( @@ -7122,7 +7122,7 @@ pixel_y = 10; amount = 2 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "jlV" = ( @@ -7150,7 +7150,7 @@ /obj/effect/decal/cleanable/blood/writing{ dir = 5 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "jps" = ( @@ -7255,7 +7255,7 @@ /obj/effect/turf_decal/arrows{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -7265,7 +7265,7 @@ /obj/structure/railing/corner{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "jvT" = ( @@ -7290,7 +7290,7 @@ /obj/effect/turf_decal/loading_area{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -7323,7 +7323,7 @@ /obj/item/multitool{ pixel_x = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "jAq" = ( @@ -7353,7 +7353,7 @@ /obj/structure/chair/wood{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/small) "jCf" = ( @@ -7425,7 +7425,7 @@ pixel_y = 11 }, /obj/machinery/light/directional/east, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -7435,7 +7435,7 @@ dir = 4; pixel_y = 3 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -7479,7 +7479,7 @@ /obj/effect/turf_decal/caution{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "jHY" = ( @@ -7521,7 +7521,7 @@ /area/awaymission/jungle_planet/outside/waterfall) "jIx" = ( /obj/effect/decal/nanotrasen_logo/n1, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "jKc" = ( @@ -7537,7 +7537,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "jKq" = ( @@ -7550,7 +7550,7 @@ dir = 1 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "jLE" = ( @@ -7570,7 +7570,7 @@ /obj/structure/chair/wood{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "jMH" = ( @@ -7582,7 +7582,7 @@ pixel_x = 7 }, /obj/machinery/light_construct/directional/west, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "jMK" = ( @@ -7603,7 +7603,7 @@ pixel_y = -11; amount = 2 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purple" @@ -7630,7 +7630,7 @@ /area/awaymission/jungle_planet/outside/river) "jPS" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -7646,7 +7646,7 @@ /obj/item/shard{ icon_state = "small" }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/blood/writing{ dir = 4 }, @@ -7655,7 +7655,7 @@ name = "Security Shutters-control"; req_access = list(301) }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -7671,7 +7671,7 @@ /obj/item/stack/cable_coil{ amount = 2 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "jVn" = ( @@ -7684,7 +7684,7 @@ /area/awaymission/jungle_planet/outside/waterfall) "jVr" = ( /obj/structure/closet/crate, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/spawner/random/trash, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside) @@ -7701,7 +7701,7 @@ /obj/item/clothing/glasses/eyepatch, /obj/item/clothing/head/hgpiratecap, /obj/item/clothing/shoes/fluff/noble_boot, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "jYd" = ( @@ -7729,7 +7729,7 @@ /obj/item/storage/belt/utility{ pixel_y = -8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "jZg" = ( @@ -7771,7 +7771,7 @@ /area/awaymission/jungle_planet/outside/waterfall) "kba" = ( /obj/machinery/light_construct/directional/west, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "kby" = ( @@ -7785,7 +7785,7 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "kcy" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -7816,7 +7816,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -7863,7 +7863,7 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "khX" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -7884,7 +7884,7 @@ /obj/item/stack/sheet/metal, /obj/item/stack/rods, /obj/structure/flora/ausbushes/lavendergrass, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/inside/complex) "kjq" = ( @@ -7915,8 +7915,8 @@ /area/awaymission/jungle_planet/outside/waterfall) "kka" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -7933,7 +7933,7 @@ /area/awaymission/jungle_planet/outside/cave) "klh" = ( /obj/item/bedsheet/brown, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside) "klA" = ( @@ -7950,7 +7950,7 @@ "kmg" = ( /obj/machinery/door/airlock/glass, /obj/structure/firelock_frame, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "kmw" = ( @@ -8025,14 +8025,14 @@ /obj/item/bedsheet/brown{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "krt" = ( /obj/item/chair/wood{ pixel_x = 22 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "ksq" = ( @@ -8041,7 +8041,7 @@ dir = 8; pixel_y = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whiteblue" @@ -8063,8 +8063,8 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "kuj" = ( -/obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/oil/maybe, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "kuH" = ( @@ -8092,14 +8092,14 @@ /obj/item/kitchen/rollingpin{ pixel_y = 7 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" }, /area/awaymission/jungle_planet/inside/complex) "kvJ" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -8121,13 +8121,13 @@ /area/awaymission/jungle_planet/inside/complex) "kwl" = ( /obj/machinery/light/small/directional/east, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "kwD" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "kwU" = ( @@ -8142,9 +8142,9 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/abandoned) "kxv" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/machinery/door/firedoor, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "kxC" = ( @@ -8174,7 +8174,7 @@ /area/awaymission/jungle_planet/outside) "kzI" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -8189,7 +8189,7 @@ /obj/structure/closet/crate{ opened = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "kBQ" = ( @@ -8212,7 +8212,7 @@ /obj/item/razor, /obj/item/clothing/suit/leathercoat, /obj/item/clothing/head/flatcap, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/card/id/away/old/sec{ name = "MC-16 multicard"; desc = "A clip on ID Badge, has one of those fancy new magnetic strips built in." @@ -8240,7 +8240,7 @@ icon_screen = "broken"; icon_keyboard = "generic_key_broken" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -8256,7 +8256,7 @@ anchored = 1; dir = 6 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkgreycamo" @@ -8264,7 +8264,7 @@ /area/awaymission/jungle_planet/inside) "kEk" = ( /obj/effect/turf_decal/delivery, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "kEE" = ( @@ -8273,7 +8273,7 @@ /area/awaymission/jungle_planet/outside/river) "kGA" = ( /obj/structure/chair, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside) "kGW" = ( @@ -8293,14 +8293,14 @@ /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "kHP" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "kHW" = ( /obj/effect/turf_decal/caution/stand_clear/red, -/obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/oil/maybe, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "kIg" = ( @@ -8316,7 +8316,7 @@ /obj/item/stock_parts/cell/high/empty, /obj/item/stack/cable_coil, /obj/item/broken_device, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "kJf" = ( @@ -8331,7 +8331,7 @@ dir = 4 }, /obj/machinery/light_construct/directional/west, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -8350,7 +8350,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil{ amount = 5 }, @@ -8362,13 +8362,13 @@ /obj/machinery/economy/vending/medical{ req_access = list(301) }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/awaymission/jungle_planet/inside/complex) "kLj" = ( -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_2" }, /turf/simulated/floor/bluegrid{ @@ -8410,11 +8410,11 @@ /area/awaymission/jungle_planet/outside/cave) "kRa" = ( /obj/structure/chair/wood, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "kRf" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside) "kRN" = ( @@ -8426,7 +8426,7 @@ /area/awaymission/jungle_planet/inside/complex) "kRO" = ( /obj/structure/sink/directional/west, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -8446,7 +8446,7 @@ pixel_x = -32; density = 0 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purple" @@ -8539,13 +8539,13 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside/abandoned) "kWk" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -8558,7 +8558,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "kXb" = ( @@ -8587,7 +8587,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -8613,15 +8613,15 @@ /area/awaymission/jungle_planet/outside) "kZZ" = ( /obj/structure/bed, -/obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/maybe, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "lbq" = ( /obj/effect/turf_decal/caution{ dir = 8 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -8678,12 +8678,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "leE" = ( /obj/machinery/mecha_part_fabricator, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "lfb" = ( @@ -8707,13 +8707,13 @@ }, /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "lgq" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -8740,7 +8740,7 @@ /area/awaymission/jungle_planet/outside) "lid" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/bluegrid{ icon_state = "gcircuitoff" }, @@ -8777,7 +8777,7 @@ /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "ljf" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/salvage/ruin/pirate, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) @@ -8840,7 +8840,7 @@ /obj/item/stack/cable_coil{ amount = 2 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "lms" = ( @@ -8850,7 +8850,7 @@ icon_keyboard = "generic_key_broken" }, /obj/item/paper, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "lmK" = ( @@ -8875,7 +8875,7 @@ /area/awaymission/jungle_planet/inside/complex) "lnA" = ( /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -8888,7 +8888,7 @@ /obj/structure/computerframe{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -8974,7 +8974,7 @@ /area/awaymission/jungle_planet/outside/river) "lwg" = ( /obj/structure/closet/crate/secure/loot, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "lwj" = ( @@ -9045,14 +9045,14 @@ "lAr" = ( /obj/structure/table/wood, /obj/item/trash/plate, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "lCT" = ( /obj/structure/reagent_dispensers/fueltank/chem{ pixel_y = 30 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel{ icon_state = "purple"; dir = 1 @@ -9094,7 +9094,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -9109,11 +9109,11 @@ /obj/structure/chair{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "lGN" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside) "lIv" = ( @@ -9121,7 +9121,7 @@ /area/awaymission/jungle_planet/outside/river) "lIF" = ( /obj/machinery/iv_drip, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitebluecorner" @@ -9129,7 +9129,7 @@ /area/awaymission/jungle_planet/inside/complex) "lIX" = ( /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "lIZ" = ( @@ -9150,11 +9150,11 @@ "lJw" = ( /obj/structure/gunrack, /obj/item/gun/energy/e_gun/old, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "lJK" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "lKZ" = ( @@ -9305,8 +9305,8 @@ /obj/structure/closet, /obj/item/clothing/under/costume/pirate, /obj/item/clothing/head/bandana, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "lVB" = ( @@ -9381,13 +9381,13 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) "mcY" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "mdf" = ( /obj/machinery/firealarm/directional/north, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -9404,13 +9404,13 @@ /obj/structure/railing{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "mdt" = ( /obj/structure/bed, /obj/item/bedsheet/blue, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "mfd" = ( @@ -9420,7 +9420,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -9489,7 +9489,7 @@ icon_state = "small" }, /obj/item/shard, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "miM" = ( @@ -9503,7 +9503,7 @@ /area/awaymission/jungle_planet/outside/river) "mjF" = ( /obj/effect/turf_decal/arrows, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -9597,8 +9597,8 @@ /obj/item/clothing/mask/cigarette/pipe, /obj/item/lighter/zippo/engraved, /obj/item/clothing/head/helmet/skull, -/obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/frequent, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "mmK" = ( @@ -9620,7 +9620,7 @@ }, /area/awaymission/jungle_planet/outside) "mog" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/indestructible/riveted, /area/awaymission/jungle_planet/outside/cave) "mph" = ( @@ -9628,7 +9628,7 @@ /obj/effect/decal/cleanable/cobweb2{ icon_state = "cobweb1" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -9636,7 +9636,7 @@ "mpQ" = ( /obj/machinery/firealarm/directional/south, /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plasteel{ icon_state = "purple" }, @@ -9664,14 +9664,14 @@ /obj/effect/turf_decal/grass{ icon_state = "grass_edge_big_corner" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "mqZ" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/clothing/shoes/workboots, /turf/simulated/floor/plasteel{ dir = 1; @@ -9680,7 +9680,7 @@ /area/awaymission/jungle_planet/inside/complex) "mre" = ( /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/ammo_casing/caseless/arrow, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -9690,7 +9690,7 @@ /area/awaymission/jungle_planet/outside/cave/small) "msr" = ( /obj/machinery/atmospherics/binary/valve, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "msZ" = ( @@ -9772,7 +9772,7 @@ }, /area/awaymission/jungle_planet/outside) "mxl" = ( -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, /turf/simulated/floor/plating, @@ -9802,7 +9802,7 @@ /area/awaymission/jungle_planet/outside) "mzt" = ( /obj/item/chair/wood, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "mzv" = ( @@ -9812,8 +9812,8 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) "mzx" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -9885,7 +9885,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "mDQ" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -9896,7 +9896,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "mFh" = ( @@ -9909,7 +9909,7 @@ /obj/effect/turf_decal/grass{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -9943,7 +9943,7 @@ /area/awaymission/jungle_planet/inside/complex) "mHV" = ( /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/ammo_casing/caseless/arrow, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/abandoned) @@ -9962,7 +9962,7 @@ /obj/structure/closet, /obj/item/storage/fancy/cigarettes/cigpack_robust, /obj/item/storage/belt/fannypack, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -9982,7 +9982,7 @@ amount = 1; max_amount = 5 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside/river) "mJv" = ( @@ -10010,7 +10010,7 @@ }, /area/awaymission/jungle_planet/outside/waterfall) "mKz" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -10022,14 +10022,14 @@ amount = 2 }, /obj/item/ammo_casing/caseless/arrow, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "mKY" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating/asteroid/ancient{ name = "ground" }, @@ -10038,7 +10038,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "mLY" = ( @@ -10056,7 +10056,7 @@ /obj/structure/closet/crate/wooden/barrel, /obj/item/food/meat, /obj/item/food/meat, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "mNu" = ( @@ -10297,15 +10297,15 @@ }, /area/awaymission/jungle_planet/outside/cave) "mYW" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/frequent, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "mZK" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "mZT" = ( @@ -10344,8 +10344,8 @@ /obj/item/clothing/gloves/ring/gold, /obj/item/clothing/accessory/necklace/locket, /obj/item/coin/gold, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/effect/spawner/random/dirt/often, +/obj/structure/closet/crate/wooden, /obj/item/salvage/loot/pirate, /obj/item/salvage/loot/pirate, /obj/item/salvage/loot/pirate, @@ -10368,7 +10368,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -10378,7 +10378,7 @@ /obj/effect/landmark/awaymissions/gate_lizard/mob_spawn/melee_axe{ id = "cave4" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "neX" = ( @@ -10407,15 +10407,15 @@ dir = 8 }, /obj/structure/sign/poster/official/random/east, -/obj/effect/spawner/random_spawners/dirt_frequent, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/frequent, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "ngO" = ( /obj/effect/decal/cleanable/blood/writing{ dir = 5 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -10439,8 +10439,8 @@ /obj/item/clothing/gloves/bracer, /obj/item/clothing/gloves/bracer, /obj/item/clothing/suit/armor/bone, -/obj/structure/closet/crate/wooden/wooden_crate, -/obj/effect/landmark/damageturf, +/obj/structure/closet/crate/wooden, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "njd" = ( @@ -10461,7 +10461,7 @@ /area/awaymission/jungle_planet/inside/complex) "njE" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "njH" = ( @@ -10476,7 +10476,7 @@ /area/awaymission/jungle_planet/outside/cave) "njP" = ( /obj/effect/turf_decal/box, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "nld" = ( @@ -10504,7 +10504,7 @@ /area/awaymission/jungle_planet/outside/river) "nqg" = ( /mob/living/simple_animal/lizard, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "nry" = ( @@ -10519,7 +10519,7 @@ /obj/item/stack/sheet/metal, /obj/item/stack/rods, /obj/item/stack/sheet/metal, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "nsm" = ( @@ -10536,7 +10536,7 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "nuz" = ( @@ -10587,7 +10587,7 @@ /area/awaymission/jungle_planet/outside/abandoned) "nwM" = ( /obj/machinery/light/directional/west, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "rampbottom" }, @@ -10625,7 +10625,7 @@ /area/awaymission/jungle_planet/outside) "nzK" = ( /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -10646,7 +10646,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 25 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -10661,7 +10661,7 @@ /turf/simulated/floor/beach/away/sand, /area/awaymission/jungle_planet/outside/river) "nCA" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "nCT" = ( @@ -10683,7 +10683,7 @@ /area/awaymission/jungle_planet/outside/river) "nEG" = ( /obj/effect/turf_decal/stripes/line, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "nFb" = ( @@ -10712,8 +10712,8 @@ /obj/item/hemostat{ pixel_y = 2 }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/frequent, /obj/item/FixOVein, /obj/item/surgicaldrill, /turf/simulated/floor/plasteel{ @@ -10760,8 +10760,8 @@ /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "nMr" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/indestructible/riveted, /area/awaymission/jungle_planet/outside/cave) "nMI" = ( @@ -10770,12 +10770,12 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside/abandoned) "nMQ" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "nNc" = ( /obj/structure/falsewall/bookcase, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "nNs" = ( @@ -10797,7 +10797,7 @@ /obj/effect/decal/cleanable/blood/writing{ dir = 5 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "nOE" = ( @@ -10805,7 +10805,7 @@ name = "south extinguisher cabinet"; pixel_y = -30 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -10858,7 +10858,7 @@ /area/awaymission/jungle_planet/inside/complex) "nRW" = ( /obj/effect/turf_decal/delivery/white, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "nSy" = ( @@ -10872,7 +10872,7 @@ /area/awaymission/jungle_planet/outside/river) "nSR" = ( /obj/machinery/light_construct/directional/south, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "nSX" = ( @@ -10932,7 +10932,7 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 30 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "nWE" = ( @@ -10956,14 +10956,14 @@ /area/awaymission/jungle_planet/outside/cave) "nZd" = ( /obj/structure/sign/poster/contraband/random/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/awaymission/jungle_planet/outside/abandoned) "nZe" = ( /obj/item/reagent_containers/drinks/trophy/silver_cup, /obj/item/clothing/gloves/ring/gold, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/effect/spawner/random/dirt/often, +/obj/structure/closet/crate/wooden, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "nZE" = ( @@ -10975,7 +10975,7 @@ /obj/effect/turf_decal/arrows{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "oal" = ( @@ -10997,7 +10997,7 @@ /area/awaymission/jungle_planet/inside) "obG" = ( /obj/machinery/light_construct/directional/west, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/decal/cleanable/ants, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside) @@ -11084,13 +11084,13 @@ /obj/effect/turf_decal/caution/stand_clear{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "oiZ" = ( /obj/item/stack/rods, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -11129,27 +11129,27 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "omz" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/indestructible/riveted, /area/awaymission/jungle_planet/inside/complex) "omT" = ( /obj/effect/decal/cleanable/cobweb, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/food/grown/cannabis, /obj/item/food/grown/cannabis, /obj/item/food/grown/cannabis/ultimate, /obj/item/food/grown/cannabis/ultimate, /obj/item/food/grown/cannabis/ultimate, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "omY" = ( /obj/item/flag, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/small) "onb" = ( @@ -11164,8 +11164,8 @@ /turf/simulated/floor/beach/away/water/deep/dense_canpass, /area/awaymission/jungle_planet/outside/cave) "ooe" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "oov" = ( @@ -11181,7 +11181,7 @@ /obj/effect/decal/nanotrasen_logo{ icon_state = "logo2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "opl" = ( @@ -11208,7 +11208,7 @@ /area/awaymission/jungle_planet/outside/river) "oqo" = ( /obj/machinery/light/directional/west, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "oqX" = ( @@ -11228,7 +11228,7 @@ /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "orm" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "osc" = ( @@ -11344,7 +11344,7 @@ /obj/item/stack/sheet/bone{ amount = 5 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating/asteroid/ancient{ name = "ground" }, @@ -11393,7 +11393,7 @@ anchored = 1; dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkgreycamo" @@ -11450,7 +11450,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -11463,25 +11463,25 @@ /obj/structure/sign/securearea{ pixel_x = 32 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "oFY" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "oHz" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate, /obj/item/stack/sheet/mineral/plasma/fifty, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "oHE" = ( /obj/effect/decal/cleanable/blood/writing, /obj/structure/sign/poster/official/random/west, /obj/machinery/light_construct/directional/west, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -11511,7 +11511,7 @@ /area/awaymission/jungle_planet/outside) "oJx" = ( /obj/structure/closet/crate, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -11525,7 +11525,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "oKw" = ( @@ -11562,7 +11562,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/awaymission/jungle_planet/inside) "oMg" = ( @@ -11573,7 +11573,7 @@ pixel_x = -11; pixel_y = 2 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "oMS" = ( @@ -11582,7 +11582,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -11598,7 +11598,7 @@ /obj/item/clothing/gloves/ring/gold, /obj/structure/safe/floor, /obj/item/documents/nanotrasen, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/kirbyplants, /mob/living/simple_animal/hostile/poison_snake{ wander = 0 @@ -11606,7 +11606,7 @@ /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "oND" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/landmark/awaystart, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside) @@ -11619,7 +11619,7 @@ "oPC" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "oQl" = ( @@ -11634,7 +11634,7 @@ /area/awaymission/jungle_planet/outside/cave) "oRs" = ( /obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "oRE" = ( @@ -11676,8 +11676,8 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/cave/small) "oSL" = ( -/obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/oil/maybe, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -11687,7 +11687,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/decal/remains/human, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) @@ -11785,16 +11785,16 @@ /area/awaymission/jungle_planet/outside/river) "pbE" = ( /obj/structure/chair/wood, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "pbH" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "pce" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "pcp" = ( @@ -11827,7 +11827,7 @@ /area/awaymission/jungle_planet/outside) "pdL" = ( /obj/item/clothing/glasses/sunglasses, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "pdY" = ( @@ -11842,7 +11842,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/waterfall) "pfh" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkgreycamo" @@ -11862,7 +11862,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -11884,14 +11884,14 @@ /obj/structure/bed, /obj/item/bedsheet/red, /obj/machinery/light_construct/directional/east, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, /area/awaymission/jungle_planet/inside/complex) "piV" = ( /obj/structure/largecrate, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -11920,8 +11920,8 @@ /obj/item/stack/spacecash/c1000, /obj/item/stack/spacecash/c500, /obj/machinery/light/small/directional/south, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/effect/spawner/random/dirt/often, +/obj/structure/closet/crate/wooden, /obj/item/stack/spacecash/c1000, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) @@ -11962,7 +11962,7 @@ /area/awaymission/jungle_planet/inside/complex) "plU" = ( /obj/effect/decal/cleanable/blood/old, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "pmk" = ( @@ -11975,11 +11975,11 @@ pixel_y = -6; pixel_x = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/inside/complex) "pnG" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "pnJ" = ( @@ -11991,7 +11991,7 @@ /obj/effect/landmark/awaymissions/gate_lizard/mob_spawn/melee_axe{ id = "cave3" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "ppD" = ( @@ -12004,18 +12004,18 @@ "ppW" = ( /obj/structure/statue/silver/monkey, /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "pqt" = ( /obj/machinery/firealarm/directional/south, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "prp" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside/river) "prI" = ( @@ -12084,15 +12084,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "pwP" = ( /turf/simulated/wall/indestructible/wood, /area/awaymission/jungle_planet/outside/cave/pirate) "pwS" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" @@ -12116,7 +12116,7 @@ /obj/effect/turf_decal/arrows{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -12130,9 +12130,9 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "pzW" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/bedsheet/black, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "pzZ" = ( @@ -12169,11 +12169,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "pDO" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/kirbyplants, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -12204,7 +12204,7 @@ /obj/structure/chair/wood{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "pGk" = ( @@ -12226,11 +12226,11 @@ }, /area/awaymission/jungle_planet/inside/complex) "pGZ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/awaymission/jungle_planet/inside) "pHo" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "pHp" = ( @@ -12247,7 +12247,7 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 10 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "pJn" = ( @@ -12265,7 +12265,7 @@ }, /area/awaymission/jungle_planet/outside/river) "pJO" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "purple"; dir = 1 @@ -12294,8 +12294,8 @@ /obj/structure/sign/poster/official/walk{ pixel_y = -32 }, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "pMn" = ( @@ -12326,7 +12326,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) "pOr" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/abandoned) "pRD" = ( @@ -12362,7 +12362,7 @@ /area/awaymission/jungle_planet/outside/cave/small) "pTC" = ( /obj/machinery/firealarm/directional/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "pUX" = ( @@ -12418,7 +12418,7 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside) "pWK" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating/asteroid/ancient{ name = "ground" }, @@ -12441,7 +12441,7 @@ "pZa" = ( /obj/structure/bed, /obj/item/bedsheet/brown, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "pZY" = ( @@ -12467,13 +12467,13 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "qbZ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/spider/cocoon, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "qcZ" = ( /obj/structure/table/wood, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/small) "qdL" = ( @@ -12489,7 +12489,7 @@ "qeb" = ( /obj/structure/gunrack, /obj/item/gun/projectile/bow, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "qee" = ( @@ -12514,7 +12514,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "qfJ" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "qgv" = ( @@ -12554,7 +12554,7 @@ /area/awaymission/jungle_planet/inside) "qhD" = ( /obj/item/reagent_containers/glass/bucket, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel{ icon_state = "purple" }, @@ -12568,20 +12568,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "qkl" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/ammo_casing/caseless/arrow, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/awaymission/jungle_planet/inside/complex) "qkp" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "qkM" = ( @@ -12601,24 +12601,24 @@ /obj/effect/turf_decal/arrows{ dir = 8 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "qlE" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/remains/human, /obj/machinery/light/directional/west, -/obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/maybe, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "qma" = ( @@ -12685,7 +12685,7 @@ "qph" = ( /obj/structure/closet/syndicate, /obj/item/clothing/suit/jacket/bomber/syndicate, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/awaymission/jungle_planet/outside/abandoned) "qpu" = ( @@ -12704,7 +12704,7 @@ /turf/simulated/floor/indestructible/grass/no_creep, /area/awaymission/jungle_planet/outside) "qpV" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/circular_saw, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) @@ -12741,8 +12741,8 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "qrw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/awaymission/jungle_planet/outside/cave/pirate) "qsD" = ( @@ -12779,7 +12779,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -12859,7 +12859,7 @@ /area/awaymission/jungle_planet/inside/complex) "qxu" = ( /obj/effect/turf_decal/arrows, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -12879,7 +12879,7 @@ }, /area/awaymission/jungle_planet/outside/river) "qyk" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -12951,14 +12951,14 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside/river) "qEf" = ( /obj/structure/railing{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "qEs" = ( @@ -13005,12 +13005,12 @@ }, /area/awaymission/jungle_planet/inside) "qIk" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/blood/often, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/ammo_casing/caseless/arrow, /turf/simulated/floor/plasteel{ dir = 4; @@ -13057,7 +13057,7 @@ /obj/effect/decal/cleanable/blood/writing{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -13107,10 +13107,10 @@ /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "qOM" = ( -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "qPc" = ( @@ -13250,7 +13250,7 @@ /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "qVZ" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -13269,7 +13269,7 @@ /area/awaymission/jungle_planet/outside/river) "qYR" = ( /obj/effect/turf_decal/delivery, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel{ dir = 4; @@ -13277,7 +13277,7 @@ }, /area/awaymission/jungle_planet/inside) "qZP" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -13306,7 +13306,7 @@ /obj/structure/chair/sofa/left{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "rbZ" = ( @@ -13329,7 +13329,7 @@ /turf/simulated/wall/indestructible/whiteshuttle/nodiagonal, /area/awaymission/jungle_planet/outside/abandoned) "rcL" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "browncorner" @@ -13396,7 +13396,7 @@ /area/awaymission/jungle_planet/outside/cave/pirate) "rim" = ( /obj/structure/chair/wood, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "riR" = ( @@ -13415,7 +13415,7 @@ /obj/item/bedsheet/red{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -13506,7 +13506,7 @@ /area/awaymission/jungle_planet/outside) "rnO" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/chair, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -13524,7 +13524,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "rpw" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -13562,7 +13562,7 @@ icon = 'icons/obj/power.dmi'; density = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "rrw" = ( @@ -13572,11 +13572,11 @@ icon_state = "1-2" }, /obj/item/ammo_casing/caseless/arrow, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "rrT" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/light_emitter{ light_color = "#FFFFFF"; set_cap = 1; @@ -13587,7 +13587,7 @@ /turf/simulated/floor/beach/away/sand, /area/awaymission/jungle_planet/outside/river) "rsE" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -13628,7 +13628,7 @@ /obj/structure/chair/wood/wings{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "rwz" = ( @@ -13659,7 +13659,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -13671,9 +13671,9 @@ }, /obj/machinery/optable, /obj/item/clothing/gloves/color/latex, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/blood/gibs/old, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "bluefull" @@ -13701,11 +13701,11 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/cave/small) "rAr" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/blood/writing{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -13732,13 +13732,13 @@ /area/awaymission/jungle_planet/inside/complex) "rAR" = ( /obj/item/ammo_casing/caseless/arrow, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "rBb" = ( /obj/effect/turf_decal/delivery, /obj/structure/ore_box, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "rBr" = ( @@ -13751,14 +13751,14 @@ pixel_x = -32; density = 0 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purple" }, /area/awaymission/jungle_planet/inside/complex) "rBC" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "rBF" = ( @@ -13768,7 +13768,7 @@ /area/awaymission/jungle_planet/outside/waterfall) "rCN" = ( /obj/structure/table_frame, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -13779,13 +13779,13 @@ /area/awaymission/jungle_planet/inside/complex) "rEW" = ( /obj/structure/flora/ausbushes/grassybush, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) "rFs" = ( /obj/effect/turf_decal/delivery, /obj/structure/ore_box, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "rFx" = ( @@ -13793,7 +13793,7 @@ dir = 1; pixel_y = -27 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "rHc" = ( @@ -13805,7 +13805,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/awaymission/jungle_planet/outside/abandoned) "rHT" = ( @@ -13849,7 +13849,7 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/awaymission/jungle_planet/outside/abandoned) "rJC" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -13926,7 +13926,7 @@ /area/awaymission/jungle_planet/inside/complex) "rNb" = ( /obj/structure/railing, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside/river) "rNB" = ( @@ -13945,7 +13945,7 @@ req_access = list(301); interact_offline = 1 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "rNK" = ( @@ -13966,7 +13966,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -13998,7 +13998,7 @@ pixel_x = -4; pixel_y = 5 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "purple" }, @@ -14032,7 +14032,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -14048,7 +14048,7 @@ /area/awaymission/jungle_planet/inside/complex) "rSn" = ( /obj/machinery/firealarm/directional/east, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -14207,7 +14207,7 @@ /area/awaymission/jungle_planet/inside/complex) "sba" = ( /obj/effect/turf_decal/delivery, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -14259,8 +14259,8 @@ /mob/living/simple_animal/hostile/pirate/ranged{ loot = null }, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "sel" = ( @@ -14276,7 +14276,7 @@ /obj/machinery/computer/mech_bay_power_console{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purple" @@ -14300,7 +14300,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "siH" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" @@ -14316,7 +14316,7 @@ /area/awaymission/jungle_planet/inside) "sjJ" = ( /obj/effect/turf_decal/delivery, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/salvage/ruin/soviet, /turf/simulated/floor/plasteel{ dir = 4; @@ -14381,7 +14381,7 @@ "soK" = ( /obj/effect/decal/cleanable/generic, /obj/machinery/light/directional/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/chair{ dir = 4 }, @@ -14422,7 +14422,7 @@ /obj/structure/chair/wood{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "srB" = ( @@ -14439,8 +14439,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -14453,7 +14453,7 @@ /area/awaymission/jungle_planet/inside/complex) "ssu" = ( /obj/structure/sign/poster/official/random/east, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "rampbottom" }, @@ -14481,7 +14481,7 @@ /area/awaymission/jungle_planet/outside/cave) "suE" = ( /obj/structure/mineral_door/wood, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/small) "suM" = ( @@ -14523,7 +14523,7 @@ /obj/effect/decal/cleanable/cobweb2{ icon_state = "cobweb1" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "syW" = ( @@ -14547,11 +14547,11 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "szb" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "szn" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 4; @@ -14572,12 +14572,12 @@ /obj/structure/closet/crate{ opened = 1 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "szY" = ( /obj/item/stack/packageWrap, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -14624,14 +14624,14 @@ /obj/item/chair/wood{ pixel_x = 22 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "sDP" = ( /obj/structure/chair/office/dark{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "sDQ" = ( @@ -14668,8 +14668,8 @@ }, /area/awaymission/jungle_planet/outside) "sHQ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/mapping_helpers/turfs/rust/probably, +/obj/effect/spawner/random/dirt/often, /turf/simulated/wall, /area/awaymission/jungle_planet/outside/cave/pirate) "sIz" = ( @@ -14678,7 +14678,7 @@ /obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = -4 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -14730,7 +14730,7 @@ /obj/effect/turf_decal/arrows{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -14738,7 +14738,7 @@ /area/awaymission/jungle_planet/inside) "sMs" = ( /obj/structure/kitchenspike_frame, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "sMA" = ( @@ -14751,14 +14751,14 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "sMO" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "sMZ" = ( /obj/item/pen{ pixel_x = 8 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -14798,7 +14798,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "sPM" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "sQH" = ( @@ -14865,7 +14865,7 @@ /obj/effect/turf_decal/arrows{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -14887,7 +14887,7 @@ /obj/effect/turf_decal/arrows{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "sVj" = ( @@ -14906,11 +14906,11 @@ /obj/structure/sign/radiation{ pixel_y = 65 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "sXj" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/awaymission/jungle_planet/inside/complex) "sXU" = ( @@ -14928,7 +14928,7 @@ /obj/structure/disposalpipe/broken{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "sZo" = ( @@ -14939,7 +14939,7 @@ /mob/living/simple_animal/hostile/pirate/ranged{ loot = null }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "tas" = ( @@ -14969,7 +14969,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "tcP" = ( @@ -14988,8 +14988,8 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) "tdt" = ( -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "tei" = ( @@ -15016,7 +15016,7 @@ /obj/item/food/grown/potato, /obj/item/food/grown/potato, /obj/effect/decal/cleanable/cobweb2, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "teN" = ( @@ -15064,7 +15064,7 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "tho" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /mob/living/simple_animal/hostile/jungle_lizard/meele{ wander = 0 }, @@ -15082,7 +15082,7 @@ dir = 9; desc = "A mysterious gateway built by unknown hands, it allows for faster than light travel to far-flung locations." }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkgreycamo" @@ -15119,7 +15119,7 @@ /obj/effect/decal/cleanable/blood/writing{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -15132,7 +15132,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "tlv" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "browncorner" @@ -15141,7 +15141,7 @@ "tmv" = ( /obj/structure/table/wood, /obj/item/stack/sheet/bone, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "tmC" = ( @@ -15165,14 +15165,14 @@ }, /area/awaymission/jungle_planet/outside/waterfall) "tnK" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/decal/remains/human, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "tnM" = ( /obj/structure/bed, /obj/item/bedsheet/black, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "tnS" = ( @@ -15191,7 +15191,7 @@ icon_state = "grass_edge_big_corner"; dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "tnX" = ( @@ -15210,7 +15210,7 @@ }, /area/awaymission/jungle_planet/outside/cave) "tps" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -15290,13 +15290,13 @@ "tsM" = ( /obj/item/shard, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "tte" = ( /obj/item/bikehorn/golden, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/effect/spawner/random/dirt/often, +/obj/structure/closet/crate/wooden, /obj/item/salvage/loot/pirate, /obj/item/salvage/loot/pirate, /obj/item/salvage/loot/pirate, @@ -15345,8 +15345,8 @@ /obj/structure/chair/wood{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "tzH" = ( @@ -15382,7 +15382,7 @@ dir = 1 }, /obj/effect/landmark/awaystart, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -15390,7 +15390,7 @@ /area/awaymission/jungle_planet/inside) "tAY" = ( /obj/machinery/light_construct/small/north, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "tBs" = ( @@ -15400,7 +15400,7 @@ /turf/simulated/wall/indestructible/rock/mineral, /area/awaymission/jungle_planet/outside/cave) "tBu" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/awaymission/jungle_planet/inside) "tBJ" = ( @@ -15409,19 +15409,19 @@ /area/awaymission/jungle_planet/outside/cave) "tCk" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "tCl" = ( /obj/item/chair/wood, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "tDf" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -15447,7 +15447,7 @@ /area/awaymission/jungle_planet/outside/waterfall) "tEi" = ( /obj/item/rack_parts, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "tEr" = ( @@ -15466,8 +15466,8 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/waterfall) "tEQ" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/maybe, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "tGN" = ( @@ -15480,14 +15480,14 @@ }, /area/awaymission/jungle_planet/outside/cave) "tHT" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "tIH" = ( /obj/structure/railing{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "tJi" = ( @@ -15623,14 +15623,14 @@ }, /area/awaymission/jungle_planet/outside) "tRE" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "tSG" = ( /obj/structure/morgue{ dir = 2 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -15658,7 +15658,7 @@ /area/awaymission/jungle_planet/outside/cave) "tTV" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside) "tTZ" = ( @@ -15707,7 +15707,7 @@ }, /area/awaymission/jungle_planet/inside/complex) "tUU" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/effect/landmark/awaystart, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) @@ -15722,12 +15722,12 @@ "tVL" = ( /obj/structure/flora/grass/jungle, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside) "tVQ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/oil/maybe, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "tWg" = ( @@ -15761,7 +15761,7 @@ /area/awaymission/jungle_planet/outside/river) "tYH" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -15802,7 +15802,7 @@ }, /area/awaymission/jungle_planet/inside) "ubw" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/machinery/light_construct/directional/south, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) @@ -15847,7 +15847,7 @@ pixel_x = 17; pixel_y = -13 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/item/storage/firstaid/toxin, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) @@ -15969,12 +15969,12 @@ /obj/item/coin/silver, /obj/item/coin/silver, /obj/item/coin/silver, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/effect/spawner/random/dirt/often, +/obj/structure/closet/crate/wooden, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "ulv" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /mob/living/simple_animal/hostile/poison/giant_spider, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) @@ -16019,7 +16019,7 @@ /obj/item/chair{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -16038,7 +16038,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -16055,7 +16055,7 @@ "upX" = ( /obj/item/stack/rods, /obj/item/shard, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -16110,14 +16110,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "uts" = ( /obj/effect/turf_decal/arrows{ dir = 8 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/light_emitter{ light_color = "#FFFFFF"; set_cap = 1; @@ -16129,13 +16129,13 @@ /area/awaymission/jungle_planet/outside) "utY" = ( /obj/effect/decal/cleanable/cobweb, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/bluegrid{ icon_state = "gcircuitoff" }, /area/awaymission/jungle_planet/outside/cave) "uue" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/ammo_casing/caseless/arrow, /turf/simulated/floor/plasteel{ dir = 1; @@ -16152,14 +16152,14 @@ /obj/item/storage/box/syringes, /obj/item/stack/medical/bruise_pack, /obj/item/storage/box/gloves, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" }, /area/awaymission/jungle_planet/inside/complex) "uvz" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "uvF" = ( @@ -16213,12 +16213,12 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "uAI" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/stack/medical/bruise_pack/advanced, /obj/item/stack/medical/ointment/advanced, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/splint, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/small) "uBo" = ( @@ -16236,7 +16236,7 @@ }, /area/awaymission/jungle_planet/inside) "uBw" = ( -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /obj/item/stock_parts/capacitor, /obj/item/stock_parts/capacitor{ pixel_x = 14 @@ -16375,7 +16375,7 @@ /area/awaymission/jungle_planet/inside/complex) "uJY" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -16397,7 +16397,7 @@ /area/awaymission/jungle_planet/inside/complex) "uKT" = ( /obj/structure/kitchenspike, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating/asteroid/ancient{ name = "ground" }, @@ -16432,7 +16432,7 @@ anchored = 1; dir = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkgreycamo" @@ -16446,7 +16446,7 @@ /area/awaymission/jungle_planet/outside) "uND" = ( /obj/machinery/light_construct/directional/south, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -16454,15 +16454,15 @@ /area/awaymission/jungle_planet/inside) "uNI" = ( /obj/item/handheld_defibrillator, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, /area/awaymission/jungle_planet/inside/complex) "uOh" = ( /obj/item/camera_assembly, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "uOn" = ( @@ -16493,7 +16493,7 @@ /area/awaymission/jungle_planet/outside/river) "uQQ" = ( /obj/structure/closet/crate/secure/loot, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "uRs" = ( @@ -16501,7 +16501,7 @@ pixel_x = 6; pixel_y = 30 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -16528,7 +16528,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "uTk" = ( @@ -16549,7 +16549,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "uVT" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -16596,7 +16596,7 @@ /obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/sign/poster/contraband/random/west, /obj/random/tool, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "vao" = ( @@ -16681,7 +16681,7 @@ icon_state = "spiderling"; name = "dead spider" }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "vgF" = ( @@ -16719,7 +16719,7 @@ /area/awaymission/jungle_planet/outside/cave) "vhL" = ( /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "vhX" = ( @@ -16747,7 +16747,7 @@ /obj/item/stack/sheet/plasteel{ amount = 10 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -16773,7 +16773,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "vkC" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -16784,7 +16784,7 @@ icon_state = "small" }, /obj/structure/table, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -16810,7 +16810,7 @@ }, /area/awaymission/jungle_planet/outside) "vmE" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "vni" = ( @@ -16822,7 +16822,7 @@ }, /obj/effect/decal/remains/human, /obj/item/ammo_casing/caseless/arrow, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/machinery/light_construct/small/west, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -16832,7 +16832,7 @@ /obj/effect/decal/cleanable/blood/writing{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -16844,7 +16844,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "voN" = ( @@ -16861,12 +16861,12 @@ }, /area/awaymission/jungle_planet/outside/river) "vpR" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/small) "vqo" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/turf_decal/grass{ icon_state = "grass_edge_medium"; dir = 4 @@ -16881,7 +16881,7 @@ /obj/item/stack/sheet/mineral/silver{ amount = 40 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -16905,7 +16905,7 @@ /obj/structure/closet/secure_closet{ req_access = list(271) }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -16931,7 +16931,7 @@ pixel_x = -2; pixel_y = -5 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "vtg" = ( @@ -16955,13 +16955,13 @@ /obj/item/clothing/suit/unathi/mantle, /obj/item/clothing/suit/unathi/robe, /obj/item/clothing/suit/unathi/robe, -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "vvO" = ( /obj/item/broken_device, /obj/item/stack/rods, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/bluegrid{ icon_state = "bcircuitoff" }, @@ -17014,7 +17014,7 @@ icon_state = "spiderling"; name = "dead spider" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -17135,7 +17135,7 @@ /area/awaymission/jungle_planet/inside/complex) "vEO" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "vFj" = ( @@ -17153,8 +17153,8 @@ /area/awaymission/jungle_planet/outside) "vFR" = ( /obj/effect/turf_decal/caution/stand_clear/red, -/obj/effect/spawner/random_spawners/oil_maybe, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/oil/maybe, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "vGb" = ( @@ -17234,7 +17234,7 @@ dir = 8 }, /obj/effect/turf_decal/stripes/line, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -17261,12 +17261,12 @@ /area/awaymission/jungle_planet/inside/complex) "vKf" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "vKK" = ( /obj/structure/chair, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "vLD" = ( @@ -17297,7 +17297,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -17326,9 +17326,9 @@ /area/awaymission/jungle_planet/outside/river) "vNE" = ( /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /mob/living/simple_animal/parrot, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "vOh" = ( @@ -17340,7 +17340,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/inside/complex) "vPN" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/indestructible/riveted, /area/awaymission/jungle_planet/inside) "vPR" = ( @@ -17368,7 +17368,7 @@ "vRw" = ( /obj/structure/bed, /obj/item/bedsheet/red, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -17380,7 +17380,7 @@ /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "vSc" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /mob/living/simple_animal/lizard, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) @@ -17390,7 +17390,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "vSu" = ( @@ -17406,7 +17406,7 @@ /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "vTu" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -17436,7 +17436,7 @@ /area/awaymission/jungle_planet/outside) "vVD" = ( /obj/structure/flora/ausbushes/brflowers, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/remains/human, /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) @@ -17455,7 +17455,7 @@ pixel_y = -1 }, /obj/machinery/light_construct/small/west, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/turf_decal/grass{ icon_state = "grass_edge_medium"; dir = 4 @@ -17495,15 +17495,15 @@ /obj/structure/chair/office/dark{ dir = 8 }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "wax" = ( /obj/effect/decal/cleanable/blood/writing{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "waQ" = ( @@ -17520,13 +17520,13 @@ }, /area/awaymission/jungle_planet/inside) "wbT" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /mob/living/simple_animal/hostile/poison/giant_spider/hunter, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "wcv" = ( /obj/structure/bed/mattress, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/small) "wcW" = ( @@ -17541,7 +17541,7 @@ /area/awaymission/jungle_planet/outside) "wdb" = ( /obj/machinery/door/firedoor, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "wdZ" = ( @@ -17552,7 +17552,7 @@ /obj/effect/decal/cleanable/blood/writing{ dir = 10 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -17585,11 +17585,11 @@ }, /area/awaymission/jungle_planet/inside/complex) "wgn" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -17609,8 +17609,8 @@ /area/awaymission/jungle_planet/outside) "wjd" = ( /obj/structure/chair/stool/bar, -/obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/maybe, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "wjj" = ( @@ -17648,7 +17648,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "wmO" = ( @@ -17662,7 +17662,7 @@ }, /area/awaymission/jungle_planet/outside/river) "wne" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/awaymission/jungle_planet/outside/river) "wnr" = ( @@ -17674,14 +17674,14 @@ /area/awaymission/jungle_planet/inside/complex) "woa" = ( /obj/item/stack/rods, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "woW" = ( /obj/structure/closet, /obj/item/clothing/under/costume/pirate_rags, /obj/item/clothing/head/bandana, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "wpb" = ( @@ -17715,19 +17715,19 @@ }, /area/awaymission/jungle_planet/inside/complex) "wtM" = ( -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "wtW" = ( /obj/structure/bed, /obj/item/bedsheet/black, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "wuN" = ( /obj/structure/flora/ausbushes/lavendergrass, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/landmark/awaymissions/gate_lizard/mob_spawn/melee{ id = "lake5" }, @@ -17735,7 +17735,7 @@ /area/awaymission/jungle_planet/outside/river) "wvP" = ( /obj/structure/kitchenspike, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -17776,7 +17776,7 @@ /obj/item/vending_refill/medical, /obj/item/vending_refill/snack, /obj/item/vending_refill, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -17791,7 +17791,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside/river) "wzk" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -17842,7 +17842,7 @@ dir = 8 }, /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "wCZ" = ( @@ -17928,8 +17928,8 @@ name = "Surgery Cleaner"; pixel_x = -7 }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -17983,7 +17983,7 @@ }, /area/awaymission/jungle_planet/outside/river) "wJh" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/indestructible, /area/awaymission/jungle_planet/inside) "wJq" = ( @@ -18006,7 +18006,7 @@ icon_state = "grass_edge_big_corner"; dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -18047,7 +18047,7 @@ /obj/item/shield/riot, /obj/item/shield/riot, /obj/item/shield/riot, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "wNS" = ( @@ -18089,7 +18089,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside/river) "wPA" = ( @@ -18165,7 +18165,7 @@ "wTo" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -18195,7 +18195,7 @@ /obj/structure/sign/monkey_paint{ pixel_y = 30 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "wWP" = ( @@ -18203,14 +18203,14 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "wXR" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "wYk" = ( /obj/effect/decal/cleanable/blood/writing{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -18218,7 +18218,7 @@ /area/awaymission/jungle_planet/inside/complex) "wYy" = ( /obj/effect/turf_decal/stripes/line, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -18237,7 +18237,7 @@ pixel_x = -7; pixel_y = -10 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -18246,20 +18246,20 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "wZY" = ( /obj/item/storage/bag/cash, -/obj/effect/spawner/random_spawners/dirt_often, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/dirt/often, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "xae" = ( /mob/living/simple_animal/hostile/pirate{ loot = null }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "xag" = ( @@ -18277,7 +18277,7 @@ /area/awaymission/jungle_planet/outside/abandoned) "xaI" = ( /obj/effect/turf_decal/caution, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -18290,7 +18290,7 @@ pixel_x = -8 }, /obj/item/trash/can, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "xbo" = ( @@ -18351,7 +18351,7 @@ /obj/item/bedsheet/black{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "xdC" = ( @@ -18359,9 +18359,9 @@ pixel_y = -11; amount = 2 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/ammo_casing/caseless/arrow, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "xeo" = ( @@ -18370,7 +18370,7 @@ /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave/pirate) "xeD" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/river) "xeZ" = ( @@ -18394,8 +18394,8 @@ /area/awaymission/jungle_planet/inside/complex) "xfn" = ( /obj/item/ammo_casing/caseless/arrow, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/blood/often, +/obj/effect/spawner/random/dirt/often, /obj/machinery/door_control/shutter/south{ name = "Armory Shutters-control"; id = "Arm in"; @@ -18407,7 +18407,7 @@ }, /area/awaymission/jungle_planet/inside/complex) "xfP" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/outside) "xhl" = ( @@ -18440,7 +18440,7 @@ "xkK" = ( /obj/structure/bed, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "xlu" = ( @@ -18450,7 +18450,7 @@ /obj/item/stack/sheet/mineral/diamond{ amount = 25 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "xmJ" = ( @@ -18472,26 +18472,26 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 20 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "xqz" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) "xrT" = ( /obj/structure/table/wood, /obj/item/gun/energy/gun/turret, /obj/item/clothing/mask/cigarette/pipe, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/river) "xsD" = ( /obj/effect/turf_decal/arrows{ dir = 8 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -18551,7 +18551,7 @@ /turf/simulated/floor/beach/away/sand, /area/awaymission/jungle_planet/outside/river) "xuU" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside) @@ -18581,7 +18581,7 @@ dir = 8 }, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/plastitanium, /area/awaymission/jungle_planet/outside/abandoned) "xyC" = ( @@ -18607,7 +18607,7 @@ /obj/item/chair{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" @@ -18620,7 +18620,7 @@ tool_volume = 300; on = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "xAY" = ( @@ -18638,7 +18638,7 @@ dir = 8 }, /obj/item/clothing/glasses/hud/health, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -18657,14 +18657,14 @@ /area/awaymission/jungle_planet/outside/waterfall) "xCP" = ( /obj/effect/decal/remains/human, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" }, /area/awaymission/jungle_planet/inside/complex) "xCQ" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /obj/item/storage/belt/utility, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) @@ -18673,7 +18673,7 @@ pixel_y = 10; amount = 2 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /mob/living/simple_animal/lizard, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside) @@ -18689,7 +18689,7 @@ /turf/simulated/floor/engine/cult, /area/awaymission/jungle_planet/outside/cave) "xDg" = ( -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -18756,9 +18756,9 @@ }, /area/awaymission/jungle_planet/outside/river) "xJH" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/largecrate, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -18799,11 +18799,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "xOa" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria" @@ -18840,7 +18840,7 @@ /obj/effect/turf_decal/arrows{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkneutralfull" @@ -18905,7 +18905,7 @@ /obj/effect/turf_decal/loading_area{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /obj/effect/landmark/awaystart, /turf/simulated/floor/plasteel{ dir = 4; @@ -18944,7 +18944,7 @@ list_reagents = list("whiskey" = 0); pixel_x = -9 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/inside/complex) "xSz" = ( @@ -18981,7 +18981,7 @@ /area/awaymission/jungle_planet/inside/complex) "xVk" = ( /obj/structure/bed, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside) "xVv" = ( @@ -19008,7 +19008,7 @@ }, /area/awaymission/jungle_planet/outside) "xWo" = ( -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -19018,14 +19018,14 @@ pixel_y = -11; amount = 2 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside/river) "xWT" = ( /obj/structure/sign/nosmoking_2{ pixel_x = -32 }, -/obj/effect/spawner/random_spawners/dirt_often, +/obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "xYt" = ( @@ -19041,7 +19041,7 @@ /obj/item/chair{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/inside/complex) "xZy" = ( @@ -19056,7 +19056,7 @@ /area/awaymission/jungle_planet/outside/cave/pirate) "xZT" = ( /obj/item/cigbutt, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "yaX" = ( @@ -19081,7 +19081,7 @@ /area/awaymission/jungle_planet/outside) "ydq" = ( /obj/structure/bed/mattress/dirty, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/jungle_planet/outside/cave) "ydD" = ( @@ -19120,7 +19120,7 @@ /obj/effect/decal/cleanable/blood/writing{ dir = 4 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "ygc" = ( @@ -19152,7 +19152,7 @@ /obj/structure/railing/corner{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel, /area/awaymission/jungle_planet/outside) "yhd" = ( diff --git a/_maps/map_files220/RandomZLevels/spacebattle.dmm b/_maps/map_files220/RandomZLevels/spacebattle.dmm index 82390b0d0c26a..4c047b7fc2884 100644 --- a/_maps/map_files220/RandomZLevels/spacebattle.dmm +++ b/_maps/map_files220/RandomZLevels/spacebattle.dmm @@ -62,7 +62,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate) "ai" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/hallway7) "aj" = ( @@ -161,7 +161,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/hallway3) "aA" = ( @@ -291,7 +291,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate) "aR" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/hallway3) "aS" = ( @@ -346,7 +346,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/engine) "ba" = ( @@ -367,7 +367,7 @@ /turf/space, /area/awaymission/space_battle/hallway10) "bd" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/landmark/awaymissions/spacebattle/mine_spawner{ id = "ext2" }, @@ -384,7 +384,7 @@ }, /area/awaymission/space_battle/prhallway3) "bf" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/syndicate/syndicate5) "bg" = ( @@ -427,7 +427,7 @@ /turf/space, /area/awaymission/space_battle/syndicate/syndicate1) "bm" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/cruiser) "bn" = ( @@ -452,7 +452,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/space_battle/hallway2) "bp" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "neutral"; dir = 1 @@ -614,7 +614,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/hallway8) "bX" = ( @@ -805,7 +805,7 @@ /area/awaymission) "cw" = ( /obj/item/stack/ore/glass, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/asteroid/airless, /area/space) "cx" = ( @@ -828,10 +828,10 @@ /turf/simulated/floor/plasteel, /area/awaymission/space_battle/hallway3) "cB" = ( -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/blood/gibs/down, /turf/simulated/floor/plasteel/airless, /area/awaymission/space_battle/living) @@ -933,7 +933,7 @@ /area/awaymission/space_battle/living) "cR" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/space) "cS" = ( @@ -1056,7 +1056,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate/syndicate2) "dp" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner"; dir = 1 @@ -1094,7 +1094,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/space_battle/sec_storage) "du" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/space_battle/cruiser) "dv" = ( @@ -1331,7 +1331,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate/syndicate2) "en" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/hallway2) "eo" = ( @@ -1425,7 +1425,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutral"; dir = 4 @@ -1460,7 +1460,7 @@ }, /area/awaymission/space_battle/engine) "eL" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light_construct/directional/south, /turf/simulated/floor/plasteel/airless{ icon_state = "yellow" @@ -1479,7 +1479,7 @@ /area/awaymission/space_battle/syndicate/syndicate5) "eO" = ( /obj/machinery/door/airlock/titanium, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/titanium/blue/airless, /area/space) "eP" = ( @@ -1507,7 +1507,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/space_battle/engine) "eS" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -1572,7 +1572,7 @@ /area/awaymission/space_battle/hallway1) "fc" = ( /obj/machinery/light_construct/directional/south, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "neutral" }, @@ -1659,7 +1659,7 @@ icon = 'icons/obj/turrets.dmi'; icon_state = "destroyed_target_prism" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/space) "fq" = ( @@ -1744,7 +1744,7 @@ "fz" = ( /obj/structure/disposalpipe/segment, /obj/structure/transit_tube, -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ layer = 4; icon = 'icons/obj/singularity.dmi'; icon_state = "TheSingGen" @@ -1779,7 +1779,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/turret7) "fE" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutral"; dir = 9 @@ -1890,7 +1890,7 @@ }, /area/awaymission/space_battle/hallway11) "fU" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/stack/rods, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plasteel, @@ -2271,18 +2271,18 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/dark, /area/awaymission/space_battle/hallway7) "gX" = ( /obj/machinery/power/apc/off_station/empty_charge/directional/south, /obj/structure/cable, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/living) "gY" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/hallway5) "gZ" = ( @@ -2347,7 +2347,7 @@ /area/awaymission/space_battle/syndicate/syndicate2) "hg" = ( /obj/structure/inflatable/door, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/space) "hh" = ( @@ -2683,13 +2683,13 @@ /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/cruiser) "ii" = ( -/obj/machinery/constructable_frame, -/obj/effect/landmark/damageturf, +/obj/structure/machine_frame, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/gibspawner/human, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/living) "ij" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -2837,7 +2837,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate/syndicate1) "iG" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/engineering) "iH" = ( @@ -3015,7 +3015,7 @@ /area/awaymission/space_battle/cruiser) "jc" = ( /obj/effect/turf_decal/delivery/white/hollow, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "dark_large" }, @@ -3227,7 +3227,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc/off_station/directional/north, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutral"; dir = 1 @@ -3295,7 +3295,7 @@ }, /area/awaymission/space_battle/server) "jQ" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/asteroid/airless, /area/awaymission) "jR" = ( @@ -3330,7 +3330,7 @@ /turf/simulated/wall/indestructible/whiteshuttle, /area/awaymission/space_battle/cruiser) "jV" = ( -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_2" }, /obj/item/stack/cable_coil, @@ -3927,7 +3927,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/syndicate/syndicate1) "lR" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/syndicate) "lS" = ( @@ -4051,11 +4051,11 @@ }, /area/awaymission/space_battle/hallway8) "ml" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/awaymission/space_battle/living) "mm" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/ash, /turf/simulated/floor/mineral/titanium, /area/awaymission/space_battle/storage) @@ -4069,7 +4069,7 @@ }, /area/awaymission/space_battle/cruiser) "mp" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/awaymission/space_battle/syndicate/syndicate2) "mq" = ( @@ -4084,7 +4084,7 @@ }, /area/awaymission/space_battle/hallway8) "mr" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/rods, /turf/simulated/floor/plating/asteroid/airless, /area/awaymission) @@ -4181,7 +4181,7 @@ /area/awaymission/space_battle/syndicate/syndicate1) "mG" = ( /obj/item/stack/rods, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/space_battle/kitchen) "mH" = ( @@ -4218,7 +4218,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate) "mQ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/engineering) "mS" = ( @@ -4330,7 +4330,7 @@ /area/awaymission/space_battle/hallway2) "nl" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/shreds, /turf/simulated/floor/plating/airless, /area/space) @@ -4481,7 +4481,7 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 1 }, -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_2" }, /obj/structure/cable{ @@ -4550,7 +4550,7 @@ /area/awaymission/space_battle/syndicate/syndicate6) "nU" = ( /obj/item/cigbutt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutral"; dir = 1 @@ -4594,13 +4594,13 @@ }, /area/awaymission/space_battle/syndicate) "ob" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "neutral" }, /area/awaymission/space_battle/hallway11) "oc" = ( -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_2" }, /obj/effect/decal/cleanable/blood/gibs/up, @@ -4758,7 +4758,7 @@ /area/awaymission/space_battle/hallway8) "ox" = ( /obj/effect/decal/cleanable/shreds, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light_construct/directional/south, /mob/living/simple_animal/hostile/syndicate/ranged/space/autogib, /turf/simulated/floor/plating/airless, @@ -4896,7 +4896,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/cruiser) "oX" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/titanium, /area/awaymission/space_battle/storage) "oY" = ( @@ -4941,7 +4941,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "floor_large" }, @@ -5011,7 +5011,7 @@ "pq" = ( /obj/structure/disposalpipe/segment, /obj/structure/transit_tube, -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ layer = 4; icon = 'icons/obj/singularity.dmi'; icon_state = "TheSingGen" @@ -5309,7 +5309,7 @@ "qq" = ( /obj/structure/disposalpipe/segment, /obj/structure/transit_tube, -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ layer = 4; icon = 'icons/obj/singularity.dmi'; icon_state = "TheSingGen" @@ -5527,7 +5527,7 @@ /obj/item/shard{ icon_state = "medium" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/syndicate) "rh" = ( @@ -5641,7 +5641,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/awaymission/space_battle/hallway11) "ry" = ( @@ -5711,7 +5711,7 @@ }, /area/awaymission/space_battle/hallway11) "rI" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/chair/comfy/shuttle, /mob/living/simple_animal/hostile/syndicate/ranged/space/autogib/spacebattle, /turf/simulated/floor/mineral/titanium/blue/airless, @@ -5785,7 +5785,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/space_battle/hallway10) "rY" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutral"; dir = 4 @@ -5824,7 +5824,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless, /area/awaymission/space_battle/living) "sd" = ( @@ -6020,7 +6020,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/hallway5) "sL" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/hallway2) "sM" = ( @@ -6425,7 +6425,7 @@ }, /area/awaymission/space_battle/kitchen) "tZ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/hallway8) "ua" = ( @@ -6526,7 +6526,7 @@ /area/awaymission/space_battle/hallway11) "uo" = ( /obj/structure/girder/reinforced, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/space) "up" = ( @@ -6562,7 +6562,7 @@ "uv" = ( /obj/effect/turf_decal/delivery/white/hollow/right, /obj/effect/turf_decal/box/corners, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/dark{ icon_state = "dark_large" }, @@ -6719,7 +6719,7 @@ }, /area/awaymission/space_battle/prhallway3) "uV" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/syndicate/syndicate2) "uW" = ( @@ -6790,7 +6790,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/space_battle/sec_storage) "vk" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/space_battle/syndicate/syndicate1) "vl" = ( @@ -6804,7 +6804,7 @@ dir = 10 }, /obj/structure/window/reinforced, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/dark, /area/awaymission/space_battle/hallway7) "vm" = ( @@ -6813,7 +6813,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/space_battle/hallway3) "vo" = ( @@ -6893,7 +6893,7 @@ "vx" = ( /obj/structure/disposalpipe/segment, /obj/structure/transit_tube, -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ layer = 4; icon = 'icons/obj/singularity.dmi'; icon_state = "TheSingGen" @@ -6946,7 +6946,7 @@ /area/awaymission/space_battle/hallway5) "vG" = ( /obj/effect/decal/remains/robot, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "podfloor" }, @@ -7182,7 +7182,7 @@ /area/awaymission/space_battle/syndicate/syndicate6) "ww" = ( /obj/item/stack/rods, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/asteroid/airless, /area/awaymission) "wx" = ( @@ -7317,7 +7317,7 @@ /area/awaymission/space_battle/syndicate/syndicate1) "wO" = ( /obj/item/kirbyplants, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutral"; dir = 10 @@ -7399,7 +7399,7 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/landmark/awaymissions/spacebattle/mob_spawn/ranged_space{ id = "turret3" }, @@ -7451,7 +7451,7 @@ /area/awaymission/space_battle/syndicate) "xf" = ( /obj/item/stock_parts/cell/high/empty, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "neutral"; dir = 1 @@ -7468,7 +7468,7 @@ /turf/space, /area/space) "xk" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /mob/living/simple_animal/hostile/malf_drone/spacebattle, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/syndicate/syndicate5) @@ -7501,7 +7501,7 @@ }, /area/awaymission/space_battle/cruiser) "xq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutral"; dir = 1 @@ -7534,7 +7534,7 @@ /turf/simulated/floor/plating, /area/awaymission/space_battle/hallway3) "xv" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/space) "xy" = ( @@ -7546,7 +7546,7 @@ /area/awaymission/space_battle/syndicate/syndicate6) "xz" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/hallway11) "xA" = ( @@ -7562,14 +7562,14 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate/syndicate1) "xD" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "neutral"; dir = 8 }, /area/awaymission/space_battle/prhallway2) "xF" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mob_spawn/human/corpse/spacebattle/medic, /obj/effect/decal/cleanable/blood/gibs/down, /turf/simulated/floor/plating/airless, @@ -7672,7 +7672,7 @@ /area/awaymission/space_battle/hallway8) "xT" = ( /obj/effect/turf_decal/delivery/white/hollow, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "dark_large" }, @@ -7727,7 +7727,7 @@ /turf/space, /area/space) "yf" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -7912,7 +7912,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/space_battle/engine) "yJ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /mob/living/simple_animal/hostile/syndicate/ranged/autogib/spacebattle, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/hallway5) @@ -7950,7 +7950,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/awaymission/space_battle/syndicate/syndicate2) "yO" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "neutral" }, @@ -7983,7 +7983,7 @@ /area/space) "yV" = ( /obj/item/stack/ore/iron, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/asteroid/airless, /area/space) "yW" = ( @@ -8043,7 +8043,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/space_battle) "ze" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/space_battle/turret3) "zf" = ( @@ -8163,7 +8163,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "darkfull" }, @@ -8180,7 +8180,7 @@ }, /area/awaymission/space_battle/engine) "zB" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/space_battle/sec_storage) "zC" = ( @@ -8286,11 +8286,11 @@ /obj/item/shard{ icon_state = "medium" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/living) "zP" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -8405,7 +8405,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/space_battle/hallway9) "Am" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /mob/living/simple_animal/hostile/syndicate/ranged/space/autogib/spacebattle, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/engineering) @@ -8531,11 +8531,11 @@ "AJ" = ( /obj/effect/mob_spawn/human/corpse/spacebattle/engineer/space, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/space_battle/turret1) "AK" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/space_battle/turret7) "AL" = ( @@ -8550,7 +8550,7 @@ /area/space) "AN" = ( /obj/item/stack/cable_coil, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/syndicate) "AO" = ( @@ -8614,7 +8614,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /mob/living/simple_animal/hostile/syndicate/ranged/autogib/spacebattle, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/hallway10) @@ -8680,7 +8680,7 @@ /turf/simulated/floor/plating, /area/awaymission/space_battle/prhallway1) "Bi" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/space) "Bj" = ( @@ -8750,7 +8750,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/space_battle/sec_storage) "Br" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -8799,7 +8799,7 @@ /turf/simulated/floor/plating, /area/awaymission/space_battle/cruiser) "Bz" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -8884,7 +8884,7 @@ }, /area/awaymission/space_battle/server) "BL" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/awaymission/space_battle/engineering) "BM" = ( @@ -9038,7 +9038,7 @@ /turf/simulated/floor/plasteel/freezer, /area/awaymission/space_battle/kitchen) "Cm" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "darkfull" }, @@ -9099,7 +9099,7 @@ }, /area/awaymission/space_battle/cruiser) "Cv" = ( -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, /obj/structure/sign/poster/official/random/south, @@ -9113,7 +9113,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light_construct/directional/east, /turf/simulated/floor/plasteel/airless{ icon_state = "neutral"; @@ -9165,7 +9165,7 @@ /area/awaymission/space_battle/hallway2) "CF" = ( /obj/item/stack/sheet/mineral/titanium, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -9288,7 +9288,7 @@ }, /area/awaymission/space_battle/hallway5) "CU" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/blood/tracks/mapped{ dir = 8 }, @@ -9409,7 +9409,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/space_battle/engine) "Dj" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "neutral" }, @@ -9458,7 +9458,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/syndicate/syndicate1) "Ds" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/space) "Dt" = ( @@ -9495,7 +9495,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/awaymission/space_battle/syndicate/syndicate2) "DA" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "neutral"; dir = 1 @@ -9610,7 +9610,7 @@ /turf/simulated/floor/mineral/titanium, /area/awaymission/space_battle/storage) "DS" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/sign/poster/ripped{ pixel_y = 32 }, @@ -9703,7 +9703,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/dark, /area/awaymission/space_battle/hallway7) "Eh" = ( @@ -9746,7 +9746,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/engine) "Eo" = ( @@ -9835,7 +9835,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate/syndicate5) "EA" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/space_battle/turret8) "EE" = ( @@ -9893,7 +9893,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -9914,7 +9914,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/turret3) "EM" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/awaymission/space_battle/syndicate/syndicate5) "EN" = ( @@ -10010,7 +10010,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/turret6) "EY" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/mineral, /area/awaymission) "EZ" = ( @@ -10101,7 +10101,7 @@ /obj/structure/sign/securearea{ pixel_y = -32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "neutral" }, @@ -10194,7 +10194,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate/syndicate6) "FB" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "neutral"; dir = 1 @@ -10285,7 +10285,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "darkfull" }, @@ -10409,7 +10409,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/space_battle/sec_storage) "Gk" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/bridge) "Gm" = ( @@ -10417,7 +10417,7 @@ /obj/structure/sign/engineering{ pixel_x = 32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/titanium, /area/awaymission/space_battle/storage) "Gn" = ( @@ -10648,7 +10648,7 @@ }, /area/awaymission/space_battle/hallway11) "GT" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "podfloor" }, @@ -10722,7 +10722,7 @@ }, /area/awaymission/space_battle/bridge) "Hc" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/asteroid/airless, /area/space) "He" = ( @@ -10814,7 +10814,7 @@ }, /area/awaymission/space_battle/hallway8) "Ht" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /mob/living/simple_animal/hostile/syndicate/ranged/space/autogib, /turf/simulated/floor/plasteel/airless, /area/awaymission/space_battle/living) @@ -11090,7 +11090,7 @@ /area/awaymission/space_battle/engineering) "Ii" = ( /obj/machinery/atmospherics/portable/canister/oxygen, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/titanium, /area/awaymission/space_battle/storage) "Ij" = ( @@ -11115,7 +11115,7 @@ /turf/simulated/floor/plasteel/dark, /area/awaymission/space_battle/hallway2) "Im" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/landmark/awaymissions/spacebattle/mine_spawner{ id = "turret1" }, @@ -11154,7 +11154,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate/syndicate1) "Is" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /mob/living/simple_animal/hostile/malf_drone/spacebattle, /turf/simulated/floor/plasteel/airless{ icon_state = "podfloor" @@ -11300,12 +11300,12 @@ /area/awaymission/space_battle/hallway5) "IP" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/space) "IQ" = ( /obj/item/shard, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "podfloor" }, @@ -11345,7 +11345,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/prhallway2) "IZ" = ( @@ -11491,7 +11491,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/dark, /area/awaymission/space_battle/hallway7) "Jy" = ( @@ -11626,7 +11626,7 @@ }, /area/awaymission/space_battle/hallway5) "JV" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "yellow"; dir = 8 @@ -11717,7 +11717,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless, /area/awaymission/space_battle/hallway11) "Km" = ( @@ -11746,7 +11746,7 @@ /turf/space, /area/space) "Kq" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/syndicate/syndicate2) "Ks" = ( @@ -11795,7 +11795,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate/syndicate1) "KB" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/space_battle/hallway7) "KC" = ( @@ -11830,7 +11830,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/cruiser) "KH" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "blueyellowfull" }, @@ -11904,7 +11904,7 @@ /area/space) "KV" = ( /obj/machinery/porta_turret/syndicate, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/space) "KW" = ( @@ -11994,7 +11994,7 @@ "Li" = ( /obj/structure/cable, /obj/machinery/power/apc/off_station/directional/west, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -12007,7 +12007,7 @@ /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/awaymission/space_battle/syndicate) "Lk" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -12171,7 +12171,7 @@ }, /area/awaymission/space_battle/medbay) "LI" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -12262,7 +12262,7 @@ /turf/simulated/floor/plasteel/dark, /area/awaymission/space_battle/hallway4) "LU" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/hallway11) "LV" = ( @@ -12396,7 +12396,7 @@ /area/awaymission/space_battle/cruiser) "Mo" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "neutral"; dir = 9 @@ -12484,7 +12484,7 @@ /turf/space, /area/space) "MD" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner"; dir = 8 @@ -12516,10 +12516,10 @@ /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/cruiser) "MG" = ( -/obj/machinery/constructable_frame{ +/obj/structure/machine_frame{ icon_state = "box_1" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel/airless, /area/awaymission/space_battle/living) @@ -12579,7 +12579,7 @@ /obj/structure/rack, /obj/item/stack/rods/fifty, /obj/effect/turf_decal/delivery/red/hollow, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/dark, /area/awaymission/space_battle/hallway11) "MQ" = ( @@ -12912,7 +12912,7 @@ /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/awaymission/space_battle/syndicate) "NO" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/space_battle/turret1) "NP" = ( @@ -12953,7 +12953,7 @@ }, /area/awaymission/space_battle/kitchen) "NT" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -13013,7 +13013,7 @@ }, /area/awaymission/space_battle/hallway4) "Of" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless, /area/awaymission/space_battle/engineering) "Og" = ( @@ -13058,7 +13058,7 @@ }, /area/awaymission/space_battle/syndicate/syndicate4) "Oo" = ( -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil, /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel/airless, @@ -13069,7 +13069,7 @@ /area/awaymission/space_battle/syndicate) "Or" = ( /obj/effect/gibspawner/human, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/airless, /area/awaymission/space_battle/living) @@ -13176,7 +13176,7 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "darkredalt"; dir = 8 @@ -13201,7 +13201,7 @@ }, /area/awaymission/space_battle/hallway1) "ON" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/syndicate/syndicate1) "OO" = ( @@ -13293,7 +13293,7 @@ }, /area/awaymission/space_battle/engine) "Pc" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -13319,7 +13319,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/hallway3) "Pf" = ( @@ -13353,14 +13353,14 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "yellow"; dir = 8 }, /area/awaymission/space_battle/engine) "Pl" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutral"; dir = 6 @@ -13573,7 +13573,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "neutral"; dir = 4 @@ -13646,7 +13646,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/syndicate/syndicate2) "Qg" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -13841,7 +13841,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/space_battle/sec_storage) "QJ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /mob/living/simple_animal/hostile/syndicate/melee/space/autogib/spacebattle, /turf/simulated/floor/plasteel/airless{ icon_state = "neutral"; @@ -14308,7 +14308,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel/airless, /area/awaymission/space_battle/living) @@ -14663,7 +14663,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /mob/living/simple_animal/hostile/syndicate/ranged/space/autogib, /turf/simulated/floor/plasteel/airless, /area/awaymission/space_battle/hallway2) @@ -14785,7 +14785,7 @@ /turf/simulated/floor/grass/no_creep, /area/awaymission/space_battle) "TP" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "darkfull" }, @@ -14865,7 +14865,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/prhallway2) "Ub" = ( @@ -14904,7 +14904,7 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 8 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/airless{ icon_state = "darkredalt"; dir = 4 @@ -14934,7 +14934,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/living) "Uo" = ( @@ -14993,7 +14993,7 @@ /turf/simulated/floor/plating, /area/awaymission/space_battle/engine) "UB" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "yellow"; dir = 8 @@ -15004,7 +15004,7 @@ /area/awaymission/space_battle/syndicate/syndicate2) "UD" = ( /obj/item/rack_parts, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/space_battle/turret7) "UF" = ( @@ -15329,7 +15329,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate/syndicate1) "Vy" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/asteroid/airless, /area/space) "Vz" = ( @@ -15436,7 +15436,7 @@ /area/awaymission/space_battle/syndicate/syndicate2) "VQ" = ( /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/awaymission/space_battle/living) "VS" = ( @@ -15507,7 +15507,7 @@ "Wa" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/caution/stand_clear, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel/dark, /area/awaymission/space_battle/hallway7) "Wc" = ( @@ -15544,7 +15544,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate/syndicate2) "Wf" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/hallway7) "Wg" = ( @@ -15603,7 +15603,7 @@ }, /area/awaymission/space_battle/hallway8) "Wn" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -15640,8 +15640,8 @@ /turf/space, /area/space) "Wu" = ( -/obj/effect/landmark/burnturf, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/burn, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/engineering) "Ww" = ( @@ -15775,7 +15775,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/space_battle/hallway5) "WT" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/item/stack/cable_coil, /turf/simulated/floor/plating, /area/awaymission/space_battle/hallway3) @@ -15798,7 +15798,7 @@ /area/awaymission/space_battle/hallway6) "WX" = ( /obj/item/reagent_containers/patch/styptic, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/awaymission/space_battle/bridge) "WZ" = ( @@ -15811,7 +15811,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/hallway5) "Xb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless{ icon_state = "neutral" }, @@ -15865,7 +15865,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/space_battle/sec_storage) "Xi" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/awaymission/space_battle/hallway2) "Xj" = ( @@ -15888,7 +15888,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/awaymission/space_battle/hallway3) "Xl" = ( @@ -15955,7 +15955,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/space_battle/syndicate/syndicate1) "Xv" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -15973,7 +15973,7 @@ /obj/machinery/door_control/shutter/south{ id = "SpaceBattlePodbaySpace" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -16002,7 +16002,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -16015,7 +16015,7 @@ /area/awaymission/space_battle/prhallway2) "XC" = ( /obj/item/stack/ore/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/asteroid/airless, /area/awaymission) "XD" = ( @@ -16194,7 +16194,7 @@ }, /area/awaymission/space_battle/hallway11) "Yd" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/awaymission/space_battle/living) "Ye" = ( @@ -16457,7 +16457,7 @@ }, /area/awaymission/space_battle/prhallway2) "YO" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/asteroid/airless, /area/awaymission) "YP" = ( @@ -16527,7 +16527,7 @@ /area/awaymission/space_battle/syndicate/syndicate2) "YZ" = ( /obj/item/stack/ore/glass, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/asteroid/airless, /area/awaymission) "Za" = ( @@ -16562,7 +16562,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/space_battle/bridge) "Zd" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/awaymission/space_battle/turret8) diff --git a/_maps/map_files220/RandomZLevels/wildwest.dmm b/_maps/map_files220/RandomZLevels/wildwest.dmm index 7db5136c0c9b3..35200bc6991da 100644 --- a/_maps/map_files220/RandomZLevels/wildwest.dmm +++ b/_maps/map_files220/RandomZLevels/wildwest.dmm @@ -3,7 +3,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/wildwest/wildwest_refine) "ab" = ( @@ -52,7 +52,7 @@ /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "ar" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/wildwest/wildwest_refine) "as" = ( @@ -80,7 +80,7 @@ /area/awaymission/wildwest/wildwest_mines) "aD" = ( /obj/machinery/power/port_gen/pacman, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "aG" = ( @@ -202,8 +202,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/landmark/damageturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/awaymission/wildwest/wildwest_refine) "cd" = ( @@ -330,7 +330,7 @@ /area/awaymission/wildwest/wildwest_mines) "dn" = ( /obj/effect/mine/gas/plasma, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "ds" = ( @@ -345,7 +345,7 @@ /area/awaymission/wildwest/wildwest_mines) "dC" = ( /obj/structure/shuttle/engine/router, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/wildwest/wildwest_refine) "dG" = ( @@ -521,7 +521,7 @@ /area/awaymission/wildwest/wildwest_mines) "fd" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil{ amount = 1 }, @@ -551,7 +551,7 @@ /turf/simulated/floor/carpet, /area/awaymission/wildwest/wildwest_mines) "fu" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -621,7 +621,7 @@ /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "fU" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/salvage/ruin/pirate, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) @@ -1115,7 +1115,7 @@ /turf/simulated/floor/carpet/orange, /area/awaymission/wildwest/wildwest_mines) "kA" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/awaymission/wildwest/wildwest_refine) "kE" = ( @@ -1132,7 +1132,7 @@ /turf/simulated/wall/indestructible/opsglass, /area/awaymission/wildwest/wildwest_refine) "kO" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "kQ" = ( @@ -1170,7 +1170,7 @@ }, /obj/effect/mine/dnascramble, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "lg" = ( @@ -1330,7 +1330,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/wildwest/wildwest_refine) "mn" = ( @@ -1562,7 +1562,7 @@ "om" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/tile/wood, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "on" = ( @@ -1720,7 +1720,7 @@ /turf/simulated/floor/carpet, /area/awaymission/wildwest/wildwest_mines) "pO" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/awaymission/wildwest/wildwest_refine) @@ -1909,7 +1909,7 @@ /turf/simulated/floor/plating, /area/awaymission/wildwest/wildwest_refine) "rx" = ( -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/asteroid{ icon_state = "asteroidfloor" @@ -2255,7 +2255,7 @@ }, /area/awaymission/wildwest/wildwest_mines) "uR" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/wall/mineral/plastitanium, /area/awaymission/wildwest/wildwest_refine) "uS" = ( @@ -2323,8 +2323,8 @@ /turf/simulated/floor/plating/asteroid, /area/awaymission/wildwest/wildwest_mines) "vF" = ( -/obj/machinery/constructable_frame, -/obj/effect/landmark/damageturf, +/obj/structure/machine_frame, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "vJ" = ( @@ -2493,7 +2493,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/wildwest/wildwest_refine) "xr" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -2516,7 +2516,7 @@ }, /area/awaymission/wildwest/wildwest_mines) "xB" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/tile/plasteel, /turf/simulated/floor/plating, /area/awaymission/wildwest/wildwest_refine) @@ -2779,7 +2779,7 @@ /area/awaymission/wildwest/wildwest_mines) "AM" = ( /obj/effect/mob_spawn/human/corpse/skeleton, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "AO" = ( @@ -3087,7 +3087,7 @@ /obj/effect/decal/cleanable/cobweb, /obj/structure/closet/crate/trashcart, /obj/item/fireaxe, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "DG" = ( @@ -3307,7 +3307,7 @@ }, /area/awaymission/wildwest/wildwest_mines) "FB" = ( -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3477,7 +3477,7 @@ /area/awaymission/wildwest/wildwest_mines) "Hm" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "Hn" = ( @@ -3717,7 +3717,7 @@ "Kb" = ( /obj/structure/closet/cabinet, /obj/effect/decal/cleanable/cobweb2, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "Kk" = ( @@ -3897,7 +3897,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/wildwest/wildwest_refine) "Mi" = ( @@ -3971,7 +3971,7 @@ }, /area/awaymission/wildwest/wildwest_refine) "MM" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/wall/mineral/plastitanium, /area/awaymission/wildwest/wildwest_refine) "MO" = ( @@ -4154,8 +4154,8 @@ /turf/simulated/floor/plating, /area/awaymission/wildwest/wildwest_refine) "ON" = ( -/obj/effect/landmark/damageturf, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -4279,7 +4279,7 @@ /area/awaymission/wildwest/wildwest_refine) "PW" = ( /obj/effect/decal/cleanable/blood/old, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "Qc" = ( @@ -4358,7 +4358,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/wildwest/wildwest_refine) "QG" = ( -/obj/machinery/constructable_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil{ amount = 1 }, @@ -4386,7 +4386,7 @@ }, /area/awaymission/wildwest/wildwest_mines) "QQ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/awaymission/wildwest/wildwest_refine) @@ -4401,7 +4401,7 @@ /area/awaymission/wildwest/wildwest_refine) "QY" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "Re" = ( @@ -4443,7 +4443,7 @@ /area/awaymission/wildwest/wildwest_mines) "RQ" = ( /obj/structure/closet/crate/can, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "RY" = ( @@ -4610,7 +4610,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/awaymission/wildwest/wildwest_refine) "TH" = ( @@ -4829,7 +4829,7 @@ /area/awaymission/wildwest/wildwest_mines) "VU" = ( /obj/structure/sign/poster/contraband/random/north, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "VV" = ( @@ -5191,7 +5191,7 @@ /area/awaymission/wildwest/wildwest_refine) "ZU" = ( /obj/structure/mineral_door/wood, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) "ZV" = ( diff --git a/_maps/map_files220/generic/Admin_Zone.dmm b/_maps/map_files220/generic/Admin_Zone.dmm index 1bfe5902c58d2..8d5079e0bdd32 100644 --- a/_maps/map_files220/generic/Admin_Zone.dmm +++ b/_maps/map_files220/generic/Admin_Zone.dmm @@ -357,7 +357,7 @@ "bn" = ( /obj/structure/sink/directional/west, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark/nitrogen{ icon_state = "darkpurplecorners"; @@ -1409,7 +1409,7 @@ /turf/simulated/floor/carpet/arcade, /area/trader_station/sol) "eP" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/chair/sofa/left{ dir = 1 }, @@ -1581,7 +1581,7 @@ /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/nitrogen, /area/vox_base) "fE" = ( @@ -1658,7 +1658,7 @@ /area/vox_base) "fQ" = ( /obj/effect/spawner/random/trash, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/flag/species/vox, /turf/simulated/floor/mineral/plastitanium{ nitrogen = 103.984; @@ -1821,7 +1821,7 @@ /area/ghost_bar/outdoor) "gx" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/nitrogen, /area/vox_base) "gy" = ( @@ -1894,7 +1894,7 @@ /obj/structure/closet/crate/trashcart, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/clothing/glasses/meson{ pixel_x = 5 }, @@ -1906,7 +1906,7 @@ }, /area/vox_base) "gI" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/instrument/accordion, /obj/item/instrument/banjo, /obj/item/instrument/bikehorn, @@ -2121,7 +2121,7 @@ }, /area/ghost_bar/outdoor) "ht" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/vox_base) "hv" = ( @@ -2931,7 +2931,7 @@ /area/holodeck/source_thunderdomecourt) "kg" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/flag/species/vox, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/vox_base) @@ -3583,7 +3583,7 @@ /turf/simulated/floor/wood/cherry, /area/ghost_bar/indoor) "mm" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/cherry, /area/ghost_bar/indoor) "mn" = ( @@ -4164,7 +4164,7 @@ /turf/simulated/floor/carpet/purple, /area/wizard_station) "ox" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/parquet/tile, /area/ghost_bar/indoor) "oz" = ( @@ -4335,7 +4335,7 @@ /obj/machinery/atmospherics/unary/tank/nitrogen{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/box/red, /turf/simulated/floor/plating/nitrogen, @@ -4416,7 +4416,7 @@ /obj/structure/chair/sofa/right{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/parquet/tile, /area/ghost_bar/indoor) "pt" = ( @@ -4484,7 +4484,7 @@ /turf/simulated/floor/wood/oak, /area/admin) "pD" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/nitrogen, /area/vox_base) @@ -4595,7 +4595,7 @@ /area/abductor_ship) "qb" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/unary/portables_connector{ dir = 8 }, @@ -4670,7 +4670,7 @@ /turf/simulated/floor/wood/oak, /area/admin) "qu" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/parquet, /area/ghost_bar/indoor) "qv" = ( @@ -5128,7 +5128,7 @@ /turf/simulated/floor/beach/away/sand_alternative, /area/ghost_bar/outdoor/beach) "rL" = ( -/obj/structure/closet/crate/wooden/wooden_crate, +/obj/structure/closet/crate/wooden, /obj/item/grown/log/tree, /obj/item/grown/log/tree, /obj/item/grown/log/tree, @@ -5164,7 +5164,7 @@ /area/ghost_bar/outdoor/beach) "rU" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium{ color = "#fff894"; nitrogen = 103.984; @@ -5526,7 +5526,7 @@ /area/ghost_bar/indoor) "tl" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/flag/species/vox, /turf/simulated/floor/mineral/plastitanium{ nitrogen = 103.984; @@ -5536,7 +5536,7 @@ /area/vox_base) "tm" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/vox_base) "to" = ( @@ -6838,7 +6838,7 @@ /area/ninja/holding) "xw" = ( /obj/item/kirbyplants, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium{ color = "#ff78f4"; nitrogen = 103.984; @@ -7262,7 +7262,7 @@ /area/ghost_bar/indoor) "yR" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/dark/nitrogen{ icon_state = "darkpurplefull"; nitrogen = 103.984 @@ -7732,7 +7732,7 @@ /turf/simulated/floor/wood, /area/ghost_bar/indoor) "Ax" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/nitrogen, /area/space/nearstation/centcom) @@ -9527,7 +9527,7 @@ pixel_y = -1; pixel_x = -9 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium{ color = "#00ffea"; nitrogen = 103.984; @@ -9885,7 +9885,7 @@ }, /area/ghost_bar/indoor) "HN" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium{ nitrogen = 103.984; oxygen = 0; @@ -10099,7 +10099,7 @@ "Ix" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/flag/species/vox, /turf/simulated/floor/plating/nitrogen, /area/vox_base) @@ -10180,7 +10180,7 @@ /turf/simulated/floor/wood/fancy/birch, /area/ghost_bar/outdoor/beach) "IL" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium{ color = "#ff78f4"; nitrogen = 103.984; @@ -10219,7 +10219,7 @@ /turf/simulated/floor/carpet/royalblue, /area/shuttle/trade/sol) "IU" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium{ color = "#fff894"; nitrogen = 103.984; @@ -10586,7 +10586,7 @@ /turf/simulated/floor/plasteel, /area/tdome/arena_source) "Kj" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/light_fake{ dir = 4 }, @@ -10660,7 +10660,7 @@ pixel_y = 23 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium{ color = "#00ffea"; nitrogen = 103.984; @@ -10892,7 +10892,7 @@ /area/ghost_bar/outdoor/beach) "Lo" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light/directional/north, /obj/structure/closet/walllocker/firelocker/north, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, @@ -11062,7 +11062,7 @@ /area/admin) "LX" = ( /obj/effect/turf_decal/delivery/hollow, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light/directional/south, /turf/simulated/floor/mineral/plastitanium{ color = "#fff894"; @@ -11133,7 +11133,7 @@ /area/vox_base) "Mg" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/dark/nitrogen{ icon_state = "darkpurple"; dir = 1; @@ -11401,7 +11401,7 @@ /turf/simulated/floor/wood/oak, /area/admin) "Nq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/structure/chair/plastic, /turf/simulated/floor/plating/nitrogen, @@ -11629,7 +11629,7 @@ "Od" = ( /obj/effect/turf_decal/delivery/hollow, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/portable/canister/nitrogen, /turf/simulated/floor/mineral/plastitanium{ color = "#fff894"; @@ -12536,7 +12536,7 @@ "QV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/vox_base) "QW" = ( @@ -12681,7 +12681,7 @@ /turf/simulated/floor/wood, /area/ghost_bar/indoor) "Rx" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/reagent_dispensers/beerkeg, /turf/simulated/floor/wood/cherry, /area/ghost_bar/indoor) @@ -13102,7 +13102,7 @@ /area/ghost_bar/outdoor) "Tb" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium{ color = "#00ffea"; nitrogen = 103.984; @@ -13888,7 +13888,7 @@ pixel_x = -11; pixel_y = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/nitrogen, /area/vox_base) @@ -13935,7 +13935,7 @@ "VP" = ( /obj/effect/turf_decal/delivery/hollow, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/portable/canister/nitrogen, /obj/effect/decal/remains/mouse, /turf/simulated/floor/mineral/plastitanium{ @@ -14658,7 +14658,7 @@ /turf/simulated/floor/plasteel/dark, /area/ghost_bar/indoor) "Yk" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/ghost_bar/indoor) "Yl" = ( @@ -14677,7 +14677,7 @@ /turf/simulated/floor/wood, /area/ghost_bar/indoor) "Yp" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/flag/species/vox, /turf/simulated/floor/plating/nitrogen, /area/vox_base) @@ -14887,7 +14887,7 @@ /area/ghost_bar/indoor) "YW" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium{ nitrogen = 103.984; oxygen = 0; diff --git a/_maps/map_files220/generic/Lavaland.dmm b/_maps/map_files220/generic/Lavaland.dmm index 304d7de4595c5..f236e6b1eb6bf 100644 --- a/_maps/map_files220/generic/Lavaland.dmm +++ b/_maps/map_files220/generic/Lavaland.dmm @@ -512,7 +512,7 @@ }, /area/mine/outpost/hallway/east) "bt" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/lockers) "bu" = ( @@ -682,7 +682,7 @@ /obj/machinery/computer/arcade{ dir = 4 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "bI" = ( @@ -967,7 +967,7 @@ }, /area/mine/outpost/medbay) "co" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/lavaland/surface/outdoors) "cp" = ( @@ -1002,7 +1002,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "cs" = ( @@ -1025,7 +1025,7 @@ }, /area/mine/outpost/hallway/east) "cw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/storage) "cx" = ( @@ -1144,7 +1144,7 @@ }, /area/mine/outpost/hallway/east) "cM" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "cN" = ( @@ -1226,7 +1226,7 @@ /area/lavaland/surface/outdoors) "cX" = ( /obj/structure/window/reinforced, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/mine/outpost/production) @@ -1292,7 +1292,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/cable{ icon_state = "0-8" }, @@ -1315,7 +1315,7 @@ "df" = ( /obj/machinery/light/directional/east, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/light_switch/east, /turf/simulated/floor/plasteel{ dir = 1; @@ -1397,7 +1397,7 @@ }, /area/mine/outpost/engineering) "dn" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/cable{ icon_state = "1-10" }, @@ -1567,7 +1567,7 @@ }, /area/mine/outpost/storage) "dB" = ( -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/machinery/alarm/directional/north, /obj/effect/turf_decal/loading_area, /obj/effect/decal/cleanable/dirt, @@ -1582,7 +1582,7 @@ /area/mine/outpost/production) "dD" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/cyan, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -1596,7 +1596,7 @@ /area/mine/outpost/engineering) "dE" = ( /obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -1691,7 +1691,7 @@ /turf/simulated/floor/plating, /area/mine/outpost/production) "dM" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/effect/decal/cleanable/glass, /obj/machinery/requests_console/directional/west, /turf/simulated/floor/plating, @@ -1778,7 +1778,7 @@ /area/lavaland/surface/outdoors/outpost/catwalk) "dW" = ( /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/baseturf_helper/lava_land, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) @@ -2017,7 +2017,7 @@ }, /area/mine/outpost/hallway/west) "et" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/production) "eu" = ( @@ -2053,7 +2053,7 @@ "ex" = ( /obj/effect/turf_decal/delivery/hollow, /obj/structure/ore_box, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "dark" @@ -2211,7 +2211,7 @@ /area/mine/outpost/mechbay) "eL" = ( /obj/structure/closet/crate, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/vending_refill/wallmed, /obj/item/vending_refill/cigarette, /turf/simulated/floor/plating, @@ -2420,7 +2420,7 @@ }, /area/mine/outpost/engineering) "ff" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/sign/fire{ pixel_y = 32 }, @@ -2576,7 +2576,7 @@ }, /area/mine/outpost/storage) "ft" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/maintenance/south) "fu" = ( @@ -2702,12 +2702,12 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 6 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/catwalk, /area/mine/outpost/engineering) "fG" = ( /obj/effect/turf_decal/caution, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -2774,7 +2774,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "fM" = ( @@ -3078,7 +3078,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) @@ -3299,7 +3299,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "gQ" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) @@ -3757,7 +3757,7 @@ }, /area/mine/outpost/mechbay) "iT" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, /area/mine/outpost/maintenance/south) "iU" = ( @@ -4276,7 +4276,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel{ dir = 8; @@ -4286,7 +4286,7 @@ "lc" = ( /obj/effect/turf_decal/delivery/hollow, /obj/structure/ore_box, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "dark" @@ -4436,7 +4436,7 @@ /area/lavaland/surface/outdoors) "lx" = ( /obj/structure/fans/tiny, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/door/airlock/maintenance/external/glass, /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, @@ -5281,7 +5281,7 @@ /area/lavaland/surface/outdoors/legion) "oP" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "oR" = ( @@ -5322,7 +5322,7 @@ /area/lavaland/surface/outdoors) "pa" = ( /obj/machinery/firealarm/directional/south, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ icon_state = "purplecorner"; dir = 8 @@ -5445,7 +5445,7 @@ /turf/simulated/floor/indestructible/boss, /area/lavaland/surface/outdoors/legion) "qd" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/lavaland/surface/outdoors) "qi" = ( @@ -5453,7 +5453,7 @@ /turf/simulated/wall, /area/lavaland/surface/outdoors/outpost/catwalk) "qm" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/trash/chips, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) @@ -5520,7 +5520,7 @@ /turf/simulated/floor/indestructible/boss, /area/lavaland/surface/outdoors/legion) "qT" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/mine/laborcamp) "rd" = ( @@ -5566,7 +5566,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/mine/laborcamp) "rz" = ( @@ -5761,7 +5761,7 @@ /obj/item/flashlight/flare/glowstick/random, /obj/item/flashlight/flare/glowstick/random, /obj/item/flashlight/flare/glowstick/random, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "sM" = ( @@ -6013,7 +6013,7 @@ /obj/item/radio/intercom/locked/prison{ pixel_y = 22 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/mine/laborcamp) "ug" = ( @@ -6033,7 +6033,7 @@ /area/mine/laborcamp) "uh" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "ui" = ( @@ -6516,7 +6516,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, /obj/effect/mapping_helpers/airlock/access/any/supply/qm, /turf/simulated/floor/plasteel/dark, @@ -6574,7 +6574,7 @@ }, /area/mine/laborcamp/security) "xl" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/mechbay) "xo" = ( @@ -6627,7 +6627,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "dark" @@ -6681,7 +6681,7 @@ /turf/simulated/floor/carpet, /area/mine/outpost/quartermaster) "xP" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) "xR" = ( @@ -6850,7 +6850,7 @@ /area/lavaland/surface/outdoors) "yR" = ( /obj/effect/spawner/random/barrier/grille_maybe, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) @@ -6928,7 +6928,7 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/mine/laborcamp) "zu" = ( @@ -7322,7 +7322,7 @@ /obj/structure/sign/securearea{ pixel_x = -32 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/outpost/catwalk) "Bq" = ( @@ -7400,7 +7400,7 @@ /turf/simulated/floor/plating, /area/mine/outpost/airlock) "BH" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/hallway/east) "BT" = ( @@ -7653,7 +7653,7 @@ /obj/item/radio/intercom/locked/prison{ pixel_y = 22 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/mine/laborcamp) "Dh" = ( @@ -7720,7 +7720,7 @@ /area/mine/outpost/airlock) "DA" = ( /obj/effect/spawner/random/barrier/grille_often, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) "DB" = ( @@ -7985,7 +7985,7 @@ /obj/structure/bed, /obj/item/bedsheet/orange, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/mine/laborcamp) "Fs" = ( @@ -8108,7 +8108,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/mine/outpost/mechbay) "Gm" = ( @@ -8125,7 +8125,7 @@ /area/mine/laborcamp) "Gp" = ( /obj/structure/sign/poster/contraband/clown, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/mine/laborcamp) "Gt" = ( @@ -8392,7 +8392,7 @@ }, /area/mine/outpost/cafeteria) "HT" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "dark" @@ -8485,7 +8485,7 @@ /area/mine/laborcamp) "Iv" = ( /obj/effect/turf_decal/delivery, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/mine/outpost/production) @@ -8732,7 +8732,7 @@ dir = 1; network = list("Labor Camp") }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/mine/laborcamp) "JQ" = ( @@ -8754,8 +8754,8 @@ "JX" = ( /obj/structure/table, /obj/item/lighter/random, -/obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/dirt/maybe, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "JY" = ( @@ -8924,7 +8924,7 @@ /obj/structure/fans/tiny, /obj/machinery/door/airlock/maintenance/external/glass, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, /turf/simulated/floor/catwalk, /area/mine/outpost/hallway/west) @@ -9384,7 +9384,7 @@ "ND" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/mine/laborcamp) "NG" = ( @@ -9513,7 +9513,7 @@ /turf/simulated/floor/plating, /area/mine/outpost/production) "Os" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/maintenance/east) "Ov" = ( @@ -9571,7 +9571,7 @@ /turf/simulated/floor/indestructible/boss, /area/lavaland/surface/outdoors/legion) "OM" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, @@ -9741,12 +9741,12 @@ /area/mine/laborcamp) "Qq" = ( /obj/structure/cable, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/machinery/power/apc/directional/west, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) "Qv" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/structure/disposalpipe/segment/corner{ dir = 2 }, @@ -9963,7 +9963,7 @@ }, /area/lavaland/surface/outdoors/legion) "RB" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/gps/ruin{ pixel_x = 32 }, @@ -10114,7 +10114,7 @@ }, /area/mine/laborcamp) "Sx" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/mine/outpost/cafeteria) "Sy" = ( @@ -10213,7 +10213,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/mine/laborcamp) "Tn" = ( @@ -10320,7 +10320,7 @@ icon_state = "4-8" }, /obj/machinery/light/directional/north, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/catwalk, /area/mine/outpost/engineering) "Um" = ( @@ -10451,7 +10451,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/effect/turf_decal/loading_area, /turf/simulated/floor/plasteel{ dir = 1; @@ -10510,7 +10510,7 @@ /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) "Vm" = ( -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -10648,7 +10648,7 @@ }, /area/mine/laborcamp) "VJ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/mine/laborcamp) "VK" = ( @@ -10675,7 +10675,7 @@ "VN" = ( /obj/structure/bed, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/mine/laborcamp) "VO" = ( @@ -10741,7 +10741,7 @@ "VV" = ( /obj/machinery/firealarm/directional/west, /obj/item/kirbyplants, -/obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/spawner/random/dirt/maybe, /obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 8; @@ -10832,7 +10832,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/outpost/catwalk) "WI" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /obj/structure/sign/nanotrasen, /turf/simulated/wall, /area/mine/outpost/maintenance/south) @@ -10998,7 +10998,7 @@ /turf/simulated/floor/indestructible/boss, /area/lavaland/surface/outdoors/legion) "XI" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /obj/effect/spawner/random/fungus/maybe, /turf/simulated/wall, /area/lavaland/surface/outdoors/outpost/catwalk) @@ -11088,7 +11088,7 @@ }, /area/mine/outpost/hallway/east) "Yb" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/mine/laborcamp/security) "Yc" = ( @@ -11370,8 +11370,8 @@ icon_state = "2-4" }, /obj/machinery/light/small/directional/west, -/obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/dirt/maybe, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "ZL" = ( diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index 1ada4eb1c8a17..a47938d93e2c2 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -1513,7 +1513,7 @@ }, /area/centcom/ss220/bar) "aZm" = ( -/obj/mecha/working/ripley/mining, +/obj/mecha/working/ripley/mining/old, /obj/effect/turf_decal/stripes/red/box, /turf/simulated/floor/plasteel/dark, /area/centcom/ss220/supply) @@ -11751,9 +11751,8 @@ /area/centcom/ss220/supply) "haI" = ( /obj/effect/turf_decal/delivery/red, -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -17864,9 +17863,8 @@ dir = 4 }, /obj/effect/turf_decal/delivery/white, -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -19867,9 +19865,8 @@ /area/syndicate_mothership) "lKt" = ( /obj/effect/turf_decal/delivery, -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "dark" @@ -20725,9 +20722,8 @@ /obj/structure/light_fake/spot{ dir = 1 }, -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "darkyellowalt" }, @@ -22098,9 +22094,8 @@ }, /area/syndicate_mothership/cargo) "neJ" = ( -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkyellowalt" @@ -22314,9 +22309,8 @@ /turf/simulated/floor/wood/oak, /area/syndicate_mothership/control) "nlb" = ( -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -22998,9 +22992,8 @@ dir = 8 }, /obj/effect/turf_decal/delivery/white, -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -23411,9 +23404,8 @@ /area/syndicate_mothership/outside) "nRS" = ( /obj/effect/turf_decal/delivery/white, -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -24557,9 +24549,8 @@ "oEC" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/delivery/red, -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -25221,9 +25212,8 @@ /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) "oYr" = ( -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /obj/structure/closet/crate, /turf/simulated/floor/plasteel{ dir = 9; @@ -34169,9 +34159,8 @@ /turf/simulated/floor/wood/parquet/tile, /area/centcom/ss220/admin2) "upU" = ( -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /obj/structure/closet/crate, /turf/simulated/floor/plasteel{ dir = 5; @@ -37969,9 +37958,8 @@ dir = 5 }, /obj/effect/turf_decal/delivery/white, -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -38529,9 +38517,8 @@ /area/centcom/ss220/admin1) "wLN" = ( /obj/effect/turf_decal/delivery, -/obj/effect/spawner/random_spawners/syndicate/loot{ - spawn_inside = null - }, +/obj/effect/spawner/random/syndicate/loot/common, +/obj/structure/closet/secure_closet/syndicate/depot, /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plasteel{ dir = 1; diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm index 81d8c0d65d761..cbba111ade92d 100644 --- a/_maps/map_files220/stations/boxstation.dmm +++ b/_maps/map_files220/stations/boxstation.dmm @@ -772,7 +772,7 @@ }, /area/station/command/office/hos) "aeE" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/wood/oak, /area/station/maintenance/apmaint) "aeF" = ( @@ -2839,7 +2839,7 @@ /turf/space, /area/station/engineering/solar/fore) "amW" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -3738,7 +3738,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "aqc" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/fore) "aqd" = ( @@ -5480,7 +5480,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint) "awN" = ( @@ -5566,7 +5566,7 @@ "axh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -5950,7 +5950,7 @@ /obj/structure/chair/barber, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/item/decorations/sticky_decorations/flammable/spider, /obj/structure/mirror{ icon_state = "mirror_broke"; @@ -6665,7 +6665,7 @@ /obj/structure/chair/stool/bar{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "azU" = ( @@ -6746,7 +6746,7 @@ /obj/structure/chair/stool/bar{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "aAc" = ( @@ -7013,7 +7013,7 @@ }, /area/station/security/armory/secure) "aAY" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aAZ" = ( @@ -7074,15 +7074,15 @@ dir = 4 }, /obj/structure/spider/stickyweb, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "aBe" = ( /obj/structure/chair/wood/wings{ dir = 8 }, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/cobweb/right/frequent, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "aBf" = ( @@ -7164,7 +7164,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "aBy" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/space/nearstation) "aBA" = ( @@ -7274,7 +7274,7 @@ /area/station/security/execution) "aBT" = ( /obj/item/paper/crumpled, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/space/nearstation) "aBU" = ( @@ -7284,13 +7284,13 @@ /obj/structure/sign/poster/random{ pixel_x = -32 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "aBV" = ( /obj/item/storage/fancy/crayons, /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "aBW" = ( @@ -7298,7 +7298,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "aBX" = ( @@ -7310,7 +7310,7 @@ /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "aBZ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/airless, /area/space/nearstation) "aCa" = ( @@ -7591,7 +7591,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "aCP" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/abandonedbar) "aCQ" = ( @@ -7628,7 +7628,7 @@ "aCS" = ( /obj/item/lighter/random, /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "aCU" = ( @@ -7856,13 +7856,13 @@ /area/station/maintenance/fpmaint2) "aDA" = ( /obj/structure/filingcabinet/filingcabinet, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aDB" = ( /obj/structure/rack, /obj/item/camera, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/wood/oak, /area/station/maintenance/fpmaint2) "aDC" = ( @@ -8006,7 +8006,7 @@ /obj/structure/table/wood, /obj/item/trash/can, /obj/item/reagent_containers/glass/rag, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "aEc" = ( @@ -8169,13 +8169,13 @@ /obj/item/clothing/head/det_hat, /obj/item/cartridge/detective, /obj/item/clothing/glasses/sunglasses/yeah, -/obj/effect/spawner/random_spawners/id_skins, +/obj/effect/spawner/random/id_skins, /turf/simulated/floor/wood/oak, /area/station/maintenance/fpmaint2) "aEH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/spawner/xeno, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fpmaint2) "aEI" = ( @@ -8212,7 +8212,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aEQ" = ( -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aES" = ( @@ -8222,16 +8222,16 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "aET" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aEU" = ( /obj/item/shard{ icon_state = "medium" }, -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "aEV" = ( @@ -8257,7 +8257,7 @@ /obj/item/trash/pistachios, /obj/machinery/light/directional/south, /obj/effect/mapping_helpers/machinery/destroyed, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "aEY" = ( @@ -8279,7 +8279,7 @@ pixel_x = -8; pixel_y = 2 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "aFb" = ( @@ -8297,7 +8297,7 @@ /obj/structure/closet/cabinet, /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fsmaint) "aFh" = ( @@ -8537,7 +8537,7 @@ "aFN" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse/brown, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel{ icon_state = "stage_bleft" }, @@ -8589,7 +8589,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_port) "aFT" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/solar_maintenance/fore_port) "aFU" = ( @@ -8648,12 +8648,12 @@ name = "Abandoned Bar" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "aGd" = ( /obj/effect/spawner/random/fungus/frequent, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/abandonedbar) "aGe" = ( @@ -8663,7 +8663,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aGi" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/fpmaint) "aGj" = ( @@ -8681,7 +8681,7 @@ /obj/structure/chair/stool{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fpmaint) "aGm" = ( @@ -8703,7 +8703,7 @@ /area/station/maintenance/fpmaint) "aGp" = ( /obj/machinery/economy/vending/coffee, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fpmaint) "aGq" = ( @@ -8821,7 +8821,7 @@ /obj/structure/closet/crate, /obj/effect/spawner/random/trash, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/effect/decal/cleanable/dust, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, @@ -8930,7 +8930,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aGZ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/station/maintenance/fsmaint) "aHa" = ( @@ -9019,7 +9019,7 @@ "aHm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fpmaint2) "aHq" = ( @@ -9179,7 +9179,7 @@ dir = 6; level = 1 }, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/item/wrench, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plating, @@ -9285,7 +9285,7 @@ /obj/structure/closet/crate/secure{ req_one_access = list(33,41) }, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aIo" = ( @@ -9399,7 +9399,7 @@ /turf/simulated/floor/transparent/glass/reinforced, /area/station/public/dorms) "aIH" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fpmaint2) "aII" = ( @@ -9420,7 +9420,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 5 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fpmaint2) "aIM" = ( @@ -9443,7 +9443,7 @@ "aIQ" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/atmospherics/portable/canister/air, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aIR" = ( @@ -9475,7 +9475,7 @@ /turf/simulated/floor/wood/oak, /area/station/maintenance/fpmaint) "aIV" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/spawner/random/maintenance, /obj/machinery/power/apc/directional/east, /obj/structure/cable{ @@ -9745,7 +9745,7 @@ /turf/simulated/floor/plating, /area/shuttle/pod_1) "aJU" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/fpmaint2) "aJV" = ( @@ -9759,7 +9759,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/wood/oak, /area/station/maintenance/fpmaint) @@ -9784,7 +9784,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aKc" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aKd" = ( @@ -9797,11 +9797,11 @@ /area/station/maintenance/fpmaint) "aKh" = ( /obj/structure/chair/office/dark, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aKj" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/clothing/mask/bandana/skull, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -10067,7 +10067,7 @@ /area/station/security/detective) "aLk" = ( /obj/machinery/kitchen_machine/oven, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aLn" = ( @@ -10077,7 +10077,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/wood/oak, /area/station/maintenance/fpmaint2) @@ -10155,7 +10155,7 @@ }, /area/station/maintenance/fpmaint) "aLH" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/command/vault) "aLJ" = ( @@ -10167,7 +10167,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aLL" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fpmaint) "aLM" = ( @@ -10379,7 +10379,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aMz" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fsmaint) "aMA" = ( @@ -10456,7 +10456,7 @@ /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "aMR" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/fpmaint) "aMS" = ( @@ -10530,7 +10530,7 @@ }, /area/station/maintenance/fsmaint) "aNh" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank/high, /turf/simulated/floor/plasteel{ @@ -10566,7 +10566,7 @@ /area/station/maintenance/electrical) "aNm" = ( /obj/machinery/power/port_gen/pacman, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/electrical) "aNo" = ( @@ -10881,7 +10881,7 @@ /turf/simulated/floor/wood/fancy, /area/station/legal/courtroom) "aOC" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/fsmaint) "aOE" = ( @@ -10949,7 +10949,7 @@ /area/station/engineering/atmos/storage) "aOT" = ( /obj/structure/chair, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aOU" = ( @@ -10999,7 +10999,7 @@ /area/station/maintenance/apmaint) "aPa" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/food/meat/slab, /obj/item/clothing/mask/face/fox, /turf/simulated/floor/plasteel, @@ -11031,7 +11031,7 @@ /obj/structure/rack, /obj/effect/spawner/random/maintenance, /obj/effect/spawner/random/trash, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aPf" = ( @@ -11068,7 +11068,7 @@ /turf/simulated/floor/plating/airless, /area/space/nearstation) "aPr" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint) "aPt" = ( @@ -11550,7 +11550,7 @@ }, /area/station/maintenance/fsmaint) "aQN" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/rack, /obj/item/hatchet, /obj/item/reagent_containers/spray/plantbgone, @@ -11719,7 +11719,7 @@ /turf/simulated/wall/mineral/titanium, /area/shuttle/pod_1) "aRp" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fpmaint2) "aRw" = ( @@ -12065,7 +12065,7 @@ /area/station/maintenance/aft) "aTf" = ( /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "aTg" = ( @@ -12091,7 +12091,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/electrical) "aTm" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, /obj/structure/cable{ @@ -12383,7 +12383,7 @@ /area/station/service/clown) "aUe" = ( /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/spacecash/c10, /turf/simulated/floor/engine, /area/station/maintenance/fsmaint) @@ -12623,7 +12623,7 @@ /area/station/public/sleep_female) "aUU" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aUV" = ( @@ -13227,7 +13227,7 @@ "aWT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -13529,7 +13529,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "aXM" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/public/storage/tools) "aXO" = ( @@ -14243,7 +14243,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bad" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bag" = ( @@ -14346,7 +14346,7 @@ }, /area/station/ai_monitored/storage/eva) "bat" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/fpmaint2) "bau" = ( @@ -17194,7 +17194,7 @@ /area/station/maintenance/port) "blL" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "blM" = ( @@ -18683,7 +18683,7 @@ /turf/simulated/floor/wood/oak, /area/station/public/vacant_office) "bsc" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/rack, /obj/item/extinguisher, /obj/effect/spawner/random/maintenance, @@ -18747,7 +18747,7 @@ /turf/simulated/floor/plasteel, /area/station/public/vacant_store) "bsn" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/machinery/atmospherics/portable/canister/air, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -18953,7 +18953,7 @@ /turf/simulated/floor/plasteel, /area/station/public/vacant_store) "bsW" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/engineering/supermatter_room) "bsX" = ( @@ -19193,7 +19193,7 @@ desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; name = "KEEP CLEAR: DOCKING AREA" }, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/port) "bun" = ( @@ -19366,7 +19366,7 @@ /obj/machinery/atmospherics/unary/tank/air{ dir = 4 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "bvq" = ( @@ -21270,7 +21270,7 @@ /area/station/medical/chemistry) "bEt" = ( /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint2) "bEu" = ( @@ -21644,7 +21644,7 @@ /area/station/public/storage/tools/auxiliary) "bGb" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/port) "bGc" = ( @@ -22001,7 +22001,7 @@ /obj/machinery/camera{ c_tag = "Auxiliary Tool Storage" }, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel, /area/station/public/storage/tools/auxiliary) "bGY" = ( @@ -22060,7 +22060,7 @@ /turf/simulated/floor/carpet/black, /area/station/service/bar/atrium) "bHv" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/wood/oak, /area/station/maintenance/port) @@ -22392,8 +22392,8 @@ /area/station/turret_protected/ai_upload) "bIP" = ( /obj/structure/closet/secure_closet/personal, -/obj/effect/spawner/random_spawners/cobweb_right_rare, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/cobweb/right/rare, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/port) "bIR" = ( @@ -23524,7 +23524,7 @@ "bNP" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/port) @@ -23992,7 +23992,7 @@ /area/station/supply/qm) "bPR" = ( /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/birch, /area/station/maintenance/fsmaint) "bPT" = ( @@ -24296,7 +24296,7 @@ }, /area/station/science/robotics/chargebay) "bRz" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/disposalpipe/segment/corner{ dir = 1 }, @@ -25589,7 +25589,7 @@ }, /area/station/hallway/primary/central/west) "bWT" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/storage) "bWU" = ( @@ -26318,7 +26318,7 @@ "cao" = ( /obj/machinery/recharge_station, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -26360,7 +26360,7 @@ }, /obj/machinery/disposal, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "brown" @@ -27109,7 +27109,7 @@ }, /area/station/medical/morgue) "ccF" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -27228,7 +27228,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/sorting) "cdb" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) @@ -27612,8 +27612,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "ceK" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/cobweb/right/frequent, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint2) "ceM" = ( @@ -28075,7 +28075,7 @@ /area/station/medical/paramedic) "chk" = ( /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "cho" = ( @@ -28546,7 +28546,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cjc" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/port) "cjd" = ( @@ -29012,7 +29012,7 @@ }, /area/station/engineering/atmos) "ckR" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "ckU" = ( @@ -29303,12 +29303,12 @@ /area/station/medical/reception) "clW" = ( /obj/machinery/light/small/directional/east, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint2) "clX" = ( /obj/structure/fermenting_barrel, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint2) "clY" = ( @@ -29616,7 +29616,7 @@ /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) "cmR" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/service/janitor) "cmT" = ( @@ -29731,7 +29731,7 @@ /area/station/command/office/ntrep) "cnv" = ( /obj/item/seeds/berry, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint2) "cnx" = ( @@ -30037,7 +30037,7 @@ /area/station/medical/medbay2) "coA" = ( /obj/item/seeds/apple, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint2) "coC" = ( @@ -30413,7 +30413,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -30579,7 +30579,7 @@ }, /area/station/medical/patients_rooms) "crj" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint2) "crm" = ( @@ -31630,7 +31630,7 @@ /turf/simulated/wall, /area/station/maintenance/asmaint2) "cuS" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /obj/effect/spawner/random/fungus/maybe, /turf/simulated/wall, /area/station/maintenance/asmaint2) @@ -31874,7 +31874,7 @@ }, /area/station/command/office/cmo) "cvQ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -32412,7 +32412,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "cyk" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/apmaint) "cyn" = ( @@ -32771,7 +32771,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "czg" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; @@ -32840,7 +32840,7 @@ /area/station/maintenance/aft) "czr" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "czu" = ( @@ -33112,7 +33112,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/aft) "cAw" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -33121,7 +33121,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "cAB" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/aft) "cAC" = ( @@ -34163,7 +34163,7 @@ /area/station/science/misc_lab) "cEv" = ( /obj/machinery/space_heater, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/port) "cEx" = ( @@ -34398,7 +34398,7 @@ "cFP" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/port) "cFQ" = ( @@ -35225,7 +35225,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/aft) "cIl" = ( @@ -35296,7 +35296,7 @@ /turf/simulated/floor/engine, /area/station/science/xenobiology) "cIu" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cIv" = ( @@ -35777,7 +35777,7 @@ /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai) "cJO" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/port) "cJP" = ( @@ -35827,7 +35827,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -35852,7 +35852,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/aft) "cKi" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -35989,7 +35989,7 @@ }, /area/station/engineering/control) "cKS" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/aft) "cKT" = ( @@ -36192,7 +36192,7 @@ /area/station/aisat/hall) "cLF" = ( /obj/structure/largecrate, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "cLG" = ( @@ -36714,7 +36714,7 @@ }, /area/station/engineering/supermatter_room) "cOk" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/engineering/hallway) "cOl" = ( @@ -37351,7 +37351,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "cQw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/asmaint) "cQx" = ( @@ -37735,7 +37735,7 @@ "cRE" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/port) "cRJ" = ( @@ -38601,7 +38601,7 @@ }, /area/station/engineering/hallway) "cTU" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/aft) "cTV" = ( @@ -38937,7 +38937,7 @@ /turf/simulated/floor/plating, /area/station/engineering/control) "cVi" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel, /area/station/engineering/control) "cVj" = ( @@ -40116,7 +40116,7 @@ /turf/simulated/floor/plasteel, /area/station/science/xenobiology) "cZu" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/abandonedbar) "cZv" = ( @@ -40463,7 +40463,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "daG" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/engineering/control) "daH" = ( @@ -40765,7 +40765,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "dbN" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/station/engineering/utility) "dbO" = ( @@ -40811,7 +40811,7 @@ }, /area/station/engineering/supermatter_room) "dbX" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "dbZ" = ( @@ -42088,7 +42088,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "dgn" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -43111,7 +43111,7 @@ /turf/simulated/floor/plating, /area/station/engineering/atmos) "dku" = ( -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, /obj/structure/closet/l3closet/janitor, @@ -45181,7 +45181,7 @@ }, /area/station/engineering/equipmentstorage) "dta" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/structure/window/reinforced{ dir = 4 }, @@ -45474,7 +45474,7 @@ /turf/simulated/wall, /area/station/maintenance/port) "dwg" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/fsmaint) "dwA" = ( @@ -45508,7 +45508,7 @@ /area/station/maintenance/fsmaint) "dxe" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/engine, /area/station/maintenance/fsmaint) @@ -45609,7 +45609,7 @@ }, /area/station/engineering/smes) "dzg" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/turbine) "dzn" = ( @@ -45981,7 +45981,7 @@ pixel_y = 3 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/wood/oak, /area/station/maintenance/apmaint) "dEv" = ( @@ -46244,7 +46244,7 @@ /area/station/science/explab/chamber) "dHU" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/light/small/nightshifted/north, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) @@ -46263,7 +46263,7 @@ /area/station/public/arcade) "dIh" = ( /obj/structure/dresser, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dIY" = ( @@ -46986,7 +46986,7 @@ }, /area/station/maintenance/abandonedbar) "dXC" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/rods{ amount = 4 }, @@ -47486,7 +47486,7 @@ /obj/structure/sign/poster/contraband/red_rum{ pixel_y = 30 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/apmaint) "efl" = ( @@ -48106,7 +48106,7 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "erd" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -48882,7 +48882,7 @@ }, /area/station/security/brig) "eFl" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -48982,14 +48982,14 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/landmark/start/uncertain, /turf/simulated/floor/wood/oak, /area/station/maintenance/aft) "eGZ" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/disposalpipe/segment/corner{ dir = 2 }, @@ -49803,7 +49803,7 @@ /turf/simulated/floor/plating, /area/station/aisat/hall) "eWA" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -50240,13 +50240,13 @@ /turf/simulated/floor/plating, /area/station/medical/cloning) "fea" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/item/clothing/gloves/color/fyellow/old, /turf/simulated/floor/plating, /area/station/maintenance/port) "feq" = ( /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/reagent_containers/condiment/enzyme, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) @@ -50433,7 +50433,7 @@ /area/station/public/dorms) "fiM" = ( /obj/structure/disposalpipe/segment, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "fjd" = ( @@ -51066,7 +51066,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -51178,7 +51178,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/id_skins, +/obj/effect/spawner/random/id_skins, /turf/simulated/floor/plasteel, /area/station/public/locker) "fwy" = ( @@ -51605,7 +51605,7 @@ /turf/simulated/wall/r_wall, /area/station/science/toxins/launch) "fDM" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/structure/disposalpipe/segment/corner{ dir = 2 }, @@ -51627,7 +51627,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "fDU" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dust, /obj/structure/cable{ d1 = 4; @@ -51955,7 +51955,7 @@ /area/station/maintenance/asmaint) "fJK" = ( /obj/structure/rack, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "fJX" = ( @@ -52138,7 +52138,7 @@ "fNH" = ( /obj/machinery/space_heater, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plasteel{ icon_state = "stage_bleft" }, @@ -52246,7 +52246,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "fRo" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/chair, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plating, @@ -52398,7 +52398,7 @@ /area/station/service/hydroponics) "fTO" = ( /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "fTR" = ( @@ -52454,7 +52454,7 @@ "fVg" = ( /obj/effect/decal/cleanable/dust, /obj/item/trash/can, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/station/maintenance/abandonedbar) "fVk" = ( @@ -54074,7 +54074,7 @@ }, /area/station/service/kitchen) "gwb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -54217,7 +54217,7 @@ }, /area/station/hallway/primary/central/nw) "gzN" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/apmaint) "gzQ" = ( @@ -54715,7 +54715,7 @@ /turf/simulated/floor/engine, /area/station/science/xenobiology) "gGR" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -54770,7 +54770,7 @@ /area/station/engineering/atmos) "gIn" = ( /obj/item/lighter/random, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/aft) "gIp" = ( @@ -55278,7 +55278,7 @@ /area/station/service/bar) "gPk" = ( /obj/machinery/hydroponics/constructable, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light/small/directional/south, /obj/effect/mapping_helpers/machinery/damaged, /turf/simulated/floor/engine, @@ -55362,7 +55362,7 @@ /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint2) "gRp" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/medical/patients_rooms) "gRB" = ( @@ -55911,7 +55911,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "gZn" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -55927,7 +55927,7 @@ /area/station/engineering/atmos) "gZH" = ( /obj/effect/decal/remains/human, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint2) "gZS" = ( @@ -55983,7 +55983,7 @@ "hak" = ( /obj/effect/decal/cleanable/dust, /obj/machinery/light/small/directional/east, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/birch, /area/station/maintenance/fsmaint) "hau" = ( @@ -56150,7 +56150,7 @@ }, /area/station/maintenance/asmaint) "hea" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/engineering/control) "hen" = ( @@ -56225,7 +56225,7 @@ /area/station/science/robotics/chargebay) "hgb" = ( /obj/structure/chair, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint) "hgR" = ( @@ -56295,7 +56295,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, @@ -56489,7 +56489,7 @@ /area/station/security/permabrig) "hiQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) @@ -56867,7 +56867,7 @@ }, /area/station/hallway/secondary/exit) "hqi" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/port) "hqo" = ( @@ -57011,7 +57011,7 @@ "hsz" = ( /obj/effect/decal/cleanable/dust, /obj/structure/sign/poster/contraband/random/west, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/structure/bed{ dir = 1 }, @@ -57137,7 +57137,7 @@ /area/station/science/hallway) "huo" = ( /obj/structure/chair/stool, -/obj/effect/spawner/random_spawners/dirt_frequent, +/obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint2) "huD" = ( @@ -57568,7 +57568,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "hCY" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -57701,7 +57701,7 @@ }, /area/station/science/server/coldroom) "hEW" = ( -/obj/machinery/suit_storage_unit/ce/secure, +/obj/machinery/suit_storage_unit/industrial/ce/secure, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellow" @@ -58069,7 +58069,7 @@ }, /area/station/security/execution) "hLB" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -59025,7 +59025,7 @@ /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "iez" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/port) "ieC" = ( @@ -59418,7 +59418,7 @@ "inm" = ( /obj/machinery/washing_machine, /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/birch, /area/station/maintenance/fsmaint) "inu" = ( @@ -60038,7 +60038,7 @@ /area/station/medical/surgery/secondary) "izV" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "iBm" = ( @@ -60097,7 +60097,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "iBU" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/disposal) "iBV" = ( @@ -60206,7 +60206,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/aft) "iEg" = ( @@ -62178,7 +62178,7 @@ /obj/structure/sign/poster/contraband/communist_state{ pixel_y = 32 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "jqd" = ( @@ -62220,7 +62220,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/spawner/random_spawners/id_skins/no_chance, +/obj/effect/spawner/random/id_skins/no_chance, /turf/simulated/floor/wood/oak, /area/station/service/library) "jqN" = ( @@ -62457,7 +62457,7 @@ /area/station/public/dorms) "jtP" = ( /obj/item/kirbyplants, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint) "jtR" = ( @@ -62926,7 +62926,7 @@ }, /area/station/security/prisonlockers) "jDg" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "jDn" = ( @@ -62955,7 +62955,7 @@ /area/station/maintenance/asmaint2) "jDC" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 }, @@ -63038,7 +63038,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "jFF" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/effect/spawner/wire_splicing/thirty, @@ -63214,7 +63214,7 @@ "jKN" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plasteel{ icon_state = "stage_bleft" }, @@ -63565,12 +63565,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "jQI" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "jQQ" = ( /obj/item/latexballon, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/port) "jQW" = ( @@ -63957,7 +63957,7 @@ "jYF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -64488,7 +64488,7 @@ "kiF" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "kjf" = ( @@ -65127,7 +65127,7 @@ /area/station/turret_protected/ai) "ktP" = ( /obj/structure/bed, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -65366,7 +65366,7 @@ /area/station/science/hallway) "kyh" = ( /obj/machinery/washing_machine, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "kym" = ( @@ -65471,7 +65471,7 @@ /area/station/command/office/hos) "kAX" = ( /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/spawner/random/trash, /obj/structure/cable{ d1 = 4; @@ -65631,7 +65631,7 @@ /area/station/maintenance/fsmaint) "kCM" = ( /obj/item/flag/cult, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -65694,7 +65694,7 @@ /area/station/maintenance/aft) "kEe" = ( /obj/machinery/economy/vending/coffee, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint) "kEj" = ( @@ -66933,7 +66933,7 @@ }, /area/station/engineering/supermatter_room) "laK" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) @@ -67138,7 +67138,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "ldl" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/fore) "lee" = ( @@ -67719,7 +67719,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "lqd" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/asmaint2) "lqj" = ( @@ -68033,14 +68033,14 @@ }, /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" }, /area/station/maintenance/apmaint) "lvE" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/decal/cleanable/dust, /obj/item/stack/cable_coil, /turf/simulated/floor/plating, @@ -68284,13 +68284,13 @@ /turf/simulated/floor/plasteel, /area/station/supply/sorting) "lAb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light_construct/small/west, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "lAc" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/tracks/mapped{ dir = 1 @@ -68727,7 +68727,7 @@ /area/station/maintenance/asmaint) "lHs" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "lHw" = ( @@ -68882,7 +68882,7 @@ /obj/structure/disposalpipe/junction/y{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -69112,7 +69112,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "lOY" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/maintenance/fore) "lPa" = ( @@ -70139,7 +70139,7 @@ /obj/item/food/grown/cannabis, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/mask/cigarette/medical_marijuana, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint) "mem" = ( @@ -70327,7 +70327,7 @@ /obj/machinery/floodlight{ light_power = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint) "mhv" = ( @@ -70929,7 +70929,7 @@ /obj/structure/chair/stool{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/aft) "mrd" = ( @@ -70991,7 +70991,7 @@ }, /area/station/hallway/primary/aft) "msm" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, @@ -71243,7 +71243,7 @@ /area/station/maintenance/solar_maintenance/aft_port) "mxz" = ( /obj/machinery/space_heater, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "mxA" = ( @@ -71496,7 +71496,7 @@ }, /area/station/hallway/secondary/entry) "mCw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/maintenance/fsmaint) "mCx" = ( @@ -71636,7 +71636,7 @@ dir = 6; level = 1 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/machinery/alarm/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) @@ -72226,7 +72226,7 @@ "mSI" = ( /obj/structure/chair/comfy/brown, /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fsmaint) "mSJ" = ( @@ -72704,7 +72704,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "naG" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dust, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -73393,7 +73393,7 @@ /area/station/medical/morgue) "nlI" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/birch, /area/station/maintenance/fsmaint) "nlK" = ( @@ -73532,7 +73532,7 @@ }, /area/station/command/office/ce) "npb" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitehall" @@ -73640,7 +73640,7 @@ }, /area/station/engineering/supermatter_room) "nqv" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/port) "nqC" = ( @@ -74065,7 +74065,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fsmaint) "nxH" = ( @@ -74257,7 +74257,7 @@ /area/station/engineering/control) "nBs" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "nBw" = ( @@ -74559,7 +74559,7 @@ /area/station/engineering/secure_storage) "nGG" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "nGL" = ( @@ -74828,7 +74828,7 @@ }, /area/station/engineering/atmos) "nMd" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "nMi" = ( @@ -75143,7 +75143,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "nSQ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -75940,7 +75940,7 @@ }, /area/station/maintenance/aft) "ogH" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/engineering/ai_transit_tube) "ogI" = ( @@ -76165,7 +76165,7 @@ "ojz" = ( /obj/structure/sign/poster/contraband/random/west, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint) "ojJ" = ( @@ -76363,7 +76363,7 @@ /area/station/maintenance/aft) "omd" = ( /obj/item/stack/sheet/metal/ten, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "omz" = ( @@ -76568,7 +76568,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "oqT" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light/small/nightshifted/south, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint2) @@ -76603,7 +76603,7 @@ "orE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "orM" = ( @@ -76924,7 +76924,7 @@ /turf/simulated/floor/wood/fancy/cherry, /area/station/service/theatre) "owJ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "owP" = ( @@ -76934,7 +76934,7 @@ /turf/simulated/floor/plating/airless, /area/station/maintenance/asmaint) "owR" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -76946,7 +76946,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "oxf" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/barrier/grille_maybe, /turf/simulated/floor/plating, @@ -77731,7 +77731,7 @@ }, /area/station/science/misc_lab) "oLk" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/engineering/break_room) "oLm" = ( @@ -78216,7 +78216,7 @@ }, /area/station/medical/sleeper) "oTk" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/power/apc/directional/east, /obj/structure/cable{ d2 = 2; @@ -78343,7 +78343,7 @@ "oVs" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "oVy" = ( @@ -78647,7 +78647,7 @@ /area/station/command/office/cmo) "oZa" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "oZe" = ( @@ -79666,7 +79666,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "pqA" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "pqE" = ( @@ -79702,7 +79702,7 @@ }, /obj/effect/decal/cleanable/dust, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) @@ -79765,7 +79765,7 @@ /area/station/maintenance/asmaint) "psT" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "psU" = ( @@ -79846,7 +79846,7 @@ "puo" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "puy" = ( @@ -80174,7 +80174,7 @@ /area/station/command/office/ntrep) "pzX" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -80502,7 +80502,7 @@ /obj/structure/closet/cabinet, /obj/item/lighter/zippo/engraved, /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fsmaint) "pHs" = ( @@ -80600,7 +80600,7 @@ }, /area/station/public/dorms) "pIx" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "pIP" = ( @@ -80804,7 +80804,7 @@ }, /area/station/engineering/atmos) "pMD" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/maintenance/electrical) "pMM" = ( @@ -80990,7 +80990,7 @@ /obj/machinery/door/window/classic/normal{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint2) "pQg" = ( @@ -81566,7 +81566,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -81719,7 +81719,7 @@ pixel_y = 4 }, /obj/machinery/light/small/directional/east, -/obj/effect/spawner/random_spawners/id_skins, +/obj/effect/spawner/random/id_skins, /turf/simulated/floor/carpet, /area/station/command/office/captain/bedroom) "qef" = ( @@ -81748,7 +81748,7 @@ }, /area/station/maintenance/fsmaint) "qek" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/closet/body_bag, /obj/effect/spawner/random/maintenance, /obj/structure/reagent_dispensers/peppertank/north, @@ -81833,11 +81833,11 @@ /obj/item/clothing/under/color/grey, /obj/item/clothing/under/color/grey, /obj/machinery/light_construct/small/north, -/obj/effect/spawner/random_spawners/id_skins, +/obj/effect/spawner/random/id_skins, /turf/simulated/floor/wood/fancy/birch, /area/station/maintenance/fsmaint) "qgz" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -82089,7 +82089,7 @@ dir = 6; level = 1 }, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "qlt" = ( @@ -82674,7 +82674,7 @@ }, /area/station/hallway/secondary/exit) "qtQ" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/structure/chair, /obj/item/garrote/improvised, /turf/simulated/floor/plating, @@ -82813,14 +82813,14 @@ }, /area/station/maintenance/fsmaint) "qwJ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/cultivator, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "qwM" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) @@ -83127,7 +83127,7 @@ }, /area/station/engineering/atmos/control) "qCH" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, @@ -83206,7 +83206,7 @@ "qDq" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /obj/structure/sign/poster/contraband/tools{ pixel_y = 32 }, @@ -83409,7 +83409,7 @@ /area/station/engineering/hallway) "qGl" = ( /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/plating, /area/station/maintenance/aft) "qGm" = ( @@ -83576,7 +83576,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 9 }, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "qJg" = ( @@ -84505,7 +84505,7 @@ /area/station/engineering/atmos/control) "qYC" = ( /obj/item/pen/fancy, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint) "qYJ" = ( @@ -84696,7 +84696,7 @@ /area/station/maintenance/apmaint) "rbZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "rcf" = ( @@ -84904,7 +84904,7 @@ /area/station/aisat/atmos) "rfh" = ( /obj/item/clothing/under/misc/assistantformal, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint) "rfp" = ( @@ -85104,7 +85104,7 @@ /turf/simulated/floor/carpet, /area/station/public/vacant_office) "rkb" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -85264,7 +85264,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "rnd" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plating, /area/station/maintenance/aft) "rng" = ( @@ -85458,7 +85458,7 @@ "rtu" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "rtA" = ( @@ -85758,7 +85758,7 @@ }, /area/station/engineering/break_room) "rAe" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/security/permabrig) "rAi" = ( @@ -86322,7 +86322,7 @@ /area/station/science/explab/chamber) "rMb" = ( /obj/machinery/mecha_part_fabricator, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "rMi" = ( @@ -86445,7 +86445,7 @@ /area/station/engineering/atmos) "rPa" = ( /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fsmaint) "rPd" = ( @@ -86474,7 +86474,7 @@ /obj/effect/turf_decal/siding/wood/oak{ dir = 5 }, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "rPK" = ( @@ -86702,7 +86702,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "rSS" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/science/misc_lab) "rTm" = ( @@ -87546,7 +87546,7 @@ /area/station/security/permabrig) "sji" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -87768,8 +87768,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "smx" = ( -/obj/effect/spawner/random_spawners/blood_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/blood/maybe, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "smz" = ( @@ -87794,7 +87794,7 @@ /area/station/maintenance/asmaint) "smS" = ( /obj/structure/closet/crate, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/spawner/random/maintenance, /obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, @@ -87863,7 +87863,7 @@ req_one_access = list(33,41) }, /mob/living/simple_animal/hostile/scarybat, -/obj/effect/spawner/random_spawners/id_skins, +/obj/effect/spawner/random/id_skins, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -88688,7 +88688,7 @@ /obj/structure/table/wood, /obj/effect/spawner/random/maintenance, /obj/item/stack/sheet/cloth, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fsmaint) "sBO" = ( @@ -88975,7 +88975,7 @@ /area/station/hallway/secondary/entry) "sEL" = ( /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "sEO" = ( @@ -89072,7 +89072,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "sFX" = ( @@ -89202,11 +89202,11 @@ /area/station/public/construction) "sJC" = ( /obj/machinery/economy/slot_machine, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/apmaint) "sJQ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "sJX" = ( @@ -89513,7 +89513,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ d1 = 2; @@ -89589,7 +89589,7 @@ /area/station/hallway/secondary/entry) "sQt" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/clothing/head/soft/blue, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) @@ -89615,7 +89615,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "sRj" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -89665,7 +89665,7 @@ /obj/structure/chair/wood{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/landmark/start/uncertain, /turf/simulated/floor/wood/oak, /area/station/maintenance/aft) @@ -90187,7 +90187,7 @@ /area/station/engineering/control) "tbW" = ( /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/oak, /area/station/maintenance/abandonedbar) "tcw" = ( @@ -90223,7 +90223,7 @@ }, /area/station/security/brig) "tcM" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -91026,7 +91026,7 @@ /area/station/maintenance/fsmaint) "tqH" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -91203,7 +91203,7 @@ /area/station/science/xenobiology) "tue" = ( /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint) "tuy" = ( @@ -91421,7 +91421,7 @@ }, /area/station/engineering/hallway) "tzm" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/incinerator) "tzo" = ( @@ -91802,7 +91802,7 @@ /area/station/engineering/hallway) "tGZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "tHr" = ( @@ -91999,7 +91999,7 @@ /area/station/security/processing) "tLp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -92043,7 +92043,7 @@ /area/station/engineering/supermatter_room) "tMs" = ( /obj/effect/turf_decal/stripes/line, -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/random/mech, /turf/simulated/floor/plating, /area/station/maintenance/disposal) @@ -92140,7 +92140,7 @@ }, /area/station/medical/surgery/observation) "tOs" = ( -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/table, /turf/simulated/floor/plating, /area/station/engineering/utility) @@ -92220,7 +92220,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "tPT" = ( @@ -92352,7 +92352,7 @@ /area/station/engineering/controlroom) "tRE" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "vault" @@ -92506,7 +92506,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft) "tTx" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fore) "tTz" = ( @@ -92520,7 +92520,7 @@ "tTF" = ( /obj/machinery/space_heater, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) "tTV" = ( @@ -92539,7 +92539,7 @@ /obj/item/clothing/accessory/stethoscope, /obj/item/crowbar, /obj/effect/landmark/spawner/nukedisc_respawn, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/wood/oak, /area/station/maintenance/apmaint) @@ -92970,7 +92970,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -93195,7 +93195,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/port) "ueC" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 8 }, @@ -93208,7 +93208,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/disposal) "ueH" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/spacecash/c10, /turf/simulated/floor/engine, /area/station/maintenance/fsmaint) @@ -93580,7 +93580,7 @@ /obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = -5 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint) "ulv" = ( @@ -93634,7 +93634,7 @@ /obj/structure/closet, /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "umw" = ( @@ -95013,7 +95013,7 @@ }, /area/station/service/hydroponics) "uLO" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/solar_maintenance/aft_port) "uMa" = ( @@ -95023,7 +95023,7 @@ }, /area/station/science/hallway) "uMl" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/apmaint) "uMp" = ( @@ -95114,7 +95114,7 @@ pixel_y = -2 }, /obj/item/assembly/signaler, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/fore) "uOG" = ( @@ -95510,7 +95510,7 @@ "uVG" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -95566,7 +95566,7 @@ }, /area/station/turret_protected/ai_upload) "uWw" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 4; @@ -97088,7 +97088,7 @@ /area/station/science/explab) "vyw" = ( /obj/structure/chair/stool, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/apmaint) "vyz" = ( @@ -97238,7 +97238,7 @@ }, /area/station/engineering/supermatter_room) "vAZ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -97534,7 +97534,7 @@ /area/station/security/armory/secure) "vEW" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/remains/xeno, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -98044,7 +98044,7 @@ }, /area/station/science/lobby) "vOy" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -98973,7 +98973,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/electrical) "weK" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/maintenance/abandonedbar) "weS" = ( @@ -99017,11 +99017,11 @@ "wgt" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "wgA" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plasteel, @@ -99143,7 +99143,7 @@ filled = 1 }, /obj/effect/turf_decal/delivery/white/hollow, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "wjV" = ( @@ -99183,7 +99183,7 @@ /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "wkQ" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -99313,7 +99313,7 @@ "wnG" = ( /obj/structure/chair/sofa/bench/left, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "wnQ" = ( @@ -99520,7 +99520,7 @@ /area/station/command/office/rd) "wqv" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /obj/structure/coatrack, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -99836,7 +99836,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/landmark/spawner/nukedisc_respawn, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -100120,7 +100120,7 @@ /area/station/maintenance/apmaint) "wBf" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ @@ -100511,7 +100511,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) @@ -100814,7 +100814,7 @@ }, /obj/structure/bed, /obj/item/bedsheet/black, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/random/hampter, /turf/simulated/floor/carpet/royalblack, /area/station/maintenance/apmaint) @@ -101324,7 +101324,7 @@ "wYL" = ( /obj/item/flashlight/lantern, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -101396,7 +101396,7 @@ }, /area/station/engineering/hallway) "xab" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -101989,7 +101989,7 @@ }, /area/station/hallway/secondary/exit) "xiA" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 4 }, @@ -102185,7 +102185,7 @@ /area/station/engineering/hallway) "xmW" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plasteel, /area/station/maintenance/assembly_line) "xmZ" = ( @@ -102483,7 +102483,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "xsk" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/supply/expedition) "xsl" = ( @@ -102979,7 +102979,7 @@ "xBC" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint2) "xBM" = ( @@ -103521,7 +103521,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /mob/living/simple_animal/mouse/rat, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -103827,7 +103827,7 @@ }, /area/station/security/brig) "xPE" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/security/permabrig) "xPH" = ( @@ -103939,7 +103939,7 @@ }, /area/station/supply/qm) "xRG" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "purple" @@ -104378,7 +104378,7 @@ /turf/simulated/floor/wood, /area/station/public/mrchangs) "xYl" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -104561,7 +104561,7 @@ pixel_y = 32 }, /obj/machinery/light/small/directional/north, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/table, /obj/item/food/meat/tomatomeat, /obj/effect/decal/cleanable/ants, @@ -104690,7 +104690,7 @@ /area/station/security/permabrig) "ydU" = ( /obj/effect/decal/cleanable/blood/old, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/spacecash/c10, /turf/simulated/floor/engine, /area/station/maintenance/fsmaint) @@ -104923,7 +104923,7 @@ "yhY" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/apmaint) "yig" = ( @@ -105000,7 +105000,7 @@ "yiZ" = ( /obj/structure/closet/wardrobe/pjs, /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/fancy/birch, /area/station/maintenance/fsmaint) "yjg" = ( diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm index 5ec46dcfbfc66..7ded00e9877f9 100644 --- a/_maps/map_files220/stations/deltastation.dmm +++ b/_maps/map_files220/stations/deltastation.dmm @@ -135,7 +135,7 @@ /turf/space, /area/station/maintenance/solar_maintenance/port) "acn" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/turf_decal/delivery/hollow, /obj/machinery/economy/vending/wallmed/directional/east, /turf/simulated/floor/plasteel{ @@ -1285,8 +1285,8 @@ }, /area/station/security/lobby) "ajN" = ( -/obj/effect/landmark/damageturf, -/obj/machinery/constructable_frame/machine_frame, +/obj/effect/mapping_helpers/turfs/damage, +/obj/structure/machine_frame, /obj/item/stock_parts/cell, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, @@ -2199,8 +2199,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore2) "aoM" = ( -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, /obj/item/stack/cable_coil, @@ -2753,7 +2753,7 @@ "aqB" = ( /obj/structure/table/wood, /obj/item/storage/briefcase, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/electrical_shop) "aqC" = ( @@ -2998,7 +2998,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/fore2) "ari" = ( @@ -3049,7 +3049,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/electrical_shop) "arr" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/electrical_shop) "ars" = ( @@ -3059,7 +3059,7 @@ /obj/structure/chair/comfy/brown{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/electrical_shop) "aru" = ( @@ -3073,7 +3073,7 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/random/hampter, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/electrical_shop) "arw" = ( @@ -3558,7 +3558,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) @@ -3830,7 +3830,7 @@ /area/station/maintenance/electrical_shop) "ath" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/electrical_shop) "ati" = ( @@ -3872,14 +3872,14 @@ }, /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood, -/obj/effect/spawner/random_spawners/id_skins, +/obj/effect/spawner/random/id_skins, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/station/maintenance/fore) "atr" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fore) "ats" = ( @@ -3894,7 +3894,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fore) "atu" = ( @@ -3903,7 +3903,7 @@ }, /obj/effect/decal/cleanable/cobweb, /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fore) "atv" = ( @@ -4321,7 +4321,7 @@ /turf/simulated/floor/plating, /area/station/engineering/controlroom) "auL" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/electrical_shop) "auM" = ( @@ -4339,7 +4339,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/fore) "auP" = ( @@ -4389,7 +4389,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -4507,7 +4507,7 @@ "avq" = ( /obj/effect/decal/cleanable/dust, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/fore2) @@ -4613,7 +4613,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -4727,7 +4727,7 @@ }, /area/station/security/interrogation) "awx" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/security/checkpoint/secondary) "awA" = ( @@ -4873,7 +4873,7 @@ /area/station/engineering/atmos/control) "awW" = ( /obj/effect/spawner/random/fungus/frequent, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fore) "awX" = ( @@ -4901,7 +4901,7 @@ /area/station/maintenance/fore2) "axb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/shard{ icon_state = "small" }, @@ -5468,7 +5468,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "ayW" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fore) "ayX" = ( @@ -6430,7 +6430,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/controlroom) "aCl" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aCo" = ( @@ -6731,7 +6731,7 @@ /area/station/legal/lawoffice) "aDy" = ( /obj/item/emptysandbag, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -6765,7 +6765,7 @@ }, /area/station/maintenance/fore) "aDH" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/fore) "aDL" = ( @@ -6830,7 +6830,7 @@ /area/station/supply/storage) "aDS" = ( /obj/effect/turf_decal/delivery/hollow, -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/plasteel, /area/station/supply/storage) "aDT" = ( @@ -7015,7 +7015,7 @@ /area/station/maintenance/fore) "aEu" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -7070,7 +7070,7 @@ }, /area/station/hallway/primary/fore) "aEG" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/starboard2) "aEH" = ( @@ -7086,7 +7086,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/spawner/random/storage, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, @@ -7271,7 +7271,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/plasteel, /area/station/supply/storage) "aFa" = ( @@ -9008,7 +9008,7 @@ }, /area/station/maintenance/turbine) "aLp" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/station/engineering/controlroom) "aLr" = ( @@ -9102,7 +9102,7 @@ /area/station/public/arcade) "aLM" = ( /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) "aLS" = ( @@ -10351,7 +10351,7 @@ }, /area/station/service/bar/atrium) "aRB" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/science/server/coldroom) "aRH" = ( @@ -10590,6 +10590,8 @@ dir = 6; initialize_directions = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) "aSC" = ( @@ -10703,7 +10705,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -11246,7 +11248,7 @@ }, /area/station/engineering/atmos) "aVK" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/fore) "aVL" = ( @@ -11336,7 +11338,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/bar/atrium) "aWf" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, /obj/effect/turf_decal/stripes/line{ @@ -11870,7 +11872,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aYD" = ( @@ -12117,7 +12119,7 @@ }, /area/station/supply/miningdock) "aZu" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/maintenance/fsmaint) "aZv" = ( @@ -12651,7 +12653,7 @@ /area/station/engineering/atmos) "bcb" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fore) "bcd" = ( @@ -13048,7 +13050,7 @@ /area/station/service/kitchen) "bdG" = ( /obj/effect/landmark/start/uncertain, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -13335,7 +13337,7 @@ /area/station/maintenance/fsmaint) "ber" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "bes" = ( @@ -13873,7 +13875,7 @@ }, /area/station/turret_protected/ai) "bgO" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -17445,7 +17447,7 @@ dir = 4; name = "Air to Distro"; on = 1; - target_pressure = 101 + target_pressure = 303 }, /turf/simulated/floor/plasteel{ icon_state = "caution" @@ -17539,7 +17541,7 @@ layer = 2.5 }, /obj/item/shard, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "bvS" = ( @@ -21848,7 +21850,7 @@ /area/station/engineering/mechanic) "bKb" = ( /obj/item/stack/sheet/mineral/sandbags, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -22685,9 +22687,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -22696,6 +22695,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -22782,7 +22784,7 @@ "bMQ" = ( /obj/structure/table/wood, /obj/item/folder/yellow, -/obj/effect/spawner/random_spawners/id_skins, +/obj/effect/spawner/random/id_skins, /turf/simulated/floor/carpet, /area/station/command/meeting_room) "bMR" = ( @@ -25635,7 +25637,7 @@ /turf/space, /area/space/nearstation) "bVt" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/portable/canister/air, /obj/machinery/atmospherics/unary/portables_connector, /obj/structure/sign/vacuum{ @@ -26001,7 +26003,7 @@ /area/station/hallway/primary/port) "bWI" = ( /obj/machinery/alarm/directional/east, -/obj/machinery/suit_storage_unit/ce/secure, +/obj/machinery/suit_storage_unit/industrial/ce/secure, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -26321,7 +26323,7 @@ }, /area/station/security/lobby) "bXX" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /obj/effect/spawner/random/fungus/probably, /turf/simulated/wall, /area/station/maintenance/starboard2) @@ -26592,7 +26594,7 @@ }, /area/station/hallway/primary/starboard) "bYR" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/maintenance/fore2) "bYU" = ( @@ -26800,7 +26802,7 @@ /area/station/security/prison/cell_block/A) "bZG" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "neutral" @@ -28957,7 +28959,7 @@ /turf/simulated/floor/plating, /area/station/turret_protected/aisat) "chv" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/command/teleporter) "chw" = ( @@ -29243,8 +29245,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "ciq" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust/maybe, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/port) "cir" = ( @@ -29490,7 +29492,7 @@ "cjq" = ( /obj/structure/rack, /obj/item/book/manual/wiki/security_space_law, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/dormitory_maintenance) "cjt" = ( @@ -29791,8 +29793,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/landmark/damageturf, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/engineering/mechanic) @@ -30014,7 +30016,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/stack/cable_coil/random, /obj/item/assembly/igniter, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/machinery/light_switch/east, /turf/simulated/floor/plasteel{ dir = 5; @@ -30098,7 +30100,7 @@ /turf/simulated/wall/r_wall, /area/station/engineering/smes) "clw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/station/engineering/equipmentstorage) "clx" = ( @@ -31575,11 +31577,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "csd" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/maintenance, /obj/structure/table, @@ -31907,7 +31909,7 @@ }, /area/station/medical/patients_rooms) "cts" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -31997,7 +31999,7 @@ /area/station/service/library) "ctS" = ( /obj/structure/grille/broken, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/port) "ctU" = ( @@ -32317,7 +32319,7 @@ }, /area/station/supply/expedition) "cuY" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/machinery/ai_status_display/north, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -32808,7 +32810,7 @@ /area/station/supply/sorting) "cxt" = ( /obj/structure/table/wood/poker, -/obj/effect/spawner/random_spawners/id_skins, +/obj/effect/spawner/random/id_skins, /turf/simulated/floor/plasteel/grimy, /area/station/maintenance/abandonedbar) "cxw" = ( @@ -32827,7 +32829,7 @@ }, /area/station/public/locker) "cxA" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, @@ -33588,7 +33590,7 @@ /area/station/supply/expedition) "czX" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "czY" = ( @@ -33852,7 +33854,7 @@ pixel_y = 4 }, /obj/machinery/light/directional/south, -/obj/effect/spawner/random_spawners/id_skins/no_chance, +/obj/effect/spawner/random/id_skins/no_chance, /turf/simulated/floor/wood/parquet/tile, /area/station/service/library) "cAZ" = ( @@ -34043,6 +34045,14 @@ icon_state = "greencorner" }, /area/station/medical/virology/lab) +"cBK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "cBP" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall9b1"; @@ -34692,7 +34702,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/public/fitness) "cEA" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/station/engineering/control) "cEB" = ( @@ -35238,7 +35248,7 @@ /turf/simulated/floor/wood/oak, /area/station/service/cafeteria) "cHp" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -35389,7 +35399,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, /obj/item/stack/rods, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -35460,7 +35470,7 @@ }, /area/station/maintenance/port) "cIw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/electrical) "cIx" = ( @@ -35534,7 +35544,7 @@ /turf/simulated/floor/engine/xenobio, /area/station/science/xenobiology) "cIP" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) @@ -35774,7 +35784,7 @@ }, /area/station/maintenance/port) "cJP" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/service/cafeteria) "cJR" = ( @@ -36065,7 +36075,7 @@ }, /area/station/science/research) "cKB" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light_construct/small/east, /obj/item/shard{ pixel_y = -6; @@ -36311,7 +36321,7 @@ }, /area/station/maintenance/electrical) "cLz" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/maintenance/abandonedbar) "cLA" = ( @@ -37048,7 +37058,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/window/reinforced{ dir = 8 }, @@ -37340,7 +37350,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -37369,7 +37379,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fore) "cQu" = ( @@ -37613,7 +37623,7 @@ }, /area/station/medical/chemistry) "cRv" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse/rat, /turf/simulated/floor/plasteel{ @@ -38242,7 +38252,7 @@ }, /area/station/science/research) "cTy" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -39489,7 +39499,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "cYg" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cYh" = ( @@ -39639,7 +39649,7 @@ /turf/simulated/wall, /area/station/medical/psych) "cYT" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/spawner/random/trash, /obj/effect/spawner/random/trash, /turf/simulated/floor/plating, @@ -39946,7 +39956,7 @@ }, /area/station/science/research) "daD" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/science/xenobiology) "daF" = ( @@ -40179,7 +40189,7 @@ /turf/simulated/floor/grass/no_creep, /area/station/science/break_room) "dbM" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/port2) "dbU" = ( @@ -40408,7 +40418,7 @@ /area/station/maintenance/apmaint) "dcR" = ( /obj/structure/chair/wood, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "dcS" = ( @@ -40675,7 +40685,7 @@ }, /area/station/science/rnd) "ddF" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/machinery/camera{ c_tag = "Research and Development"; network = list("Research","SS13"); @@ -41017,12 +41027,12 @@ /obj/structure/chair/wood{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "dfQ" = ( -/obj/effect/spawner/random_spawners/blood_maybe, -/obj/effect/landmark/damageturf, +/obj/effect/spawner/random/blood/maybe, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -41110,7 +41120,7 @@ }, /area/station/security/permabrig) "dgs" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/stack/rods, /turf/simulated/floor/plasteel{ dir = 8; @@ -41694,7 +41704,7 @@ /obj/structure/chair/wood{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "diZ" = ( @@ -42282,7 +42292,7 @@ /obj/machinery/light/small/directional/east, /obj/effect/mapping_helpers/machinery/damaged, /obj/item/stack/cable_coil, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/white, /area/station/maintenance/apmaint) "dlK" = ( @@ -43448,7 +43458,7 @@ /area/station/maintenance/abandonedbar) "drc" = ( /obj/structure/table/wood/poker, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "drd" = ( @@ -43469,7 +43479,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/robotics) "drh" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil/random, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -43580,7 +43590,7 @@ /turf/simulated/floor/plating, /area/station/science/xenobiology) "drB" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/science/toxins/launch) "drC" = ( @@ -44697,7 +44707,7 @@ "dvH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -45630,7 +45640,7 @@ }, /area/station/maintenance/aft) "dBZ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/aft) "dCb" = ( @@ -47933,7 +47943,7 @@ "dOR" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; @@ -48036,7 +48046,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -48048,7 +48058,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/spawner/wire_splicing/thirty, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -48339,7 +48349,7 @@ /obj/structure/mopbucket, /obj/item/mop, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dQp" = ( @@ -48445,7 +48455,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dQS" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/station/maintenance/apmaint) "dQT" = ( @@ -50315,7 +50325,7 @@ "dYz" = ( /obj/structure/chair/stool/bar, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "dYA" = ( @@ -50341,7 +50351,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash, /obj/effect/spawner/random/trash, -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/plating, /area/station/maintenance/port) "dYD" = ( @@ -50625,7 +50635,7 @@ /turf/simulated/floor/plasteel, /area/station/security/brig) "dZR" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/maintenance/disposal/east) "dZS" = ( @@ -50991,7 +51001,7 @@ "eem" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/reagent_containers/pill/salbutamol{ pixel_x = -6; pixel_y = 8 @@ -51742,7 +51752,7 @@ }, /area/station/science/robotics) "eoI" = ( -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /obj/effect/turf_decal/siding/wood/cherry{ dir = 5 }, @@ -51855,7 +51865,7 @@ /area/station/maintenance/port) "erb" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/engineeringcart, /obj/structure/sign/poster/contraband/random/north, /turf/simulated/floor/plating, @@ -52193,7 +52203,7 @@ /area/station/public/sleep) "evu" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -52406,7 +52416,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "eyg" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel, /area/station/maintenance/dormitory_maintenance) "eyn" = ( @@ -52793,7 +52803,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "eEl" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /obj/effect/spawner/random/fungus/probably, /turf/simulated/wall, /area/station/maintenance/starboard) @@ -53582,6 +53592,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -53611,7 +53624,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "eQc" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -53878,7 +53891,7 @@ pixel_x = 32 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "eTh" = ( @@ -53946,7 +53959,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fore) "eUk" = ( @@ -54157,7 +54170,7 @@ "eYd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/spawner/random/trash, /obj/effect/spawner/random/trash, /obj/effect/spawner/random/trash, @@ -54643,7 +54656,7 @@ }, /area/station/security/storage) "fho" = ( -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/effect/turf_decal/siding/wood/cherry{ dir = 9 }, @@ -54705,7 +54718,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -54730,7 +54743,7 @@ /area/station/public/fitness) "fhQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -54930,7 +54943,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/medmaint) "fkK" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/stripes/line{ @@ -55915,7 +55928,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, /obj/effect/turf_decal/stripes/line{ @@ -56256,7 +56269,7 @@ /area/station/medical/chemistry) "fGc" = ( /obj/item/clothing/mask/gas, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/sign/poster/contraband/random/east, /obj/structure/sign/poster/contraband/random/north, /obj/effect/decal/cleanable/dirt, @@ -56327,7 +56340,7 @@ }, /area/station/security/permabrig) "fHD" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/library) "fHK" = ( @@ -56720,7 +56733,7 @@ "fPh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/shard, /obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/glass, @@ -57235,7 +57248,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "fVi" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/science/explab/chamber) "fVI" = ( @@ -57270,7 +57283,7 @@ }, /area/station/medical/medbay2) "fVZ" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stock_parts/manipulator, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -57462,7 +57475,7 @@ /area/station/hallway/primary/central/se) "fYN" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/spawner/random/barrier/grille_often, /turf/simulated/floor/plasteel{ dir = 8; @@ -58569,7 +58582,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/electrical_shop) "gru" = ( @@ -58654,6 +58667,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -58899,7 +58915,7 @@ }, /area/station/command/office/cmo) "gwu" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/science/test_chamber) "gwB" = ( @@ -59124,7 +59140,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "gAT" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/food/meat/human, /obj/item/food/meat/human, /obj/effect/decal/cleanable/dirt, @@ -59305,7 +59321,7 @@ pixel_y = 6 }, /obj/item/storage/bag/dice, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/library) "gDY" = ( @@ -59740,7 +59756,7 @@ dir = 4; name = "Medbay Reception" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -60199,7 +60215,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "gRr" = ( @@ -60454,7 +60470,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/landmark/start/uncertain, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) @@ -60544,7 +60560,7 @@ /turf/simulated/floor/wood/parquet, /area/station/service/library) "gWi" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -60790,7 +60806,7 @@ /area/station/medical/medbay) "haA" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -61494,7 +61510,7 @@ }, /area/station/security/warden) "hle" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/spawner/random/trash, /turf/simulated/floor/plating, @@ -62080,7 +62096,7 @@ /area/station/maintenance/fore) "hwI" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -62479,7 +62495,7 @@ }, /area/station/maintenance/disposal/west) "hBK" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, /obj/effect/turf_decal/stripes/line, @@ -62578,7 +62594,7 @@ /obj/structure/chair/office/dark{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/library) "hDF" = ( @@ -62636,6 +62652,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "hEh" = ( @@ -63035,7 +63054,7 @@ /obj/structure/disposalpipe/broken{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/virology_maint) "hJh" = ( @@ -63410,7 +63429,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating, /area/station/maintenance/fore2) @@ -63609,7 +63628,7 @@ }, /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/glass, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" @@ -64112,8 +64131,8 @@ }, /area/station/engineering/controlroom) "iav" = ( -/obj/effect/landmark/damageturf, -/obj/machinery/constructable_frame/machine_frame, +/obj/effect/mapping_helpers/turfs/damage, +/obj/structure/machine_frame, /obj/item/shard, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, @@ -64475,7 +64494,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/sign/poster/contraband/random/west, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -64575,7 +64594,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "igI" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -64861,7 +64880,7 @@ /turf/simulated/floor/wood/cherry, /area/station/service/chapel/office) "ila" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; @@ -65352,7 +65371,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/disposalpipe/segment/corner{ dir = 1 }, @@ -65871,7 +65890,7 @@ /obj/effect/spawner/random/trash, /obj/effect/spawner/random/trash, /obj/effect/spawner/random/trash, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/port) "iyC" = ( @@ -66242,7 +66261,7 @@ }, /area/station/maintenance/fsmaint) "iFl" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) "iFx" = ( @@ -66306,7 +66325,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plasteel{ @@ -66721,7 +66740,7 @@ /turf/simulated/floor/grass, /area/station/science/lobby) "iNi" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -66936,7 +66955,7 @@ }, /area/station/maintenance/medmaint) "iQO" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/library) "iRa" = ( @@ -67259,7 +67278,7 @@ /area/station/supply/expedition) "iVg" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/engineering/mechanic) @@ -67462,7 +67481,7 @@ /area/station/security/detective) "iXL" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -68239,7 +68258,7 @@ /area/station/engineering/hardsuitstorage) "jit" = ( /obj/machinery/atmospherics/portable/canister, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -68265,7 +68284,7 @@ "jiN" = ( /obj/effect/decal/cleanable/ants, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "jiT" = ( @@ -68714,7 +68733,7 @@ }, /area/station/security/brig) "jnp" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, @@ -68903,12 +68922,12 @@ }, /area/station/science/genetics) "jpy" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "jpB" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; @@ -68984,7 +69003,7 @@ }, /area/station/engineering/mechanic) "jqI" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "jqX" = ( @@ -69021,7 +69040,7 @@ }, /area/station/security/interrogation) "jrg" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; @@ -69546,7 +69565,7 @@ /turf/simulated/floor/carpet/red, /area/station/maintenance/fsmaint) "jzw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/engineering/control) "jzE" = ( @@ -70693,7 +70712,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "jRL" = ( @@ -70715,7 +70734,7 @@ "jRY" = ( /obj/machinery/chem_master, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "jSb" = ( @@ -71733,10 +71752,10 @@ }, /area/station/supply/storage) "keZ" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stack/rods, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plating, @@ -71874,7 +71893,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -71894,7 +71913,7 @@ /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) "kgY" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/abandoned_garden) "kht" = ( @@ -72065,7 +72084,7 @@ }, /area/station/public/fitness) "kjP" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/science/misc_lab) "kjR" = ( @@ -72097,7 +72116,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "kkB" = ( @@ -72344,7 +72363,7 @@ }, /area/station/turret_protected/ai) "kpp" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/old_detective) "kpB" = ( @@ -72406,7 +72425,7 @@ /turf/simulated/floor/plasteel/freezer, /area/station/public/pool) "kqa" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /obj/effect/spawner/random/fungus/probably, /turf/simulated/wall, /area/station/maintenance/old_kitchen) @@ -72429,7 +72448,7 @@ }, /area/station/hallway/primary/central/east) "kqQ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -72987,7 +73006,7 @@ /area/station/engineering/controlroom) "kzN" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fore) "kzR" = ( @@ -74181,7 +74200,7 @@ /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "kTo" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port) "kTs" = ( @@ -74656,7 +74675,7 @@ /obj/structure/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/library) "lcA" = ( @@ -74990,7 +75009,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/disposalpipe/segment/corner{ dir = 2 }, @@ -75143,7 +75162,7 @@ }, /area/station/hallway/primary/central/nw) "lja" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "ljm" = ( @@ -75863,9 +75882,9 @@ /area/station/maintenance/fore) "ltQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stock_parts/cell, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "ltX" = ( @@ -77265,7 +77284,7 @@ }, /area/station/hallway/secondary/entry) "lMM" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/science/server) "lNj" = ( @@ -77746,7 +77765,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/spawner/wire_splicing/thirty, /turf/simulated/floor/plating, /area/station/maintenance/virology_maint) @@ -78010,7 +78029,7 @@ "lZc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port) "lZm" = ( @@ -78583,7 +78602,7 @@ "miH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "miL" = ( @@ -78734,7 +78753,7 @@ "mli" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -78871,7 +78890,7 @@ /area/station/security/warden) "mng" = ( /obj/structure/closet/crate, -/obj/effect/spawner/random_spawners/id_skins, +/obj/effect/spawner/random/id_skins, /obj/structure/window/reinforced{ dir = 1 }, @@ -79314,7 +79333,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) "mtz" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/west, /mob/living/simple_animal/mouse/rat, @@ -79399,7 +79418,7 @@ }, /area/station/science/lobby) "muJ" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, /obj/effect/turf_decal/stripes/line{ @@ -79738,7 +79757,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "mAw" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; @@ -79906,7 +79925,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/window/reinforced{ dir = 8 }, @@ -80277,7 +80296,7 @@ }, /area/station/hallway/primary/starboard) "mMm" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ @@ -80383,7 +80402,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "mOC" = ( @@ -80400,7 +80419,7 @@ }, /area/station/maintenance/port) "mOI" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/port) "mOS" = ( @@ -81405,7 +81424,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/electrical) "nct" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/structure/sign/poster/official/random/east, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/east, @@ -81832,7 +81851,7 @@ }, /area/station/maintenance/medmaint) "nij" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil/random, /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, @@ -82533,7 +82552,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "nsL" = ( @@ -82883,7 +82902,7 @@ }, /area/station/medical/storage) "nxO" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/port) "nyl" = ( @@ -83668,7 +83687,7 @@ /obj/machinery/recharger{ pixel_y = 2 }, -/obj/effect/spawner/random_spawners/id_skins, +/obj/effect/spawner/random/id_skins, /turf/simulated/floor/carpet/black, /area/station/command/office/captain/bedroom) "nHh" = ( @@ -84160,7 +84179,7 @@ /area/station/hallway/primary/fore) "nMH" = ( /obj/effect/spawner/random/trash, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -84377,7 +84396,7 @@ "nOO" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/library) "nOP" = ( @@ -85375,7 +85394,7 @@ /area/station/maintenance/fsmaint) "ocg" = ( /obj/effect/spawner/random/trash, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/spawner/random/trash, /obj/effect/spawner/random/trash, /obj/effect/spawner/random/trash, @@ -86187,7 +86206,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/disposalpipe/segment/corner{ dir = 1 }, @@ -87095,7 +87114,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "oDU" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -87397,7 +87416,7 @@ /turf/simulated/floor/plasteel, /area/station/security/permabrig) "oIJ" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/science/storage) "oIQ" = ( @@ -87746,7 +87765,7 @@ /turf/simulated/floor/plating, /area/station/security/permabrig) "oNY" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -87860,7 +87879,7 @@ /area/station/security/range) "oPR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -88582,7 +88601,7 @@ /obj/item/reagent_scanner/adv, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "pam" = ( @@ -89165,7 +89184,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fore) "piV" = ( @@ -89762,7 +89781,7 @@ }, /area/station/supply/storage) "prI" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/hallway/secondary/exit/maintenance) "prN" = ( @@ -89796,7 +89815,7 @@ }, /area/station/medical/sleeper) "prY" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/supply/warehouse) "psd" = ( @@ -89993,7 +90012,7 @@ }, /area/station/aisat) "ptU" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -90231,7 +90250,7 @@ "pys" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -90352,7 +90371,7 @@ }, /area/station/engineering/break_room) "pAx" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -90694,7 +90713,7 @@ /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) "pFO" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/item/shard{ icon_state = "small" }, @@ -90741,7 +90760,7 @@ /area/station/science/xenobiology) "pGn" = ( /obj/structure/falsewall, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "pGr" = ( @@ -90970,7 +90989,7 @@ /area/station/engineering/controlroom) "pJj" = ( /obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore) "pJv" = ( @@ -91222,7 +91241,7 @@ "pMr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/table_frame, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plasteel{ @@ -91394,7 +91413,7 @@ }, /obj/machinery/atmospherics/pipe/cap/hidden/supply, /obj/structure/disposalpipe/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/virology_maint) "pPl" = ( @@ -91578,7 +91597,7 @@ /area/station/public/sleep_male) "pRP" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -92225,7 +92244,7 @@ /turf/simulated/floor/plasteel, /area/station/security/processing) "qcK" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/engineering/mechanic) "qcV" = ( @@ -92689,7 +92708,7 @@ /obj/item/clothing/gloves/color/white, /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, @@ -93646,7 +93665,7 @@ /area/station/hallway/primary/central/se) "qxU" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -93688,7 +93707,7 @@ /turf/simulated/floor/wood/fancy/oak, /area/station/legal/magistrate) "qzw" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/station/security/checkpoint/south) "qzy" = ( @@ -93712,11 +93731,7 @@ /area/station/service/hydroponics) "qzV" = ( /obj/structure/platform{ - dir = 1; - anchored = 1 - }, -/obj/structure/platform{ - dir = 4; + dir = 5; anchored = 1 }, /obj/structure/railing{ @@ -94205,7 +94220,7 @@ }, /area/station/medical/virology/lab) "qGy" = ( -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /obj/effect/turf_decal/stripes/line, /obj/structure/sign/poster/official/report_crimes{ pixel_y = 32 @@ -94288,7 +94303,7 @@ "qHN" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse/white, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "qHO" = ( @@ -94834,7 +94849,7 @@ /turf/simulated/floor/plating, /area/station/security/podpilot) "qPD" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/old_kitchen) "qPJ" = ( @@ -95179,7 +95194,7 @@ /area/station/command/office/rd) "qTe" = ( /obj/machinery/economy/vending/cigarette, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light/small/directional/north, /turf/simulated/floor/wood/oak, /area/station/maintenance/starboard2) @@ -95865,7 +95880,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/shard{ pixel_y = -6; pixel_x = 11 @@ -95883,7 +95898,7 @@ }, /area/station/engineering/mechanic) "rdn" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "rdq" = ( @@ -96338,7 +96353,7 @@ }, /area/station/security/permabrig) "riO" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/port) "riP" = ( @@ -96706,7 +96721,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "rqX" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -96725,7 +96740,7 @@ }, /area/station/security/permabrig) "rrk" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plating, @@ -97146,7 +97161,7 @@ /turf/simulated/floor/engine, /area/station/engineering/controlroom) "rwn" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -97670,7 +97685,7 @@ }, /area/station/hallway/secondary/exit) "rEQ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "black" @@ -98032,7 +98047,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/disposalpipe/segment/corner{ dir = 2 }, @@ -98570,7 +98585,7 @@ "rUi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel{ dir = 9; @@ -98875,7 +98890,7 @@ /area/station/medical/medbay) "rYP" = ( /obj/structure/bookcase, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/library) "rYV" = ( @@ -99102,7 +99117,7 @@ /area/station/maintenance/apmaint) "sbe" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/item/reagent_containers/glass/bucket, /obj/effect/spawner/random/storage, /obj/effect/spawner/random/maintenance, @@ -99518,7 +99533,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/rack, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ @@ -99949,7 +99964,7 @@ /obj/item/reagent_containers/pill/random_drugs, /obj/item/reagent_containers/pill/random_drugs, /obj/item/reagent_containers/pill/random_drugs, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -100150,7 +100165,7 @@ /area/station/science/toxins/launch) "sqZ" = ( /obj/effect/landmark/spawner/xeno, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/library) "src" = ( @@ -100264,7 +100279,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "ssL" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/apmaint) "ssM" = ( @@ -101359,7 +101374,7 @@ }, /area/station/service/chapel) "sFT" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/light_construct/directional/west, /obj/structure/sign/poster/random/west, /turf/simulated/floor/wood/oak, @@ -101475,7 +101490,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "sHY" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -101557,7 +101572,7 @@ /obj/item/cigbutt, /obj/item/cigbutt, /obj/item/cigbutt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -102266,7 +102281,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/port) "sVv" = ( @@ -102808,7 +102823,7 @@ }, /area/station/medical/patients_rooms) "teg" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /obj/effect/spawner/random/fungus/probably, /turf/simulated/wall, /area/station/maintenance/virology_maint) @@ -102949,7 +102964,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/mechanic) "tfZ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 10; @@ -103432,7 +103447,7 @@ "tmY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/security, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -103452,7 +103467,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch/west, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /obj/effect/turf_decal/siding/wood/cherry{ dir = 9 }, @@ -104312,7 +104327,7 @@ /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "tAT" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/sign/poster/official/random/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -104661,7 +104676,7 @@ }, /area/station/supply/storage) "tFi" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /obj/effect/spawner/random/fungus/probably, /turf/simulated/wall/r_wall, /area/station/maintenance/starboard2) @@ -104910,7 +104925,7 @@ "tIK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/structure/closet/crate/can, /turf/simulated/floor/plating, /area/station/maintenance/fore2) @@ -104939,7 +104954,7 @@ }, /area/station/command/office/cmo) "tJc" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/port) "tJd" = ( @@ -105044,7 +105059,7 @@ /obj/structure/chair/sofa/right{ dir = 4 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/wood/oak, /area/station/maintenance/starboard2) "tNd" = ( @@ -105788,7 +105803,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/window/reinforced{ dir = 1 }, @@ -105850,7 +105865,7 @@ }, /area/station/hallway/primary/fore) "tYD" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "tZe" = ( @@ -105888,7 +105903,7 @@ /area/station/maintenance/port) "tZJ" = ( /obj/effect/turf_decal/delivery/hollow, -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -105967,7 +105982,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/port) "uaH" = ( @@ -107030,7 +107045,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port) "uqc" = ( @@ -107186,7 +107201,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -107350,7 +107365,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/old_kitchen) "uwp" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall/r_wall, /area/station/engineering/hardsuitstorage) "uwZ" = ( @@ -107691,7 +107706,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/medmaint) "uDp" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/virology_maint) "uDz" = ( @@ -107917,13 +107932,13 @@ /area/station/legal/lawoffice) "uHX" = ( /obj/item/kirbyplants, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "uIg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/item/kirbyplants, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -108122,7 +108137,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/office) "uKF" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -108139,7 +108154,7 @@ /obj/structure/chair/sofa/left{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/starboard2) "uKU" = ( @@ -109015,7 +109030,7 @@ /area/station/science/toxins/mixing) "uVh" = ( /obj/effect/decal/cleanable/ants, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "uVz" = ( @@ -109469,7 +109484,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/old_kitchen) "vcE" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -109803,7 +109818,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -110071,7 +110086,7 @@ }, /area/station/maintenance/starboard2) "vmL" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/starboard) "vmO" = ( @@ -110606,7 +110621,7 @@ }, /area/station/hallway/secondary/exit) "vxn" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /obj/effect/spawner/random/fungus/probably, /turf/simulated/wall, /area/station/maintenance/medmaint) @@ -111387,7 +111402,7 @@ }, /area/station/maintenance/apmaint) "vJJ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -111411,7 +111426,7 @@ "vKr" = ( /obj/item/chair/wood, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "vKs" = ( @@ -111667,7 +111682,7 @@ /turf/simulated/floor/plasteel/freezer, /area/station/maintenance/aft) "vOI" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/science/toxins/mixing) "vOK" = ( @@ -112114,6 +112129,16 @@ /obj/effect/turf_decal/siding/white/corner, /turf/simulated/floor/plasteel/freezer, /area/station/public/pool) +"vVn" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/engineering/atmos) "vVp" = ( /obj/machinery/hologram/holopad, /obj/effect/turf_decal/delivery/green/hollow, @@ -112244,7 +112269,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -112256,7 +112281,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "vWT" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/stack/cable_coil/random, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -112339,7 +112364,7 @@ }, /area/station/maintenance/fsmaint) "vXM" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/port2) "vYg" = ( @@ -112838,7 +112863,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/virology_maint) "wfX" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; @@ -112989,7 +113014,7 @@ }, /area/station/medical/sleeper) "wig" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/virology_maint) "wij" = ( @@ -113362,7 +113387,7 @@ "woQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/shard{ icon_state = "small"; pixel_x = -8; @@ -113395,7 +113420,7 @@ }, /area/station/public/locker) "wpc" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/science/break_room) "wpe" = ( @@ -113463,7 +113488,7 @@ }, /obj/effect/decal/cleanable/dust, /obj/item/pipe_meter, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/wood/oak, /area/station/maintenance/starboard) @@ -113584,7 +113609,7 @@ /area/station/medical/virology/test_room) "wua" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/mounted/frame/display/newscaster_frame, /obj/structure/table/wood, /turf/simulated/floor/wood/fancy/birch, @@ -113687,7 +113712,7 @@ }, /area/station/security/permabrig) "wvn" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/dormitory_maintenance) @@ -113763,7 +113788,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/office) "wwk" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/maintenance/starboard2) "www" = ( @@ -114361,7 +114386,7 @@ }, /area/station/engineering/atmos/control) "wGh" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -114748,7 +114773,7 @@ /turf/simulated/floor/carpet/orange, /area/station/service/bar/atrium) "wMt" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; @@ -114861,7 +114886,7 @@ /turf/simulated/floor/plasteel, /area/station/security/permabrig) "wOg" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -114916,7 +114941,7 @@ }, /area/station/command/office/rd) "wOT" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/spawner/random/storage, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ @@ -115543,7 +115568,7 @@ "wWd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -115600,7 +115625,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/structure/disposalpipe/segment/corner{ dir = 1 }, @@ -115776,7 +115801,7 @@ /turf/simulated/floor/wood/parquet, /area/station/service/library) "wYL" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, /obj/effect/turf_decal/stripes/line, @@ -115861,7 +115886,7 @@ /turf/simulated/floor/plasteel, /area/station/security/brig) "wZz" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /obj/effect/spawner/airlock/long, /turf/simulated/wall/r_wall, /area/station/maintenance/starboard2) @@ -116098,7 +116123,7 @@ /turf/simulated/floor/plasteel, /area/station/security/processing) "xdd" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/library) "xdE" = ( @@ -116158,7 +116183,7 @@ "xec" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/item/shard, /obj/structure/window/reinforced{ dir = 1; @@ -116810,7 +116835,7 @@ /area/station/maintenance/port) "xpq" = ( /obj/structure/toilet, -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plasteel{ @@ -116972,6 +116997,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) "xqR" = ( @@ -117126,7 +117153,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -117732,7 +117759,7 @@ /obj/effect/decal/cleanable/dust, /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood/oak, /area/station/maintenance/starboard) "xCn" = ( @@ -118002,7 +118029,7 @@ }, /area/station/maintenance/fsmaint) "xGA" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/medmaint) "xGG" = ( @@ -118064,7 +118091,7 @@ /area/station/service/chapel/office) "xHN" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -118553,7 +118580,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, /obj/effect/turf_decal/stripes/line{ @@ -118646,7 +118673,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/robotics) "xPn" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, +/obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/abandonedbar) "xPq" = ( @@ -119231,7 +119258,7 @@ }, /area/station/service/bar) "xXc" = ( -/obj/effect/spawner/random_spawners/blood_maybe, +/obj/effect/spawner/random/blood/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -140759,9 +140786,9 @@ pNz mPY jmi xqG -aQT +cBK aSA -aTW +vVn aVD aXh rYV diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm index 666b67061511e..dfc6228477652 100644 --- a/_maps/map_files220/stations/metastation.dmm +++ b/_maps/map_files220/stations/metastation.dmm @@ -263,8 +263,7 @@ }, /obj/machinery/alarm/directional/west, /obj/machinery/computer/prisoner{ - dir = 4; - req_access = list(2) + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -351,7 +350,7 @@ /area/space/nearstation) "aeg" = ( /obj/effect/spawner/random/trash, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -651,7 +650,7 @@ }, /area/station/security/detective) "ahd" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/fore) "ahh" = ( @@ -701,7 +700,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "ahJ" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/fore) "ahZ" = ( @@ -971,7 +970,7 @@ /area/space/nearstation) "ajy" = ( /obj/item/vending_refill/coffee, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "ajB" = ( @@ -1050,7 +1049,7 @@ /area/station/maintenance/fore) "ajS" = ( /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "akg" = ( @@ -1173,7 +1172,7 @@ c_tag = "Engineering - Storage" }, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "akR" = ( @@ -1588,7 +1587,7 @@ /turf/simulated/floor/plasteel, /area/station/public/fitness) "anf" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/airlock_controller/air_cycler{ pixel_y = -24; vent_link_id = "arrivalsmaint_vent"; @@ -1953,7 +1952,7 @@ }, /area/station/public/fitness) "aoE" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -2453,7 +2452,7 @@ /obj/item/extinguisher, /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "aro" = ( @@ -2749,7 +2748,7 @@ /area/station/public/storage/tools) "asN" = ( /obj/machinery/atmospherics/unary/tank/air, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "asQ" = ( @@ -2763,7 +2762,7 @@ }, /area/station/engineering/gravitygenerator) "asU" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/station/maintenance/solar_maintenance/port) "asV" = ( @@ -3342,7 +3341,7 @@ "avy" = ( /obj/machinery/atmospherics/portable/canister/oxygen, /obj/effect/turf_decal/delivery/hollow, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) "avz" = ( @@ -3618,7 +3617,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/aft_port) "awf" = ( @@ -3736,7 +3735,7 @@ /area/station/security/permabrig) "awE" = ( /obj/machinery/space_heater, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -3777,7 +3776,7 @@ "awM" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore) "awN" = ( @@ -3822,7 +3821,7 @@ /area/station/public/dorms) "awT" = ( /obj/item/clothing/gloves/color/fyellow, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "awU" = ( @@ -3967,7 +3966,7 @@ /area/station/public/storage/emergency/port) "axt" = ( /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "axu" = ( @@ -4414,7 +4413,7 @@ /obj/effect/decal/cleanable/cobweb, /obj/structure/closet/crate, /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random_spawners/id_skins/no_chance, +/obj/effect/spawner/random/id_skins/no_chance, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "azj" = ( @@ -5559,7 +5558,7 @@ /turf/simulated/floor/plating, /area/station/command/bridge) "aEj" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/public/storage/emergency/port) "aEk" = ( @@ -6253,7 +6252,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -29 }, -/obj/machinery/suit_storage_unit/ce/secure, +/obj/machinery/suit_storage_unit/industrial/ce/secure, /turf/simulated/floor/plasteel{ icon_state = "darkneutralfull" }, @@ -6641,7 +6640,7 @@ "aIz" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/suit_storage_unit/engine/secure, +/obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "aIA" = ( @@ -10874,7 +10873,7 @@ /area/station/public/locker) "aVT" = ( /obj/structure/table, -/obj/effect/spawner/random_spawners/id_skins, +/obj/effect/spawner/random/id_skins, /turf/simulated/floor/plasteel, /area/station/public/locker) "aVU" = ( @@ -10903,7 +10902,7 @@ /turf/simulated/floor/plating, /area/station/security/storage) "aVY" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/maintenance/fore) "aWa" = ( @@ -11442,7 +11441,7 @@ /area/space/nearstation) "aXP" = ( /obj/item/crowbar, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "aXQ" = ( @@ -12785,7 +12784,7 @@ }, /area/station/aisat) "bcb" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating/airless, /area/space/nearstation) "bcd" = ( @@ -14737,7 +14736,7 @@ /turf/space, /area/space/nearstation) "bgV" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "bgW" = ( @@ -16728,7 +16727,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bmq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bmr" = ( @@ -18011,7 +18010,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "bpT" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bpU" = ( @@ -18342,7 +18341,7 @@ }, /area/station/hallway/primary/central) "bqS" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/space/nearstation) "bqT" = ( @@ -20511,7 +20510,7 @@ /area/space/nearstation) "bwN" = ( /obj/machinery/light/small/directional/south, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/public/storage/emergency) "bwO" = ( @@ -20523,7 +20522,7 @@ /obj/effect/spawner/random/trash, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "bwR" = ( @@ -23686,7 +23685,7 @@ /area/station/hallway/secondary/garden) "bHo" = ( /obj/effect/decal/cleanable/vomit, -/obj/effect/spawner/random_spawners/id_skins, +/obj/effect/spawner/random/id_skins, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "bHp" = ( @@ -25063,7 +25062,7 @@ /turf/simulated/floor/carpet, /area/station/public/vacant_office) "bME" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -25232,7 +25231,7 @@ "bNf" = ( /obj/structure/table/wood, /obj/item/reagent_containers/glass/rag, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "bNg" = ( @@ -26161,7 +26160,7 @@ /area/station/hallway/secondary/bridge) "bQu" = ( /obj/machinery/economy/slot_machine, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "bQy" = ( @@ -26905,7 +26904,7 @@ }, /area/station/medical/morgue) "bTb" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/spawner/lootdrop{ loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs); name = "Janitor Supplies Spawner" @@ -27116,9 +27115,7 @@ }, /area/station/hallway/primary/central) "bTD" = ( -/obj/structure/closet/secure_closet/bar{ - req_access = list(25) - }, +/obj/structure/closet/secure_closet/bar, /obj/machinery/light/small/directional/west, /turf/simulated/floor/wood, /area/station/service/bar) @@ -27518,7 +27515,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/science/robotics/showroom) "bVf" = ( @@ -27583,7 +27580,7 @@ /area/station/science/research) "bVk" = ( /obj/machinery/light/small/directional/north, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "bVl" = ( @@ -27713,7 +27710,7 @@ /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "bVR" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port) "bVS" = ( @@ -28018,7 +28015,7 @@ /turf/simulated/floor/wood, /area/station/science/robotics/showroom) "bWJ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/science/robotics/showroom) "bWK" = ( @@ -30047,7 +30044,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/spawner/wire_splicing/thirty, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -30195,7 +30192,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "cdP" = ( @@ -30362,7 +30359,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "cen" = ( @@ -30529,7 +30526,7 @@ /area/station/maintenance/aft) "cfb" = ( /obj/machinery/economy/slot_machine, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cfc" = ( @@ -30916,7 +30913,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cgp" = ( @@ -31146,7 +31143,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -31332,7 +31329,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/port2) "chG" = ( @@ -31814,7 +31811,7 @@ icon_state = "1-2" }, /obj/effect/spawner/wire_splicing/thirty, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/xenobio_south) "cjn" = ( @@ -31936,7 +31933,7 @@ /obj/structure/chair/stool{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "cjH" = ( @@ -32369,7 +32366,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port) "cll" = ( @@ -32659,7 +32656,7 @@ }, /area/station/science/research) "cms" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/port) "cmu" = ( @@ -33994,7 +33991,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -34126,7 +34123,7 @@ }, /area/station/maintenance/starboard2) "csl" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/item/circuitboard/chem_master/condi_master, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -34184,7 +34181,7 @@ /turf/simulated/floor/plasteel/airless, /area/station/engineering/atmos) "csv" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "csw" = ( @@ -35049,7 +35046,7 @@ /obj/structure/chair/stool{ dir = 1 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/landmark/start/uncertain, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) @@ -35184,7 +35181,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cwi" = ( @@ -35584,7 +35581,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -35607,7 +35604,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/disposalpipe/segment/corner{ dir = 8 }, @@ -35783,7 +35780,7 @@ "cyv" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "cyw" = ( @@ -35794,7 +35791,7 @@ "cyx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/landmark/start/uncertain, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) @@ -35956,7 +35953,7 @@ "cyT" = ( /obj/structure/bed/roller, /obj/effect/decal/cleanable/blood/old, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/item/toy/plushie/snakeplushie, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) @@ -36282,7 +36279,7 @@ /area/station/maintenance/xenobio_south) "cAf" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/space_heater, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -36344,7 +36341,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cAw" = ( @@ -36898,12 +36895,12 @@ }, /area/station/medical/virology) "cCn" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "cCp" = ( /obj/structure/closet/crate, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -37115,7 +37112,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cDl" = ( @@ -37175,7 +37172,7 @@ /area/station/maintenance/apmaint) "cDv" = ( /obj/structure/sign/poster/contraband/random/east, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "cDz" = ( @@ -38309,7 +38306,7 @@ "cHd" = ( /obj/structure/sign/poster/contraband/random/west, /obj/structure/bed/dogbed, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "cHf" = ( @@ -38703,7 +38700,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "cIl" = ( @@ -38726,7 +38723,7 @@ icon_state = "1-2" }, /obj/machinery/light/small/directional/east, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "cIp" = ( @@ -38964,10 +38961,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cJl" = ( -/obj/machinery/constructable_frame/machine_frame, +/obj/structure/machine_frame, /obj/machinery/light_construct/directional/east, /obj/item/broken_device, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "cJm" = ( @@ -39491,7 +39488,7 @@ loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs); name = "Janitor Supplies Spawner" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "cLt" = ( @@ -39542,7 +39539,7 @@ }, /area/station/hallway/primary/central) "cLF" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cLI" = ( @@ -39948,7 +39945,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/port) "cNC" = ( @@ -40210,11 +40207,9 @@ /area/station/science/toxins/launch) "cOA" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/bar{ - req_access = list(25) - }, +/obj/structure/closet/secure_closet/bar, /obj/machinery/light_switch/north, -/obj/effect/spawner/random_spawners/id_skins/no_chance, +/obj/effect/spawner/random/id_skins/no_chance, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "cOB" = ( @@ -40423,7 +40418,7 @@ "cPp" = ( /obj/structure/sign/poster/contraband/random/north, /obj/structure/reagent_dispensers/fueltank, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -40432,11 +40427,11 @@ loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs); name = "Janitor Supplies Spawner" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port) "cPr" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/table, /obj/item/kitchen/rollingpin, /obj/item/reagent_containers/glass/beaker, @@ -40683,7 +40678,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "cQt" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light/small/directional/south, /mob/living/simple_animal/mouse, /turf/simulated/floor/plating, @@ -41040,7 +41035,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cSa" = ( @@ -41270,7 +41265,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/spawner/wire_splicing/thirty, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -41389,7 +41384,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "cTD" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, @@ -41651,7 +41646,7 @@ /area/station/science/lobby) "cUF" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "cUI" = ( @@ -42284,13 +42279,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port2) "cXu" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fore) "cXx" = ( @@ -42390,7 +42385,7 @@ "cXW" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cXX" = ( @@ -43199,7 +43194,7 @@ /area/station/maintenance/starboard2) "dcu" = ( /obj/effect/landmark/spawner/xeno, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "dcx" = ( @@ -43266,7 +43261,7 @@ }, /area/station/medical/storage) "dcO" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /mob/living/simple_animal/pet/penguin/baby, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) @@ -43352,7 +43347,7 @@ icon_state = "2-8" }, /obj/effect/landmark/spawner/xeno, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/aft_starboard) "ddK" = ( @@ -43812,7 +43807,7 @@ }, /area/station/hallway/secondary/entry) "dgg" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -46594,7 +46589,7 @@ /obj/structure/chair/stool{ dir = 8 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/landmark/start/uncertain, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) @@ -46894,7 +46889,7 @@ /area/station/security/permabrig) "eBk" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/port) "eBr" = ( @@ -47315,7 +47310,7 @@ }, /area/station/science/xenobiology) "eMS" = ( -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore) "eNR" = ( @@ -47426,7 +47421,7 @@ /turf/simulated/floor/carpet, /area/station/science/robotics/showroom) "eQn" = ( -/obj/effect/spawner/random_spawners/oil_often, +/obj/effect/spawner/random/oil/often, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, @@ -48255,7 +48250,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/port2) "fla" = ( @@ -48366,11 +48361,12 @@ /obj/machinery/camera{ c_tag = "Atmospherics - Distro Loop" }, -/obj/machinery/atmospherics/binary/volume_pump/on{ +/obj/machinery/alarm/directional/north, +/obj/machinery/atmospherics/binary/pump/on{ dir = 8; - name = "Air To Distro" + name = "Air To Distro"; + target_pressure = 303 }, -/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" @@ -48798,7 +48794,7 @@ /turf/simulated/floor/plating, /area/station/science/xenobiology) "fvO" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "fvU" = ( @@ -49714,7 +49710,7 @@ "fRm" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/fore) "fRT" = ( @@ -50124,7 +50120,7 @@ }, /area/station/science/xenobiology) "gbM" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall, /area/station/maintenance/fsmaint) "gbP" = ( @@ -52484,7 +52480,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -52495,7 +52491,7 @@ /area/station/maintenance/medmaint) "hgY" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "hht" = ( @@ -52606,7 +52602,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/lobby) "hjE" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -52715,7 +52711,7 @@ }, /area/station/security/armory/secure) "hmu" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ @@ -52999,7 +52995,7 @@ /area/station/service/bar) "hrM" = ( /obj/structure/reagent_dispensers/watertank, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "hrZ" = ( @@ -53182,7 +53178,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "hwP" = ( @@ -53200,7 +53196,7 @@ }, /area/station/science/toxins/launch) "hwZ" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -54541,7 +54537,7 @@ /turf/space, /area/space/nearstation) "iag" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -56833,7 +56829,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "jfb" = ( @@ -56887,7 +56883,7 @@ "jiR" = ( /obj/structure/closet/firecloset, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore) "jiW" = ( @@ -57277,7 +57273,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "juN" = ( @@ -59212,7 +59208,7 @@ }, /area/station/science/toxins/mixing) "kol" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -59335,7 +59331,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "ksb" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/station/maintenance/fsmaint) "ksf" = ( @@ -59420,7 +59416,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central) "kuh" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -60913,7 +60909,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -61496,7 +61492,7 @@ "ljT" = ( /obj/item/rack_parts, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fore) "ljV" = ( @@ -62076,7 +62072,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "lza" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ @@ -64663,7 +64659,7 @@ "mGT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/west, -/obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/carpet/arcade, /area/station/maintenance/fore) "mHs" = ( @@ -66853,7 +66849,7 @@ /area/station/medical/reception) "nCf" = ( /obj/structure/grille/broken, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "nCm" = ( @@ -67375,7 +67371,7 @@ "nPD" = ( /obj/structure/closet/emcloset, /obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random_spawners/cobweb_left_frequent, +/obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plating, /area/station/maintenance/fore) "nPH" = ( @@ -67421,7 +67417,7 @@ /area/station/science/toxins/launch) "nSs" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "nSH" = ( @@ -67685,7 +67681,7 @@ /obj/machinery/computer/arcade/battle{ dir = 8 }, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fore) "nYF" = ( @@ -67730,7 +67726,7 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "nZj" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/station/engineering/control) "nZB" = ( @@ -68227,7 +68223,7 @@ }, /area/station/hallway/primary/starboard) "ook" = ( -/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/security/range) "ooD" = ( @@ -68338,7 +68334,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "oqk" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/chair/stool{ dir = 8 }, @@ -68675,7 +68671,7 @@ /area/station/science/rnd) "oDp" = ( /obj/structure/girder, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "oEe" = ( @@ -68962,7 +68958,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "oNk" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "oNl" = ( @@ -69318,7 +69314,7 @@ }, /area/station/science/robotics) "oVx" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/station/engineering/gravitygenerator) "oVI" = ( @@ -70057,7 +70053,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) "pmE" = ( @@ -71013,7 +71009,7 @@ }, /area/station/medical/reception) "pMx" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -71522,7 +71518,7 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "pWK" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "pWM" = ( @@ -73382,6 +73378,10 @@ pixel_x = 7; pixel_y = 10 }, +/obj/item/storage/fancy/vials{ + pixel_x = -2; + pixel_y = 2 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitegreen" @@ -73408,7 +73408,7 @@ /area/station/security/interrogation) "qRm" = ( /mob/living/simple_animal/mouse, -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "qRI" = ( @@ -73875,7 +73875,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) "rbU" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) @@ -74075,7 +74075,7 @@ }, /area/station/science/storage) "rhb" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/structure/chair, /turf/simulated/floor/plating, /area/station/maintenance/engimaint) @@ -74592,7 +74592,7 @@ }, /area/station/medical/medbay) "rtk" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "rtq" = ( @@ -75723,7 +75723,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central) "rVv" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -76235,7 +76235,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/distribution) "skd" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) @@ -76362,7 +76362,7 @@ /area/station/science/toxins/mixing) "smW" = ( /obj/machinery/space_heater, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -76673,7 +76673,7 @@ /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "swh" = ( -/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random/blood/often, /obj/item/crowbar/small, /turf/simulated/floor/plasteel{ dir = 9; @@ -79136,8 +79136,7 @@ /area/station/security/permabrig) "tAF" = ( /obj/machinery/computer/prisoner{ - dir = 1; - req_access = list(2) + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -79562,7 +79561,7 @@ "tNh" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/atmospherics/portable/canister/air, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fore) "tNr" = ( @@ -79857,7 +79856,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "tXA" = ( @@ -80629,7 +80628,7 @@ /turf/simulated/floor/plating, /area/station/security/permabrig) "urH" = ( -/obj/effect/spawner/random_spawners/oil_maybe, +/obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, /area/station/maintenance/fore) "usg" = ( @@ -82331,7 +82330,7 @@ }, /area/station/medical/reception) "veE" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, @@ -82973,7 +82972,7 @@ }, /area/station/engineering/break_room) "vuo" = ( -/obj/effect/spawner/random_spawners/wall_rusted_probably, +/obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/station/engineering/tech_storage) "vuE" = ( @@ -83240,7 +83239,7 @@ }, /area/station/security/permabrig) "vCt" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/aft) "vCK" = ( @@ -84266,7 +84265,7 @@ /area/station/maintenance/fore) "whg" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fore) "whu" = ( @@ -84591,7 +84590,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "wsq" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /obj/structure/girder, /turf/simulated/floor/plating, /area/station/maintenance/aft) @@ -84877,7 +84876,7 @@ dir = 5 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/cobweb_right_frequent, +/obj/effect/spawner/random/cobweb/right/frequent, /turf/simulated/floor/plasteel, /area/station/security/range) "wxR" = ( @@ -84983,8 +84982,7 @@ /area/station/maintenance/fsmaint) "wAJ" = ( /obj/machinery/computer/prisoner{ - dir = 8; - req_access = list(2) + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -85211,7 +85209,7 @@ }, /area/station/security/brig) "wGv" = ( -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -85333,7 +85331,7 @@ /area/station/hallway/secondary/garden) "wMy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/plating, /area/station/maintenance/fore) "wMQ" = ( @@ -87510,7 +87508,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/burnturf, +/obj/effect/mapping_helpers/turfs/burn, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -87768,7 +87766,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "xSv" = ( -/obj/effect/landmark/damageturf, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/engimaint) "xTz" = ( diff --git a/code/__DEFINES/announce_defines.dm b/code/__DEFINES/announce_defines.dm index c25b3d095997e..c215a70c79bfa 100644 --- a/code/__DEFINES/announce_defines.dm +++ b/code/__DEFINES/announce_defines.dm @@ -6,3 +6,4 @@ #define ANNOUNCE_KIND_MAJOR "Оповещение с NAS Трурль" #define ANNOUNCE_KIND_EVENT "Оповещение с NAS Трурль" // Intentionally the same as above #define ANNOUNCE_KIND_AI "Оповещение И.И." +#define ANNOUNCE_KIND_PTL "Power Transmission Laser report" diff --git a/code/__DEFINES/clothing_defines.dm b/code/__DEFINES/clothing_defines.dm index d0380ede71054..947f3c24355cc 100644 --- a/code/__DEFINES/clothing_defines.dm +++ b/code/__DEFINES/clothing_defines.dm @@ -1,3 +1,37 @@ +//Item inventory slots bitmasks +#define ITEM_SLOT_BACK (1<<0) // back +#define ITEM_SLOT_MASK (1<<1) // mask +#define ITEM_SLOT_HANDCUFFED (1<<2) // handcuffs +#define ITEM_SLOT_LEFT_HAND (1<<3) // l_hand +#define ITEM_SLOT_RIGHT_HAND (1<<4) // r_hand +#define ITEM_SLOT_BOTH_HANDS (ITEM_SLOT_LEFT_HAND | ITEM_SLOT_RIGHT_HAND) +#define ITEM_SLOT_BELT (1<<5) // belt +#define ITEM_SLOT_ID (1<<6) // id +#define ITEM_SLOT_LEFT_EAR (1<<7) // l_ear +#define ITEM_SLOT_RIGHT_EAR (1<<8) // r_ear +#define ITEM_SLOT_BOTH_EARS (ITEM_SLOT_LEFT_EAR | ITEM_SLOT_RIGHT_EAR) +#define ITEM_SLOT_EYES (1<<9) // eyes +#define ITEM_SLOT_GLOVES (1<<10) // gloves +#define ITEM_SLOT_HEAD (1<<11) // head +#define ITEM_SLOT_SHOES (1<<12) // shoes +#define ITEM_SLOT_OUTER_SUIT (1<<13) // wear_suit +#define ITEM_SLOT_JUMPSUIT (1<<14) // w_uniform +#define ITEM_SLOT_LEFT_POCKET (1<<15) // l_store +#define ITEM_SLOT_RIGHT_POCKET (1<<16) // r_store +#define ITEM_SLOT_BOTH_POCKETS (ITEM_SLOT_LEFT_POCKET | ITEM_SLOT_RIGHT_POCKET) +#define ITEM_SLOT_SUIT_STORE (1<<17) // suit_storage +#define ITEM_SLOT_IN_BACKPACK (1<<18) // this just puts stuff a backpack if you have one +#define ITEM_SLOT_LEGCUFFED (1<<19) // legcuffs +#define ITEM_SLOT_PDA (1<<20) // pda +#define ITEM_SLOT_ACCESSORY (1<<21) // accessories +#define ITEM_SLOT_COLLAR (1<<22) // pet collar +#define ITEM_SLOT_NECK (1<<23) // neck +#define ITEM_SLOT_AMOUNT_FLAG (1<<(ITEM_SLOT_AMOUNT-1)) +#define ITEM_SLOT_AMOUNT 24 // IF YOU ADD ANY NEW CLOTHING SLOTS, MAKE SURE TO UPDATE THIS TO THE AMOUNT OF SLOTS. + +/// Translates an ITEM_SLOT back to an index that can be looked up in inv_slots. e.g. (1<<19) becomes 19. +#define ITEM_SLOT_2_INDEX(slot) (log(2, slot) + 1) + //Bit flags for the flags_inv variable, which determine when a piece of clothing hides another. IE a helmet hiding glasses. #define HIDEGLOVES (1<<0) //APPLIES ONLY TO THE EXTERIOR SUIT!! #define HIDESUITSTORAGE (1<<1) //APPLIES ONLY TO THE EXTERIOR SUIT!! @@ -10,41 +44,14 @@ #define HIDEEYES (1<<2) //APPLIES ONLY TO HELMETS/MASKS!! (eyes means glasses) #define HIDEFACE (1<<3) //APPLIES ONLY TO HELMETS/MASKS!! Dictates whether we appear as unknown. -// Slot defines for var/list/inv_slots, some of these dont really show up on the HUD, -// but still function like it in other ways. I know thats weird, and I hate it too. -#define SLOT_HUD_BACK 1 -#define SLOT_HUD_WEAR_MASK 2 -#define SLOT_HUD_HANDCUFFED 3 -#define SLOT_HUD_LEFT_HAND 4 // l_hand -#define SLOT_HUD_RIGHT_HAND 5 // r_hand -#define SLOT_HUD_BELT 6 -#define SLOT_HUD_WEAR_ID 7 -#define SLOT_HUD_LEFT_EAR 8 // l_ear -#define SLOT_HUD_GLASSES 9 -#define SLOT_HUD_GLOVES 10 -#define SLOT_HUD_HEAD 11 -#define SLOT_HUD_SHOES 12 -#define SLOT_HUD_OUTER_SUIT 13 // wear_suit -#define SLOT_HUD_JUMPSUIT 14 // w_uniform -#define SLOT_HUD_LEFT_STORE 15 // l_store -#define SLOT_HUD_RIGHT_STORE 16 // r_store -#define SLOT_HUD_SUIT_STORE 17 -#define SLOT_HUD_IN_BACKPACK 18 // this just puts stuff a backpack if you have one -#define SLOT_HUD_LEGCUFFED 19 -#define SLOT_HUD_RIGHT_EAR 20 // r_ear -#define SLOT_HUD_WEAR_PDA 21 -#define SLOT_HUD_TIE 22 -#define SLOT_HUD_COLLAR 23 -#define SLOT_HUD_AMOUNT 23 - // Boolean defines for hands #define HAND_BOOL_RIGHT 0 #define HAND_BOOL_LEFT 1 // accessory slots -#define ACCESSORY_SLOT_DECOR 1 -#define ACCESSORY_SLOT_UTILITY 2 -#define ACCESSORY_SLOT_ARMBAND 3 +#define ACCESSORY_SLOT_DECOR (1<<0) +#define ACCESSORY_SLOT_UTILITY (1<<1) +#define ACCESSORY_SLOT_ARMBAND (1<<2) ///max number of accessories that can be equiped to one piece of clothing #define MAX_EQUIPABLE_ACCESSORIES 5 @@ -104,3 +111,4 @@ #define MUZZLE_MUTE_NONE 0 // Does not mute you. #define MUZZLE_MUTE_MUFFLE 1 // Muffles everything you say "MHHPHHMMM!!! #define MUZZLE_MUTE_ALL 2 // Completely mutes you. + diff --git a/code/__DEFINES/dcs/atom_signals.dm b/code/__DEFINES/dcs/atom_signals.dm index 574552e87d224..f5f9a204bf698 100644 --- a/code/__DEFINES/dcs/atom_signals.dm +++ b/code/__DEFINES/dcs/atom_signals.dm @@ -6,6 +6,8 @@ // /atom +// from SSatoms InitAtom - Only if the atom was not deleted or failed initialization +#define COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE "atom_init_success" ///from base of atom/attackby(): (/obj/item, /mob/living, params) #define COMSIG_PARENT_ATTACKBY "atom_attackby" ///Return this in response if you don't want afterattack to be called @@ -28,17 +30,17 @@ #define COMSIG_ATOM_UPDATE_NAME "atom_update_name" ///from base of [/atom/proc/update_desc]: (updates) #define COMSIG_ATOM_UPDATE_DESC "atom_update_desc" -///from base of [/atom/update_icon]: () +///from base of [/atom/proc/update_icon]: () #define COMSIG_ATOM_UPDATE_ICON "atom_update_icon" /// If returned from [COMSIG_ATOM_UPDATE_ICON] it prevents the atom from updating its icon state. #define COMSIG_ATOM_NO_UPDATE_ICON_STATE UPDATE_ICON_STATE /// If returned from [COMSIG_ATOM_UPDATE_ICON] it prevents the atom from updating its overlays. #define COMSIG_ATOM_NO_UPDATE_OVERLAYS UPDATE_OVERLAYS -///Sent after [atom/update_icon_state] is called by [/atom/update_icon]: () +///Sent after [/atom/proc/update_icon_state] is called by [/atom/proc/update_icon]: () #define COMSIG_ATOM_UPDATE_ICON_STATE "atom_update_icon_state" -///Sent after [atom/update_overlays] is called by [/atom/update_icon]: (list/new_overlays) +///Sent after [/atom/proc/update_overlays] is called by [/atom/proc/update_icon]: (list/new_overlays) #define COMSIG_ATOM_UPDATE_OVERLAYS "atom_update_overlays" -///from base of [/atom/update_icon]: (signalOut, did_anything) +///from base of [/atom/proc/update_icon]: (signalOut, did_anything) #define COMSIG_ATOM_UPDATED_ICON "atom_updated_icon" ///from base of atom/Entered(): (atom/movable/entering, /atom) #define COMSIG_ATOM_ENTERED "atom_entered" @@ -69,6 +71,8 @@ #define COMSIG_ATOM_SET_LIGHT "atom_set_light" ///from base of atom/setDir(): (old_dir, new_dir) #define COMSIG_ATOM_DIR_CHANGE "atom_dir_change" +///from [/datum/controller/subsystem/processing/dcs/proc/rotate_decals]: (list/datum/element/decal/rotating) +#define COMSIG_ATOM_DECALS_ROTATING "atom_decals_rotating" ///from base of atom/has_gravity(): (turf/location, list/forced_gravities) #define COMSIG_ATOM_HAS_GRAVITY "atom_has_gravity" ///from proc/get_rad_contents(): () @@ -114,7 +118,7 @@ #define COMPONENT_NO_ATTACK_HAND (1<<0) //works on all 3. //This signal return value bitflags can be found in __DEFINES/misc.dm -///called on /living, when pull is attempted, but before it completes, from base of [/mob/living/start_pulling]: (atom/movable/thing, force) +///called on /living, when pull is attempted, but before it completes, from base of [/mob/living/proc/start_pulling]: (atom/movable/thing, force) #define COMSIG_LIVING_TRY_PULL "living_try_pull" #define COMSIG_LIVING_CANCEL_PULL (1 << 0) diff --git a/code/__DEFINES/dcs/basetype_signals.dm b/code/__DEFINES/dcs/basetype_signals.dm index 6a5230caa465b..6affef128aa41 100644 --- a/code/__DEFINES/dcs/basetype_signals.dm +++ b/code/__DEFINES/dcs/basetype_signals.dm @@ -27,3 +27,5 @@ ///from base of turf/ChangeTurf(): (path, list/new_baseturfs, flags, list/transferring_comps) #define COMSIG_TURF_CHANGE "turf_change" +///from base of turf/proc/onShuttleMove(): (turf/new_turf) +#define COMSIG_TURF_ON_SHUTTLE_MOVE "turf_on_shuttle_move" diff --git a/code/__DEFINES/dcs/datum_signals.dm b/code/__DEFINES/dcs/datum_signals.dm index 6850155f34517..1851311a8abfa 100644 --- a/code/__DEFINES/dcs/datum_signals.dm +++ b/code/__DEFINES/dcs/datum_signals.dm @@ -53,10 +53,12 @@ #define COMSIG_SONG_END "song_end" -// /datum/component/decal +// /datum/element/decal -///called on an object to clean it of cleanables. Usualy with soap: (num/strength) +///called on an object to clean it of cleanables. #define COMSIG_COMPONENT_CLEAN_ACT "clean_act" + ///Returned by cleanable components when they are cleaned. + #define COMPONENT_CLEANED (1<<0) // /datum/component/two_handed diff --git a/code/__DEFINES/dcs/item_signals.dm b/code/__DEFINES/dcs/item_signals.dm index 1372ce4200a8c..475c33a538c45 100644 --- a/code/__DEFINES/dcs/item_signals.dm +++ b/code/__DEFINES/dcs/item_signals.dm @@ -21,7 +21,7 @@ #define COMSIG_ITEM_BEING_ATTACKED "item_being_attacked" ///from base of obj/item/afterattack(): (atom/target, mob/user, params) #define COMSIG_ITEM_AFTERATTACK "item_afterattack" -///called on [/obj/item] before unequip from base of [mob/proc/doUnEquip]: (force, atom/newloc, no_move, invdrop, silent) +///called on [/obj/item] before unequip from base of [/mob/proc/unEquip]: (force, atom/newloc, no_move, invdrop, silent) #define COMSIG_ITEM_PRE_UNEQUIP "item_pre_unequip" ///only the pre unequip can be cancelled #define COMPONENT_ITEM_BLOCK_UNEQUIP (1<<0) @@ -44,9 +44,9 @@ ///from base of [/obj/item/proc/tool_attack_chain]: (atom/tool, mob/user) #define COMSIG_TOOL_ATTACK "tool_attack" #define COMPONENT_CANCEL_TOOLACT (1<<0) -/// Called by /obj/item/assembly/signaler(called_from_radio) +/// Called by [/obj/item/assembly/proc/pulse] #define COMSIG_ASSEMBLY_PULSED "item_assembly_pulsed" -///from [/mob/living/carbon/human/Move]: () +///from [/mob/living/carbon/human/proc/Move]: () #define COMSIG_SHOES_STEP_ACTION "shoes_step_action" // /obj/item/implant diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index b35b876a1d3e6..08c5087b4b09e 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -2,7 +2,7 @@ #define NONE 0 //FLAGS BITMASK -#define STOPSPRESSUREDMAGE (1<<0) //This flag is used on the flags variable for SUIT and HEAD items which stop pressure damage. Note that the flag 1 was previous used as ONBACK, so it is possible for some code to use (flags & 1) when checking if something can be put on your back. Replace this code with (inv_flags & SLOT_FLAG_BACK) if you see it anywhere To successfully stop you taking all pressure damage you must have both a suit and head item with this flag. +#define STOPSPRESSUREDMAGE (1<<0) //This flag is used on the flags variable for SUIT and HEAD items which stop pressure damage. Note that the flag 1 was previous used as ONBACK, so it is possible for some code to use (flags & 1) when checking if something can be put on your back. Replace this code with (inv_flags & ITEM_SLOT_BACK) if you see it anywhere To successfully stop you taking all pressure damage you must have both a suit and head item with this flag. #define NODROP (1<<1) // This flag makes it so that an item literally cannot be removed at all, or at least that's how it should be. Only deleted. #define NOBLUDGEON (1<<2) // when an item has this it produces no "X has been hit by Y with Z" message with the default handler #define AIRTIGHT (1<<3) // mask allows internals @@ -45,6 +45,9 @@ #define INFORM_ADMINS_ON_RELOCATE_2 (1<<5) #define BANG_PROTECT_2 (1<<6) #define BLOCKS_LIGHT_2 (1<<7) // Light sources placed in anything with that flag will not emit light through them. +/// Whether a decal element's parent has already been initialized and thus has already had its decals attached. +/// see https://github.com/tgstation/tgstation/pull/71658 for a detailed explanation of the flag. +#define DECAL_INIT_UPDATE_EXPERIENCED_2 (1<<8) // A mob with OMNITONGUE has no restriction in the ability to speak // languages that they know. So even if they wouldn't normally be able to @@ -145,23 +148,7 @@ #define BLESSED_TILE (1<<0) #define NO_LAVA_GEN (1<<1) //Blocks lava rivers being generated on the turf #define NO_RUINS (1<<2) - -//ITEM INVENTORY SLOT BITMASKS -#define SLOT_FLAG_OCLOTHING (1<<0) -#define SLOT_FLAG_ICLOTHING (1<<1) -#define SLOT_FLAG_GLOVES (1<<2) -#define SLOT_FLAG_EYES (1<<3) -#define SLOT_FLAG_EARS (1<<4) -#define SLOT_FLAG_MASK (1<<5) -#define SLOT_FLAG_HEAD (1<<6) -#define SLOT_FLAG_FEET (1<<7) -#define SLOT_FLAG_ID (1<<8) -#define SLOT_FLAG_BELT (1<<9) -#define SLOT_FLAG_BACK (1<<10) -#define SLOT_FLAG_POCKET (1<<11) //this is to allow items with a w_class of 3 or 4 to fit in pockets. -#define SLOT_FLAG_TWOEARS (1<<12) -#define SLOT_FLAG_PDA (1<<13) -#define SLOT_FLAG_TIE (1<<14) +#define LAVA_BRIDGE (1<<3) //! This turf has already been reserved for a lavaland bridge placement. //ORGAN TYPE FLAGS #define AFFECT_ROBOTIC_ORGAN 1 diff --git a/code/__DEFINES/hud_locations.dm b/code/__DEFINES/hud_locations.dm index 7bfe1c0e3ae9e..0392e274bd2cd 100644 --- a/code/__DEFINES/hud_locations.dm +++ b/code/__DEFINES/hud_locations.dm @@ -111,11 +111,13 @@ #define ui_gloves "WEST+2:10,SOUTH+1:7" -#define ui_glasses "WEST:6,SOUTH+2:9" +#define ui_glasses "WEST:6,SOUTH+3:11" #define ui_mask "WEST+1:8,SOUTH+2:9" #define ui_l_ear "WEST+2:10,SOUTH+2:9" #define ui_r_ear "WEST+2:10,SOUTH+3:11" +#define ui_neck "WEST:6,SOUTH+2:9" + #define ui_head "WEST+1:8,SOUTH+3:11" // AI diff --git a/code/__DEFINES/misc_defines.dm b/code/__DEFINES/misc_defines.dm index 880142c805ffb..472f4cdd15d28 100644 --- a/code/__DEFINES/misc_defines.dm +++ b/code/__DEFINES/misc_defines.dm @@ -185,32 +185,33 @@ #define FOAM_REACT_BEFORE_SPREAD (1<<3) //Human Overlays Indexes///////// -#define EYES_OVERLAY_LAYER 48 -#define MISC_LAYER 47 // Handles eye_shine() -> cybernetic eyes, specific eye traits. -#define WING_LAYER 46 -#define WING_UNDERLIMBS_LAYER 45 -#define MUTANTRACE_LAYER 44 -#define TAIL_UNDERLIMBS_LAYER 43 //Tail split-rendering. -#define LIMBS_LAYER 42 -#define MARKINGS_LAYER 41 -#define INTORGAN_LAYER 40 -#define UNDERWEAR_LAYER 39 -#define MUTATIONS_LAYER 38 -#define H_DAMAGE_LAYER 37 -#define UNIFORM_LAYER 36 -#define ID_LAYER 35 -#define HANDS_LAYER 34 //Exists to overlay hands over jumpsuits -#define SHOES_LAYER 33 -#define L_FOOT_BLOOD_LAYER 32 // Blood overlay separation Left-Foot -#define R_FOOT_BLOOD_LAYER 31 // Blood overlay separation Right-Foot -#define GLOVES_LAYER 30 -#define L_HAND_BLOOD_LAYER 29 // Blood overlay separation Left-Hand -#define R_HAND_BLOOD_LAYER 28 // Blood overlay separation Right-Hand -#define LEFT_EAR_LAYER 27 -#define RIGHT_EAR_LAYER 26 -#define BELT_LAYER 25 //Possible make this an overlay of something required to wear a belt? -#define SUIT_LAYER 24 -#define SPECIAL_BELT_LAYER 23 +#define EYES_OVERLAY_LAYER 49 +#define MISC_LAYER 48 // Handles eye_shine() -> cybernetic eyes, specific eye traits. +#define WING_LAYER 47 +#define WING_UNDERLIMBS_LAYER 46 +#define MUTANTRACE_LAYER 45 +#define TAIL_UNDERLIMBS_LAYER 44 //Tail split-rendering. +#define LIMBS_LAYER 43 +#define MARKINGS_LAYER 42 +#define INTORGAN_LAYER 41 +#define UNDERWEAR_LAYER 40 +#define MUTATIONS_LAYER 39 +#define H_DAMAGE_LAYER 38 +#define UNIFORM_LAYER 37 +#define ID_LAYER 36 +#define HANDS_LAYER 35 //Exists to overlay hands over jumpsuits +#define SHOES_LAYER 34 +#define L_FOOT_BLOOD_LAYER 33 // Blood overlay separation Left-Foot +#define R_FOOT_BLOOD_LAYER 32 // Blood overlay separation Right-Foot +#define GLOVES_LAYER 31 +#define L_HAND_BLOOD_LAYER 30 // Blood overlay separation Left-Hand +#define R_HAND_BLOOD_LAYER 29 // Blood overlay separation Right-Hand +#define LEFT_EAR_LAYER 28 +#define RIGHT_EAR_LAYER 27 +#define BELT_LAYER 26 //Possible make this an overlay of something required to wear a belt? +#define SUIT_LAYER 25 +#define SPECIAL_BELT_LAYER 24 +#define NECK_LAYER 23 #define SUIT_STORE_LAYER 22 #define BACK_LAYER 21 #define HEAD_ACCESSORY_LAYER 20 @@ -233,7 +234,7 @@ #define HALO_LAYER 3 //blood cult ascended halo, because there's currently no better solution for adding/removing #define FIRE_LAYER 2 //If you're on fire #define FROZEN_LAYER 1 -#define TOTAL_LAYERS 48 +#define TOTAL_LAYERS 49 ///Access Region Codes/// #define REGION_ALL 0 @@ -423,7 +424,7 @@ #define INVESTIGATE_HOTMIC "hotmic" // The SQL version required by this version of the code -#define SQL_VERSION 602207 +#define SQL_VERSION 622207 // Vending machine stuff #define CAT_NORMAL (1<<0) @@ -466,14 +467,6 @@ #define PLACE_SPACE_RUIN "space" #define PLACE_LAVA_RUIN "lavaland" -//Cleaning tool strength -// 1 is also a valid cleaning strength but completely unused so left undefined -#define CLEAN_WEAK 2 -#define CLEAN_MEDIUM 3 // Acceptable tools -#define CLEAN_STRONG 4 // Industrial strength -#define CLEAN_IMPRESSIVE 5 // Cleaning strong enough your granny would be proud -#define CLEAN_GOD 6 // Cleans things spotless down to the atomic structure - //Ghost orbit types: #define GHOST_ORBIT_CIRCLE "circle" #define GHOST_ORBIT_TRIANGLE "triangle" @@ -536,11 +529,10 @@ #define LINDA_SPAWN_AIR (1<<8) #define LINDA_SPAWN_COLD (1<<9) -// Throwing these defines here for the TM to minimise conflicts #define MAPROTATION_MODE_NORMAL_VOTE "Vote" #define MAPROTATION_MODE_NO_DUPLICATES "Nodupes" #define MAPROTATION_MODE_FULL_RANDOM "Random" - +#define MAPROTATION_MODE_HYBRID_FPTP_NO_DUPLICATES "FPTP" /// Send to the primary Discord webhook #define DISCORD_WEBHOOK_PRIMARY "PRIMARY" @@ -559,6 +551,7 @@ // Runechat symbol types #define RUNECHAT_SYMBOL_EMOTE 1 #define RUNECHAT_SYMBOL_LOOC 2 +#define RUNECHAT_SYMBOL_DEAD 3 /// Waits at a line of code until X is true #define UNTIL(X) while(!(X)) sleep(world.tick_lag) diff --git a/code/__DEFINES/modular_ss220/pronouns.dm b/code/__DEFINES/modular_ss220/pronouns.dm index 1cb0ede906f01..27b3713f3376b 100644 --- a/code/__DEFINES/modular_ss220/pronouns.dm +++ b/code/__DEFINES/modular_ss220/pronouns.dm @@ -13,17 +13,3 @@ #define INSTRUMENTAL "творительный" /// Предложный: Прохладная история о ком? О клоуне и об ассистухе. #define PREPOSITIONAL "предложный" - -/// Макрос для упрощения создания листа падежей для объекта -#define RU_NAMES_LIST(base, nominative, genitive, dative, accusative, instrumental, prepositional) (list("base" = base, NOMINATIVE = nominative, GENITIVE = genitive, DATIVE = dative, ACCUSATIVE = accusative, INSTRUMENTAL = instrumental, PREPOSITIONAL = prepositional)) - -/// Макрос для добавления значений для переменных -#define RU_NAMES_LIST_INIT(base, nominative, genitive, dative, accusative, instrumental, prepositional)\ - ru_names = RU_NAMES_LIST(base, nominative, genitive, dative, accusative, instrumental, prepositional);\ - ru_name_base = base;\ - ru_name_nominative = nominative;\ - ru_name_genitive = genitive;\ - ru_name_dative = dative;\ - ru_name_accusative = accusative;\ - ru_name_instrumental = instrumental;\ - ru_name_prepositional = prepositional diff --git a/code/__DEFINES/power_defines.dm b/code/__DEFINES/power_defines.dm index c7397a99d8461..1c2f62aeaacec 100644 --- a/code/__DEFINES/power_defines.dm +++ b/code/__DEFINES/power_defines.dm @@ -46,3 +46,6 @@ #define KJ * 1e3 #define MJ * 1e6 #define GJ * 1e9 + +/// Conversion ratio from Watt over a machine process tick time to Joules +#define WATT_TICK_TO_JOULE 2 diff --git a/code/__DEFINES/preferences_defines.dm b/code/__DEFINES/preferences_defines.dm index fd0a1d7d7bfd9..8aaf307cdc4c3 100644 --- a/code/__DEFINES/preferences_defines.dm +++ b/code/__DEFINES/preferences_defines.dm @@ -80,13 +80,26 @@ #define TOGGLES_2_DEFAULT (PREFTOGGLE_2_FANCYUI|PREFTOGGLE_2_ITEMATTACK|PREFTOGGLE_2_WINDOWFLASHING|PREFTOGGLE_2_RUNECHAT|PREFTOGGLE_2_DEATHMESSAGE|PREFTOGGLE_2_SEE_ITEM_OUTLINES|PREFTOGGLE_2_THOUGHT_BUBBLE|PREFTOGGLE_2_DANCE_DISCO|PREFTOGGLE_2_MOD_ACTIVATION_METHOD|PREFTOGGLE_2_SWAP_INPUT_BUTTONS|PREFTOGGLE_2_LARGE_INPUT_BUTTONS) + +// toggles_3 variables. These MUST be prefixed with PREFTOGGLE_3 +#define TOGGLES_3_TOTAL 1023 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined. + +// When you add a toggle here, inform AA on merge so the column can be zeroed out. This needs to exist to avoid the compiler freaking out +// Also update the above value to the actual total +#define TOGGLES_3_DEFAULT (1) + // Sanity checks +// I should really convert these to a JSON list at some point hnnnnnng #if TOGGLES_TOTAL > 16777215 #error toggles bitflag over 16777215. Please use toggles_2. #endif #if TOGGLES_2_TOTAL > 16777215 -#error toggles_2 bitflag over 16777215. Please make an issue report and postpone the feature you are working on. +#error toggles_2 bitflag over 16777215. Please use toggles_3. +#endif + +#if TOGGLES_3_TOTAL > 16777215 +#error toggles_3 bitflag over 16777215. Please make an issue report and postpone the feature you are working on. #endif // This is a list index. Required to start at 1 instead of 0 so it's properly placed in the list diff --git a/code/__DEFINES/rust.dm b/code/__DEFINES/rust.dm index 07242e955f503..0c337d93554b4 100644 --- a/code/__DEFINES/rust.dm +++ b/code/__DEFINES/rust.dm @@ -8,6 +8,15 @@ /* This comment bypasses grep checks */ /var/__rustlib +// IF we are on the production box, use a dll that has 0 compatibility of working with normal people's CPUs +// This works by allowing rust to compile with modern x86 instructionns, instead of compiling for a pentium 4 +// This has the potential for significant speed upgrades with SIMD and similar +#ifdef PARADISE_PRODUCTION_HARDWARE +#define RUSTLIBS_SUFFIX "_prod" +#else +#define RUSTLIBS_SUFFIX "" +#endif + /proc/__detect_rustlib() if(world.system_type == UNIX) #ifdef CIBUILDING @@ -16,27 +25,34 @@ return __rustlib = "tools/ci/librustlibs_ci.so" #endif // First check if it's built in the usual place. - if(fexists("./rust/target/i686-unknown-linux-gnu/release/librustlibs.so")) - return __rustlib = "./rust/target/i686-unknown-linux-gnu/release/librustlibs.so" + if(fexists("./rust/target/i686-unknown-linux-gnu/release/librustlibs[RUSTLIBS_SUFFIX].so")) + return __rustlib = "./rust/target/i686-unknown-linux-gnu/release/librustlibs[RUSTLIBS_SUFFIX].so" // Then check in the current directory. - if(fexists("./librustlibs.so")) - return __rustlib = "./librustlibs.so" + if(fexists("./librustlibs[RUSTLIBS_SUFFIX].so")) + return __rustlib = "./librustlibs[RUSTLIBS_SUFFIX].so" // And elsewhere. - return __rustlib = "librustlibs.so" + return __rustlib = "librustlibs[RUSTLIBS_SUFFIX].so" else // First check if it's built in the usual place. - if(fexists("./rust/target/i686-pc-windows-msvc/release/rustlibs.dll")) - return __rustlib = "./rust/target/i686-pc-windows-msvc/release/rustlibs.dll" + if(fexists("./rust/target/i686-pc-windows-msvc/release/rustlibs[RUSTLIBS_SUFFIX].dll")) + return __rustlib = "./rust/target/i686-pc-windows-msvc/release/rustlibs[RUSTLIBS_SUFFIX].dll" // Then check in the current directory. - if(fexists("./rustlibs.dll")) - return __rustlib = "./rustlibs.dll" + if(fexists("./rustlibs[RUSTLIBS_SUFFIX].dll")) + return __rustlib = "./rustlibs[RUSTLIBS_SUFFIX].dll" + // And elsewhere. - return __rustlib = "rustlibs.dll" + var/assignment_confirmed = (__rustlib = "rustlibs[RUSTLIBS_SUFFIX].dll") + // This being spanned over multiple lines is kinda scuffed, but its needed because of https://www.byond.com/forum/post/2072419 + return assignment_confirmed + #define RUSTLIB (__rustlib || __detect_rustlib()) #define RUSTLIB_CALL(func, args...) call_ext(RUSTLIB, "byond:[#func]_ffi")(args) +// This needs to go BELOW the above define, otherwise the BYOND compiler can make the above immediate call disappear +#undef RUSTLIBS_SUFFIX + /proc/milla_init_z(z) return RUSTLIB_CALL(milla_initialize, z) diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index c3f268824dfc2..8bac4307c41a4 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -138,6 +138,10 @@ #define STATUS_EFFECT_C_FOAMED /datum/status_effect/c_foamed +#define STATUS_EFFECT_TEMPORAL_SLASH /datum/status_effect/temporal_slash + +#define STATUS_EFFECT_TEMPORAL_SLASH_FINISHER /datum/status_effect/temporal_slash_finisher + //#define STATUS_EFFECT_NECROPOLIS_CURSE /datum/status_effect/necropolis_curse //#define CURSE_BLINDING 1 //makes the edges of the target's screen obscured //#define CURSE_SPAWNING 2 //spawns creatures that attack the target only diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index c6596ea46c10a..2b233bca7d20c 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -83,7 +83,7 @@ #define TGS_EVENT_COMPILE_START 8 /// When a compile is cancelled. No parameters. #define TGS_EVENT_COMPILE_CANCELLED 9 -/// When a compile fails. Parameters: Game directory path, [TRUE]/[FALSE] based on if the cause for failure was DMAPI validation. +/// When a compile fails. Parameters: Game directory path, `TRUE`/`FALSE` based on if the cause for failure was DMAPI validation. #define TGS_EVENT_COMPILE_FAILURE 10 /// When a compile operation completes. Note, this event fires before the new .dmb is loaded into the watchdog. Consider using the [TGS_EVENT_DEPLOYMENT_COMPLETE] instead. Parameters: Game directory path. #define TGS_EVENT_COMPILE_COMPLETE 11 @@ -242,13 +242,13 @@ var/friendly_name /// Name of the chat connection. This is the IRC server address or the Discord guild. var/connection_name - /// [TRUE]/[FALSE] based on if the server operator has marked this channel for game admins only. + /// `TRUE`/`FALSE` based on if the server operator has marked this channel for game admins only. var/is_admin_channel - /// [TRUE]/[FALSE] if the channel is a private message channel for a [/datum/tgs_chat_user]. + /// `TRUE`/`FALSE` if the channel is a private message channel for a [/datum/tgs_chat_user]. var/is_private_channel /// Tag string associated with the channel in TGS. var/custom_tag - /// [TRUE]/[FALSE] if the channel supports embeds. + /// `TRUE`/`FALSE` if the channel supports embeds. var/embeds_supported // Represents a chat user diff --git a/code/__DEFINES/turfs.dm b/code/__DEFINES/turfs.dm index 9306a89a6165d..f383b4d5540c3 100644 --- a/code/__DEFINES/turfs.dm +++ b/code/__DEFINES/turfs.dm @@ -1,6 +1,6 @@ /// Turf will be passable if density is 0 #define TURF_PATHING_PASS_DENSITY 0 -/// Turf will be passable depending on [CanPathfindPass] return value +/// Turf will be passable depending on [/atom/proc/CanPathfindPass] return value #define TURF_PATHING_PASS_PROC 1 /// Turf is never passable #define TURF_PATHING_PASS_NO 2 diff --git a/code/__HELPERS/paths/path.dm b/code/__HELPERS/paths/path.dm index 5e33353c005a9..956cdd72b413e 100644 --- a/code/__HELPERS/paths/path.dm +++ b/code/__HELPERS/paths/path.dm @@ -41,7 +41,7 @@ * * end: What we're trying to path to. It doesn't matter if this is a turf or some other atom, we're gonna just path to the turf it's on anyway * * max_distance: The maximum number of steps we can take in a given path to search (default: 30, 0 = infinite) * * mintargetdistance: Minimum distance to the target before path returns, could be used to get near a target, but not right to it - for an AI mob with a gun, for example. - * * age: How old a path map can be before we'll avoid reusing it. Use the defines found in [code/__DEFINES/path.dm], values larger then MAP_REUSE_SLOWEST will be discarded + * * age: How old a path map can be before we'll avoid reusing it. Use the defines found in [code/__DEFINES/path_defines.dm], values larger then MAP_REUSE_SLOWEST will be discarded * * access: A list representing what access we have and what doors we can open. * * simulated_only: Whether we consider tur fs without atmos simulation (AKA do we want to ignore space) * * exclude: If we want to avoid a specific turf, like if we're a mulebot who already got blocked by some turf diff --git a/code/__HELPERS/sorts/__main.dm b/code/__HELPERS/sorts/__main.dm index 6da4fc6e87843..b93586c21f377 100644 --- a/code/__HELPERS/sorts/__main.dm +++ b/code/__HELPERS/sorts/__main.dm @@ -306,14 +306,15 @@ reverse a descending sequence without violating stability. * Like gallopLeft, except that if the range contains an element equal to * key, gallopRight returns the index after the rightmost equal element. * - * @param key the key whose insertion point to search for - * @param a the array in which to search - * @param base the index of the first element in the range - * @param len the length of the range; must be > 0 - * @param hint the index at which to begin the search, 0 <= hint < n. - * The closer hint is to the result, the faster this method will run. - * @param c the comparator used to order the range, and to search - * @return the int k, 0 <= k <= n such that a[b + k - 1] <= key < a[b + k] + * Returns the int `k`, `0 <= k <= n` such that `a[b + k - 1] <= key < a[b + k]`. + * + * Arguments: + * - key: the key whose insertion point to search for + * - a: the array in which to search + * - base: the index of the first element in the range + * - len: the length of the range; must be > 0 + * - hint: the index at which to begin the search, `0 <= hint < n`. The closer hint is to the result, the faster this method will run. + * - c: the comparator used to order the range, and to search */ /datum/sortInstance/proc/gallopRight(key, base, len, hint) //ASSERT(len > 0 && hint >= 0 && hint < len) diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index cdfdf72d4295a..4d37d42965c7c 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -463,7 +463,13 @@ text = replacetext(text, "\[signfont\]", "") text = replacetext(text, "\[/signfont\]", "") if(sign) - text = replacetext(text, "\[sign\]", "[user ? user.real_name : "Anonymous"]") + if(istype(P, /obj/item/pen/chameleon)) // if we are using chameleon pen use fake name from the pen + var/obj/item/pen/chameleon/chameleon_pen = P + add_attack_logs(user, "paper", "Has signed paper as [chameleon_pen.forge_name]") + // small tip for a player if the left forge_name empty + text = replacetext(text, "\[sign\]", "[chameleon_pen.forge_name ? chameleon_pen.forge_name : "No name was provided"]") + else + text = replacetext(text, "\[sign\]", "[user ? user.real_name : "Anonymous"]") if(fields) text = replacetext(text, "\[field\]", "") if(format) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 44c9484c951cc..2033b926c9a46 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1976,42 +1976,14 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) // SS220 ADDITION END -/proc/slot_bitfield_to_slot(input_slot_flags) // Kill off this garbage ASAP; slot flags and clothing flags should be IDENTICAL. GOSH DARN IT. Doesn't work with ears or pockets, either. - switch(input_slot_flags) - if(SLOT_FLAG_OCLOTHING) - return SLOT_HUD_OUTER_SUIT - if(SLOT_FLAG_ICLOTHING) - return SLOT_HUD_JUMPSUIT - if(SLOT_FLAG_GLOVES) - return SLOT_HUD_GLOVES - if(SLOT_FLAG_EYES) - return SLOT_HUD_GLASSES - if(SLOT_FLAG_MASK) - return SLOT_HUD_WEAR_MASK - if(SLOT_FLAG_HEAD) - return SLOT_HUD_HEAD - if(SLOT_FLAG_FEET) - return SLOT_HUD_SHOES - if(SLOT_FLAG_ID) - return SLOT_HUD_WEAR_ID - if(SLOT_FLAG_BELT) - return SLOT_HUD_BELT - if(SLOT_FLAG_BACK) - return SLOT_HUD_BACK - if(SLOT_FLAG_PDA) - return SLOT_HUD_WEAR_PDA - if(SLOT_FLAG_TIE) - return SLOT_HUD_TIE - - /** * HTTP Get (Powered by RUSTG) * - * This proc should be used as a replacement for [world.Export()] due to an underlying issue with it. + * This proc should be used as a replacement for [/world/proc/Export] due to an underlying issue with it. * See: https://www.byond.com/forum/post/2772166 * The one thing you will need to be aware of is that this no longer wraps the response inside a "file", so anything that relies on a file2text() unwrap will need tweaking. * RUST HTTP also has better support for HTTPS as well as weird quirks with modern webservers. - * Returns an assoc list that follows the standard [world.Export()] format (https://secure.byond.com/docs/ref/index.html#/world/proc/Export), with the above exception + * Returns an assoc list that follows the standard [/world/proc/Export] format (https://secure.byond.com/docs/ref/index.html#/world/proc/Export), with the above exception * * Arguments: * * url - URL to GET diff --git a/code/_globalvars/lists/mob_lists.dm b/code/_globalvars/lists/mob_lists.dm index c1533ef0fad1f..ec8e6fa4f594d 100644 --- a/code/_globalvars/lists/mob_lists.dm +++ b/code/_globalvars/lists/mob_lists.dm @@ -22,12 +22,14 @@ GLOBAL_LIST_EMPTY(mob_living_list) //all instances of /mob/living and subtypes GLOBAL_LIST_EMPTY(carbon_list) //all instances of /mob/living/carbon and subtypes, notably does not contain simple animals GLOBAL_LIST_EMPTY(human_list) //all instances of /mob/living/carbon/human and subtypes GLOBAL_LIST_EMPTY(alive_mob_list) //List of all alive mobs, including clientless. Excludes /mob/new_player +GLOBAL_LIST_EMPTY(alive_megafauna_list) //List of all living megafauna GLOBAL_LIST_EMPTY(dead_mob_list) //List of all dead mobs, including clientless. Excludes /mob/new_player GLOBAL_LIST_EMPTY(non_respawnable_keys) //List of ckeys that are excluded from respawning for remainder of round. GLOBAL_LIST_INIT(simple_animals, list(list(), list(), list(), list())) //One for each AI_* status define, List of all simple animals, including clientless GLOBAL_LIST_EMPTY(bots_list) //List of all bots(beepsky, medibots,etc) GLOBAL_LIST_EMPTY(roundstart_observer_keys) //List of ckeys who ghosted before the game began. GLOBAL_LIST_EMPTY(antag_hud_users) // ckeys of users who have enabled ahud at some point during the game +GLOBAL_LIST_EMPTY(crew_list) // list of all crew on manifest, contains name paired with their assignment GLOBAL_LIST_EMPTY(surgeries_list) GLOBAL_LIST_EMPTY(hear_radio_list) //Mobs that hear the radio even if there's no client diff --git a/code/_globalvars/lists/reagents_lists.dm b/code/_globalvars/lists/reagents_lists.dm index 17c8e76bc0d24..a9a04f4a0f6aa 100644 --- a/code/_globalvars/lists/reagents_lists.dm +++ b/code/_globalvars/lists/reagents_lists.dm @@ -41,8 +41,8 @@ GLOBAL_LIST_INIT(blocked_chems, list("polonium", "initropidril", "concentrated_i "syndicate_nanites", "ripping_tendrils", "boiling_oil", "envenomed_filaments", "lexorin_jelly", "kinetic", "cryogenic_liquid", "liquid_dark_matter", "b_sorium", - "reagent", "dragonsbreath", "nanocalcium", - "xenomicrobes", "nanomachines", "gibbis", "prions", + "reagent", "drink", "medicine", "plantnutrient", "consumable", "dragonsbreath", + "nanocalcium", "xenomicrobes", "nanomachines", "gibbis", "prions", "spidereggs", "heartworms", "bacon_grease", "fungalspores", "jagged_crystals", "salmonella", "lavaland_extract", "stable_mutagen", "beer2", diff --git a/code/_globalvars/mapping_vars.dm b/code/_globalvars/mapping_vars.dm index 1bca34c679449..82f2d4d3348c0 100644 --- a/code/_globalvars/mapping_vars.dm +++ b/code/_globalvars/mapping_vars.dm @@ -49,5 +49,3 @@ GLOBAL_LIST_EMPTY(space_ruins_templates) GLOBAL_LIST_EMPTY(lava_ruins_templates) GLOBAL_LIST_EMPTY(shelter_templates) GLOBAL_LIST_EMPTY(shuttle_templates) -GLOBAL_LIST_EMPTY(bridge_horizontal_templates) -GLOBAL_LIST_EMPTY(bridge_vertical_templates) diff --git a/code/_onclick/ai_onclick.dm b/code/_onclick/ai_onclick.dm index b08604a130067..3801ae81dd788 100644 --- a/code/_onclick/ai_onclick.dm +++ b/code/_onclick/ai_onclick.dm @@ -109,7 +109,7 @@ if(pixel_turf) turf_visible = GLOB.cameranet.checkTurfVis(pixel_turf) if(!turf_visible) - if(istype(loc, /obj/item/aicard) && (pixel_turf in view(client.view, loc))) + if((istype(loc, /obj/item/aicard) || ismecha(loc)) && (pixel_turf in range(client.view, loc))) turf_visible = TRUE else if(pixel_turf.obscured) diff --git a/code/_onclick/hud/alien_hud.dm b/code/_onclick/hud/alien_hud.dm index ad4e8d2a05c85..3c4bdb328be00 100644 --- a/code/_onclick/hud/alien_hud.dm +++ b/code/_onclick/hud/alien_hud.dm @@ -73,7 +73,7 @@ inv_box.icon = 'icons/mob/screen_alien.dmi' inv_box.icon_state = "hand_r" inv_box.screen_loc = ui_rhand - inv_box.slot_id = SLOT_HUD_RIGHT_HAND + inv_box.slot_id = ITEM_SLOT_RIGHT_HAND static_inventory += inv_box inv_box = new /atom/movable/screen/inventory/hand() @@ -81,7 +81,7 @@ inv_box.icon = 'icons/mob/screen_alien.dmi' inv_box.icon_state = "hand_l" inv_box.screen_loc = ui_lhand - inv_box.slot_id = SLOT_HUD_LEFT_HAND + inv_box.slot_id = ITEM_SLOT_LEFT_HAND static_inventory += inv_box using = new /atom/movable/screen/swap_hand() @@ -143,7 +143,7 @@ for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) inv.hud = src - inv_slots[inv.slot_id] = inv + inv_slots[ITEM_SLOT_2_INDEX(inv.slot_id)] = inv inv.update_icon() /datum/hud/alien/persistent_inventory_update(mob/viewer) diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index b085669097bda..d004fe49e2a36 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -246,6 +246,11 @@ icon_state = "disky" layer = BLIND_LAYER +/atom/movable/screen/fullscreen/center/agent_box + icon = 'icons/obj/cardboard_boxes.dmi' + icon_state = "agentbox" + alpha = 128 + #undef FULLSCREEN_LAYER #undef BLIND_LAYER #undef CRIT_LAYER diff --git a/code/_onclick/hud/hud_datum.dm b/code/_onclick/hud/hud_datum.dm index f3e0b770f9a87..422c9ac57b946 100644 --- a/code/_onclick/hud/hud_datum.dm +++ b/code/_onclick/hud/hud_datum.dm @@ -55,7 +55,7 @@ //the screen objects that display mob info (health, alien plasma, etc...) var/list/infodisplay = list() /// /atom/movable/screen/inventory objects, ordered by their slot ID. - var/list/inv_slots[SLOT_HUD_AMOUNT] + var/list/inv_slots[ITEM_SLOT_AMOUNT] var/list/atom/movable/screen/plane_master/plane_masters = list() // see "appearance_flags" in the ref, assoc list of "[plane]" = object ///Assoc list of controller groups, associated with key string group name with value of the plane master controller ref @@ -205,10 +205,10 @@ screenmob.client.screen += infodisplay //These ones are a part of 'static_inventory', 'toggleable_inventory' or 'hotkeybuttons' but we want them to stay - if(inv_slots[SLOT_HUD_LEFT_HAND]) - screenmob.client.screen += inv_slots[SLOT_HUD_LEFT_HAND] //we want the hands to be visible - if(inv_slots[SLOT_HUD_RIGHT_HAND]) - screenmob.client.screen += inv_slots[SLOT_HUD_RIGHT_HAND] //we want the hands to be visible + if(inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_LEFT_HAND)]) + screenmob.client.screen += inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_LEFT_HAND)] //we want the hands to be visible + if(inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_RIGHT_HAND)]) + screenmob.client.screen += inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_RIGHT_HAND)] //we want the hands to be visible if(action_intent) screenmob.client.screen += action_intent //we want the intent switcher visible action_intent.screen_loc = ui_acti_alt //move this to the alternative position, where zone_select usually is. @@ -227,11 +227,11 @@ if(HUD_STYLE_ACTIONHUD) //No HUD hud_shown = TRUE //Governs behavior of other procs if(static_inventory.len) - mymob.client.screen -= static_inventory + screenmob.client.screen -= static_inventory if(toggleable_inventory.len) - mymob.client.screen -= toggleable_inventory + screenmob.client.screen -= toggleable_inventory if(infodisplay.len) - mymob.client.screen -= infodisplay + screenmob.client.screen -= infodisplay hud_version = display_hud_version persistent_inventory_update(screenmob) diff --git a/code/_onclick/hud/human_hud.dm b/code/_onclick/hud/human_hud.dm index 1f37d8bea0e13..5106817b10064 100644 --- a/code/_onclick/hud/human_hud.dm +++ b/code/_onclick/hud/human_hud.dm @@ -113,7 +113,7 @@ inv_box = new /atom/movable/screen/inventory() inv_box.name = "i_clothing" inv_box.icon = ui_style - inv_box.slot_id = SLOT_HUD_JUMPSUIT + inv_box.slot_id = ITEM_SLOT_JUMPSUIT inv_box.icon_state = "uniform" inv_box.screen_loc = ui_iclothing inv_box.color = ui_color @@ -123,7 +123,7 @@ inv_box = new /atom/movable/screen/inventory() inv_box.name = "o_clothing" inv_box.icon = ui_style - inv_box.slot_id = SLOT_HUD_OUTER_SUIT + inv_box.slot_id = ITEM_SLOT_OUTER_SUIT inv_box.icon_state = "suit" inv_box.screen_loc = ui_oclothing inv_box.color = ui_color @@ -137,7 +137,7 @@ inv_box.color = ui_color inv_box.alpha = ui_alpha inv_box.screen_loc = ui_rhand - inv_box.slot_id = SLOT_HUD_RIGHT_HAND + inv_box.slot_id = ITEM_SLOT_RIGHT_HAND static_inventory += inv_box inv_box = new /atom/movable/screen/inventory/hand() @@ -147,7 +147,7 @@ inv_box.color = ui_color inv_box.alpha = ui_alpha inv_box.screen_loc = ui_lhand - inv_box.slot_id = SLOT_HUD_LEFT_HAND + inv_box.slot_id = ITEM_SLOT_LEFT_HAND static_inventory += inv_box using = new /atom/movable/screen/swap_hand() @@ -173,7 +173,7 @@ inv_box.icon = ui_style inv_box.icon_state = "id" inv_box.screen_loc = ui_id - inv_box.slot_id = SLOT_HUD_WEAR_ID + inv_box.slot_id = ITEM_SLOT_ID inv_box.color = ui_color inv_box.alpha = ui_alpha static_inventory += inv_box @@ -183,7 +183,7 @@ inv_box.icon = ui_style inv_box.icon_state = "pda" inv_box.screen_loc = ui_pda - inv_box.slot_id = SLOT_HUD_WEAR_PDA + inv_box.slot_id = ITEM_SLOT_PDA inv_box.color = ui_color inv_box.alpha = ui_alpha static_inventory += inv_box @@ -193,7 +193,17 @@ inv_box.icon = ui_style inv_box.icon_state = "mask" inv_box.screen_loc = ui_mask - inv_box.slot_id = SLOT_HUD_WEAR_MASK + inv_box.slot_id = ITEM_SLOT_MASK + inv_box.color = ui_color + inv_box.alpha = ui_alpha + toggleable_inventory += inv_box + + inv_box = new /atom/movable/screen/inventory() + inv_box.name = "neck" + inv_box.icon = ui_style + inv_box.icon_state = "neck" + inv_box.screen_loc = ui_neck + inv_box.slot_id = ITEM_SLOT_NECK inv_box.color = ui_color inv_box.alpha = ui_alpha toggleable_inventory += inv_box @@ -203,7 +213,7 @@ inv_box.icon = ui_style inv_box.icon_state = "back" inv_box.screen_loc = ui_back - inv_box.slot_id = SLOT_HUD_BACK + inv_box.slot_id = ITEM_SLOT_BACK inv_box.color = ui_color inv_box.alpha = ui_alpha static_inventory += inv_box @@ -213,7 +223,7 @@ inv_box.icon = ui_style inv_box.icon_state = "pocket" inv_box.screen_loc = ui_storage1 - inv_box.slot_id = SLOT_HUD_LEFT_STORE + inv_box.slot_id = ITEM_SLOT_LEFT_POCKET inv_box.color = ui_color inv_box.alpha = ui_alpha static_inventory += inv_box @@ -223,7 +233,7 @@ inv_box.icon = ui_style inv_box.icon_state = "pocket" inv_box.screen_loc = ui_storage2 - inv_box.slot_id = SLOT_HUD_RIGHT_STORE + inv_box.slot_id = ITEM_SLOT_RIGHT_POCKET inv_box.color = ui_color inv_box.alpha = ui_alpha static_inventory += inv_box @@ -235,7 +245,7 @@ inv_box.color = ui_color inv_box.alpha = ui_alpha inv_box.screen_loc = ui_sstore1 - inv_box.slot_id = SLOT_HUD_SUIT_STORE + inv_box.slot_id = ITEM_SLOT_SUIT_STORE static_inventory += inv_box using = new /atom/movable/screen/resist() @@ -264,7 +274,7 @@ inv_box.icon = ui_style inv_box.icon_state = "gloves" inv_box.screen_loc = ui_gloves - inv_box.slot_id = SLOT_HUD_GLOVES + inv_box.slot_id = ITEM_SLOT_GLOVES inv_box.color = ui_color inv_box.alpha = ui_alpha toggleable_inventory += inv_box @@ -274,7 +284,7 @@ inv_box.icon = ui_style inv_box.icon_state = "glasses" inv_box.screen_loc = ui_glasses - inv_box.slot_id = SLOT_HUD_GLASSES + inv_box.slot_id = ITEM_SLOT_EYES inv_box.color = ui_color inv_box.alpha = ui_alpha toggleable_inventory += inv_box @@ -284,7 +294,7 @@ inv_box.icon = ui_style inv_box.icon_state = "ears" inv_box.screen_loc = ui_l_ear - inv_box.slot_id = SLOT_HUD_LEFT_EAR + inv_box.slot_id = ITEM_SLOT_LEFT_EAR inv_box.color = ui_color inv_box.alpha = ui_alpha toggleable_inventory += inv_box @@ -294,7 +304,7 @@ inv_box.icon = ui_style inv_box.icon_state = "ears" inv_box.screen_loc = ui_r_ear - inv_box.slot_id = SLOT_HUD_RIGHT_EAR + inv_box.slot_id = ITEM_SLOT_RIGHT_EAR inv_box.color = ui_color inv_box.alpha = ui_alpha toggleable_inventory += inv_box @@ -304,7 +314,7 @@ inv_box.icon = ui_style inv_box.icon_state = "head" inv_box.screen_loc = ui_head - inv_box.slot_id = SLOT_HUD_HEAD + inv_box.slot_id = ITEM_SLOT_HEAD inv_box.color = ui_color inv_box.alpha = ui_alpha toggleable_inventory += inv_box @@ -314,7 +324,7 @@ inv_box.icon = ui_style inv_box.icon_state = "shoes" inv_box.screen_loc = ui_shoes - inv_box.slot_id = SLOT_HUD_SHOES + inv_box.slot_id = ITEM_SLOT_SHOES inv_box.color = ui_color inv_box.alpha = ui_alpha toggleable_inventory += inv_box @@ -324,7 +334,7 @@ inv_box.icon = ui_style inv_box.icon_state = "belt" inv_box.screen_loc = ui_belt - inv_box.slot_id = SLOT_HUD_BELT + inv_box.slot_id = ITEM_SLOT_BELT inv_box.color = ui_color inv_box.alpha = ui_alpha static_inventory += inv_box @@ -377,7 +387,7 @@ for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) inv.hud = src - inv_slots[inv.slot_id] = inv + inv_slots[ITEM_SLOT_2_INDEX(inv.slot_id)] = inv inv.update_icon() update_locked_slots() @@ -391,7 +401,7 @@ var/datum/species/S = H.dna.species for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) - if(inv.slot_id in S.no_equip) + if(inv.slot_id & S.no_equip) inv.alpha = hud_alpha / 2 else inv.alpha = hud_alpha @@ -434,6 +444,9 @@ if(H.wear_mask) H.wear_mask.screen_loc = ui_mask screenmob.client.screen += H.wear_mask + if(H.neck) + H.neck.screen_loc = ui_neck + screenmob.client.screen += H.neck if(H.head) H.head.screen_loc = ui_head screenmob.client.screen += H.head @@ -454,6 +467,8 @@ screenmob.client.screen -= H.wear_suit if(H.wear_mask) screenmob.client.screen -= H.wear_mask + if(H.neck) + screenmob.client.screen -= H.neck if(H.head) screenmob.client.screen -= H.head diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 0f46301271f83..44d7539904543 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -403,7 +403,7 @@ if(!user || user != usr) return - if(!hud?.mymob || !slot_id || slot_id == SLOT_HUD_LEFT_HAND || slot_id == SLOT_HUD_RIGHT_HAND) + if(!hud?.mymob || !slot_id || (slot_id & ITEM_SLOT_BOTH_HANDS)) return var/obj/item/holding = user.get_active_hand() @@ -461,7 +461,7 @@ if(!active_overlay) active_overlay = image("icon"=icon, "icon_state"="hand_active") if(!handcuff_overlay) - var/state = (slot_id == SLOT_HUD_RIGHT_HAND) ? "markus" : "gabrielle" + var/state = (slot_id == ITEM_SLOT_RIGHT_HAND) ? "markus" : "gabrielle" handcuff_overlay = image("icon"='icons/mob/screen_gen.dmi', "icon_state"=state) if(hud && hud.mymob) @@ -470,13 +470,13 @@ if(C.handcuffed) . += handcuff_overlay - var/obj/item/organ/external/hand = C.get_organ("[slot_id == SLOT_HUD_LEFT_HAND ? "l" : "r"]_hand") + var/obj/item/organ/external/hand = C.get_organ("[slot_id == ITEM_SLOT_LEFT_HAND ? "l" : "r"]_hand") if(!isalien(C) && (!hand || !hand.is_usable())) . += blocked_overlay - if(slot_id == SLOT_HUD_LEFT_HAND && hud.mymob.hand) + if(slot_id == ITEM_SLOT_LEFT_HAND && hud.mymob.hand) . += active_overlay - else if(slot_id == SLOT_HUD_RIGHT_HAND && !hud.mymob.hand) + else if(slot_id == ITEM_SLOT_RIGHT_HAND && !hud.mymob.hand) . += active_overlay /atom/movable/screen/inventory/hand/Click() diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 097d3c409e62c..6963ca58801cc 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -95,7 +95,7 @@ //stops TK grabs being equipped anywhere but into hands /obj/item/tk_grab/equipped(mob/user, slot) - if((slot == SLOT_HUD_LEFT_HAND) || (slot== SLOT_HUD_RIGHT_HAND)) + if(slot & ITEM_SLOT_BOTH_HANDS) return qdel(src) diff --git a/code/controllers/configuration/sections/general_configuration.dm b/code/controllers/configuration/sections/general_configuration.dm index 40b1729b76031..30e306860f248 100644 --- a/code/controllers/configuration/sections/general_configuration.dm +++ b/code/controllers/configuration/sections/general_configuration.dm @@ -84,6 +84,9 @@ var/revival_brain_life = 10 MINUTES /// Enable random AI lawsets from the default=TRUE pool var/random_ai_lawset = TRUE + /// Enable weather events initialized by SSweather. New weather events can still + /// be added during the round if this is disabled. + var/enable_default_weather_events = TRUE /datum/configuration_section/general_configuration/load_data(list/data) // Use the load wrappers here. That way the default isnt made 'null' if you comment out the config line @@ -117,6 +120,7 @@ CONFIG_LOAD_BOOL(enable_night_shifts, data["enable_night_shifts"]) CONFIG_LOAD_BOOL(reactionary_explosions, data["reactionary_explosions"]) CONFIG_LOAD_BOOL(random_ai_lawset, data["random_ai_lawset"]) + CONFIG_LOAD_BOOL(enable_default_weather_events, data["enable_default_weather_events"]) // Numbers CONFIG_LOAD_NUM(lobby_time, data["lobby_time"]) diff --git a/code/controllers/configuration/sections/ruin_configuration.dm b/code/controllers/configuration/sections/ruin_configuration.dm index a4664b61700cc..cad322a7f522a 100644 --- a/code/controllers/configuration/sections/ruin_configuration.dm +++ b/code/controllers/configuration/sections/ruin_configuration.dm @@ -12,8 +12,14 @@ var/list/active_space_ruins = list() /// List of all active lavaland ruins var/list/active_lava_ruins = list() - /// Budget for lavaland ruins - var/lavaland_ruin_budget = 60 + /// Minimum budget for space ruins + var/space_ruin_budget_min = 750 + /// Maximum budget for space ruins + var/space_ruin_budget_max = 1000 + /// Minimum budget for lavaland ruins + var/lavaland_ruin_budget_min = 175 + /// Maximum budget for lavaland ruins + var/lavaland_ruin_budget_max = 325 /datum/configuration_section/ruin_configuration/load_data(list/data) // Use the load wrappers here. That way the default isnt made 'null' if you comment out the config line @@ -23,4 +29,7 @@ CONFIG_LOAD_NUM(extra_levels_max, data["maximum_zlevels"]) CONFIG_LOAD_LIST(active_space_ruins, data["active_space_ruins"]) CONFIG_LOAD_LIST(active_lava_ruins, data["active_lava_ruins"]) - CONFIG_LOAD_NUM(lavaland_ruin_budget, data["lavaland_ruin_budget"]) + CONFIG_LOAD_NUM(space_ruin_budget_min, data["space_ruin_budget_min"]) + CONFIG_LOAD_NUM(space_ruin_budget_max, data["space_ruin_budget_max"]) + CONFIG_LOAD_NUM(lavaland_ruin_budget_min, data["lavaland_ruin_budget_min"]) + CONFIG_LOAD_NUM(lavaland_ruin_budget_max, data["lavaland_ruin_budget_max"]) diff --git a/code/controllers/subsystem/SSjobs.dm b/code/controllers/subsystem/SSjobs.dm index 850eedbd72460..a4ec500b0081f 100644 --- a/code/controllers/subsystem/SSjobs.dm +++ b/code/controllers/subsystem/SSjobs.dm @@ -560,7 +560,7 @@ SUBSYSTEM_DEF(jobs) //Gives glasses to the vision impaired if(HAS_TRAIT(H, TRAIT_NEARSIGHT)) - var/equipped = H.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(H), SLOT_HUD_GLASSES) + var/equipped = H.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(H), ITEM_SLOT_EYES) if(equipped != 1) var/obj/item/clothing/glasses/G = H.glasses if(istype(G) && !G.prescription) diff --git a/code/controllers/subsystem/SSticker.dm b/code/controllers/subsystem/SSticker.dm index 86ae6cf7e7d43..b3f46527113f5 100644 --- a/code/controllers/subsystem/SSticker.dm +++ b/code/controllers/subsystem/SSticker.dm @@ -141,6 +141,9 @@ SUBSYSTEM_DEF(ticker) // Start a map vote IF // - Map rotate doesnt have a mode for today and map voting is enabled // - Map rotate has a mode for the day and it ISNT full random + if(SSmaprotate.setup_done && (SSmaprotate.rotation_mode == MAPROTATION_MODE_HYBRID_FPTP_NO_DUPLICATES)) + SSmaprotate.decide_next_map() + return if(((!SSmaprotate.setup_done) && GLOB.configuration.vote.enable_map_voting) || (SSmaprotate.setup_done && (SSmaprotate.rotation_mode != MAPROTATION_MODE_FULL_RANDOM))) SSvote.start_vote(new /datum/vote/map) else diff --git a/code/controllers/subsystem/SSweather.dm b/code/controllers/subsystem/SSweather.dm index ace62c0474a83..86e069840699e 100644 --- a/code/controllers/subsystem/SSweather.dm +++ b/code/controllers/subsystem/SSweather.dm @@ -40,6 +40,10 @@ SUBSYSTEM_DEF(weather) next_hit_by_zlevel["[z]"] = world.time + randTime + initial(W.telegraph_duration) /datum/controller/subsystem/weather/Initialize() + if(!GLOB.configuration.general.enable_default_weather_events) + log_debug("disabling default weather events due to configuration") + return + for(var/V in subtypesof(/datum/weather)) var/datum/weather/W = V var/probability = initial(W.probability) diff --git a/code/controllers/subsystem/non_firing/SSatoms.dm b/code/controllers/subsystem/non_firing/SSatoms.dm index fb54196803756..d40c236192ba5 100644 --- a/code/controllers/subsystem/non_firing/SSatoms.dm +++ b/code/controllers/subsystem/non_firing/SSatoms.dm @@ -100,6 +100,8 @@ SUBSYSTEM_DEF(atoms) qdeleted = TRUE else if(!A.initialized) BadInitializeCalls[the_type] |= BAD_INIT_DIDNT_INIT + else + SEND_SIGNAL(A, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE) return qdeleted || QDELING(A) diff --git a/code/controllers/subsystem/non_firing/SSlate_mapping.dm b/code/controllers/subsystem/non_firing/SSlate_mapping.dm index b3e66541577ca..3c8c5f435f660 100644 --- a/code/controllers/subsystem/non_firing/SSlate_mapping.dm +++ b/code/controllers/subsystem/non_firing/SSlate_mapping.dm @@ -29,15 +29,4 @@ SUBSYSTEM_DEF(late_mapping) var/duration = stop_watch(watch) log_startup_progress("Generated [mgcount] mazes in [duration]s") - if(length(bridge_spawners)) - var/watch = start_watch() - log_startup_progress("Spawning bridges...") - - for(var/i in bridge_spawners) - var/obj/effect/spawner/bridge/BS = i - BS.generate_bridge() - - var/list/bscount = length(bridge_spawners) // Keeping track of this here because we wipe it next line down - QDEL_LIST_CONTENTS(bridge_spawners) - var/duration = stop_watch(watch) - log_startup_progress("Spawned [bscount] bridges in [duration]s") + GLOB.spawn_pool_manager.process_pools() diff --git a/code/controllers/subsystem/non_firing/SSmapping.dm b/code/controllers/subsystem/non_firing/SSmapping.dm index 071a255410503..d6a385ff2a49f 100644 --- a/code/controllers/subsystem/non_firing/SSmapping.dm +++ b/code/controllers/subsystem/non_firing/SSmapping.dm @@ -6,6 +6,8 @@ SUBSYSTEM_DEF(mapping) var/datum/map/map_datum /// What map will be used next round var/datum/map/next_map + /// What map was used last round? + var/datum/map/last_map /// List of all areas that can be accessed via IC means var/list/teleportlocs /// List of all areas that can be accessed via IC and OOC means @@ -24,6 +26,11 @@ SUBSYSTEM_DEF(mapping) /// A mapping of environment names to MILLA environment IDs. var/list/environments + /// Ruin placement manager for space levels. + var/datum/ruin_placer/space/space_ruins_placer + /// Ruin placement manager for lavaland levels. + var/datum/ruin_placer/lavaland/lavaland_ruins_placer + // This has to be here because world/New() uses [station_name()], which looks this datum up /datum/controller/subsystem/mapping/PreInit() . = ..() @@ -40,11 +47,26 @@ SUBSYSTEM_DEF(mapping) fdel("data/next_map.txt") // Remove to avoid the same map existing forever else map_datum = new /datum/map/boxstation // Assume cyberiad if non-existent + if(fexists("data/last_map.txt")) + var/list/lines = file2list("data/last_map.txt") + // Check its valid + try + last_map = text2path(lines[1]) + last_map = new last_map + catch + last_map = new /datum/map/cerestation // Assume cerestation if non-existent + fdel("data/last_map.txt") // Remove to avoid the same map existing forever + else + last_map = new /datum/map/cerestation // Assume cerestation if non-existent /datum/controller/subsystem/mapping/Shutdown() if(next_map) // Save map for next round var/F = file("data/next_map.txt") F << next_map.type + if(map_datum) // Save which map was this round as the last map + var/F = file("data/last_map.txt") + F << map_datum.type + /datum/controller/subsystem/mapping/Initialize() environments = list() @@ -91,7 +113,8 @@ SUBSYSTEM_DEF(mapping) // Spawn Lavaland ruins and rivers. log_startup_progress("Populating lavaland...") var/lavaland_setup_timer = start_watch() - seedRuins(list(level_name_to_num(MINING)), GLOB.configuration.ruins.lavaland_ruin_budget, /area/lavaland/surface/outdoors/unexplored, GLOB.lava_ruins_templates) + lavaland_ruins_placer = new() + lavaland_ruins_placer.place_ruins(list(level_name_to_num(MINING))) if(lavaland_theme) lavaland_theme.setup() if(caves_theme) @@ -235,10 +258,10 @@ SUBSYSTEM_DEF(mapping) // Note that this budget is not split evenly accross all zlevels log_startup_progress("Seeding ruins...") var/seed_ruins_timer = start_watch() - var/space_z_levels = levels_by_trait(SPAWN_RUINS) - seedRuins(space_z_levels, rand(20, 30), /area/space, GLOB.space_ruins_templates) + space_ruins_placer = new() + space_ruins_placer.place_ruins(levels_by_trait(SPAWN_RUINS)) log_startup_progress("Successfully seeded ruins in [stop_watch(seed_ruins_timer)]s.") - seed_space_salvage(space_z_levels) + seed_space_salvage(levels_by_trait(SPAWN_RUINS)) // Loads in the station /datum/controller/subsystem/mapping/proc/loadStation() @@ -284,90 +307,6 @@ SUBSYSTEM_DEF(mapping) GLOB.maploader.load_map(file("_maps/map_files220/generic/Lavaland.dmm"), z_offset = lavaland_z_level) // SS220 EDIT - map_files log_startup_progress("Loaded Lavaland in [stop_watch(watch)]s") -/datum/controller/subsystem/mapping/proc/seedRuins(list/z_levels = null, budget = 0, whitelist = /area/space, list/potentialRuins) - if(!z_levels || !length(z_levels)) - WARNING("No Z levels provided - Not generating ruins") - return - - for(var/zl in z_levels) - var/turf/T = locate(1, 1, zl) - if(!T) - WARNING("Z level [zl] does not exist - Not generating ruins") - return - - var/list/ruins = potentialRuins.Copy() - - var/list/forced_ruins = list() //These go first on the z level associated (same random one by default) - var/list/ruins_availible = list() //we can try these in the current pass - var/forced_z //If set we won't pick z level and use this one instead. - - //Set up the starting ruin list - for(var/key in ruins) - var/datum/map_template/ruin/R = ruins[key] - if(R.cost > budget) //Why would you do that - continue - if(R.always_place) - forced_ruins[R] = -1 - if(R.unpickable) - continue - ruins_availible[R] = R.placement_weight - - while(budget > 0 && (length(ruins_availible) || length(forced_ruins))) - var/datum/map_template/ruin/current_pick - var/forced = FALSE - if(length(forced_ruins)) //We have something we need to load right now, so just pick it - for(var/ruin in forced_ruins) - current_pick = ruin - if(forced_ruins[ruin] > 0) //Load into designated z - forced_z = forced_ruins[ruin] - forced = TRUE - break - else //Otherwise just pick random one - current_pick = pickweight(ruins_availible) - - var/placement_tries = PLACEMENT_TRIES - var/failed_to_place = TRUE - var/z_placed = 0 - while(placement_tries > 0) - placement_tries-- - z_placed = pick(z_levels) - if(!current_pick.try_to_place(forced_z ? forced_z : z_placed,whitelist)) - continue - else - failed_to_place = FALSE - break - - //That's done remove from priority even if it failed - if(forced) - //TODO : handle forced ruins with multiple variants - forced_ruins -= current_pick - forced = FALSE - - if(failed_to_place) - for(var/datum/map_template/ruin/R in ruins_availible) - if(R.id == current_pick.id) - ruins_availible -= R - log_world("Failed to place [current_pick.name] ruin.") - else - budget -= current_pick.cost - if(!current_pick.allow_duplicates) - for(var/datum/map_template/ruin/R in ruins_availible) - if(R.id == current_pick.id) - ruins_availible -= R - if(current_pick.never_spawn_with) - for(var/blacklisted_type in current_pick.never_spawn_with) - for(var/possible_exclusion in ruins_availible) - if(istype(possible_exclusion,blacklisted_type)) - ruins_availible -= possible_exclusion - forced_z = 0 - - //Update the availible list - for(var/datum/map_template/ruin/R in ruins_availible) - if(R.cost > budget) - ruins_availible -= R - - log_world("Ruin loader finished with [budget] left to spend.") - /datum/controller/subsystem/mapping/proc/make_maint_all_access() for(var/area/station/maintenance/A in existing_station_areas) for(var/obj/machinery/door/airlock/D in A) diff --git a/code/controllers/subsystem/non_firing/SSmaprotate.dm b/code/controllers/subsystem/non_firing/SSmaprotate.dm index 34040c84a9215..1086890d75bf6 100644 --- a/code/controllers/subsystem/non_firing/SSmaprotate.dm +++ b/code/controllers/subsystem/non_firing/SSmaprotate.dm @@ -24,6 +24,7 @@ SUBSYSTEM_DEF(maprotate) rotation_descs[MAPROTATION_MODE_NORMAL_VOTE] = "there is normal map voting." rotation_descs[MAPROTATION_MODE_NO_DUPLICATES] = "map votes will not include the current map." rotation_descs[MAPROTATION_MODE_FULL_RANDOM] = "the map for next round is randomised." + rotation_descs[MAPROTATION_MODE_HYBRID_FPTP_NO_DUPLICATES] = "the map for next round is weighted off your preferences and past maps" // Yes. I am using the DB server to get a numerical weekday // 0 = Monday @@ -60,7 +61,7 @@ SUBSYSTEM_DEF(maprotate) if(dindex_str in GLOB.configuration.vote.map_vote_day_types) var/vote_type = GLOB.configuration.vote.map_vote_day_types[dindex_str] // We have an index, but is it valid - if(vote_type in list(MAPROTATION_MODE_NORMAL_VOTE, MAPROTATION_MODE_NO_DUPLICATES, MAPROTATION_MODE_FULL_RANDOM)) + if(vote_type in list(MAPROTATION_MODE_NORMAL_VOTE, MAPROTATION_MODE_NO_DUPLICATES, MAPROTATION_MODE_FULL_RANDOM, MAPROTATION_MODE_HYBRID_FPTP_NO_DUPLICATES)) log_startup_progress("It is [days[day_index]], which means [rotation_descs[vote_type]]") rotation_mode = vote_type setup_done = TRUE @@ -73,4 +74,41 @@ SUBSYSTEM_DEF(maprotate) else log_startup_progress("There is no special rotation defined for this day") - +/datum/controller/subsystem/maprotate/proc/decide_next_map() + var/list/potential_maps = list() + for(var/x in subtypesof(/datum/map)) + var/datum/map/M = x + if(!initial(M.voteable)) + continue + // And of course, if the current map is the same + if(istype(SSmapping.map_datum, M)) + continue + // Or the map from last round + if(istype(SSmapping.last_map, M)) + continue + potential_maps[M] = 0 + // We now have 3 maps. We then pick your highest priority map in the list. Does this mean votes 4 and 5 don't matter? Yeah, with this current system only your top 3 votes will ever be used. 4 and 5 are good info to know however! + for(var/client/user_client in GLOB.clients) + for(var/preferred_text as anything in user_client.prefs.map_vote_pref_json) // stored as a list of text + var/datum/map/preferred_map = text2path(preferred_text) + if(isnull(preferred_map)) // this map datum doesn't exist!! + continue + if(preferred_map in potential_maps) + potential_maps[preferred_map]++ + break + var/list/returned_text = list("Map Preference Vote Results:") + var/list/pickable_maps = list() + for(var/possible_next_map in potential_maps) + var/votes = potential_maps[possible_next_map] + var/percentage_text = "" + if(votes > 0) + var/actual_percentage = round((votes / length(GLOB.clients)) * 100, 0.1) // Note: Some players will not have this filled out. Too bad. + percentage_text += "[add_lspace(actual_percentage, 5 - length("[actual_percentage]"))]%" + pickable_maps[possible_next_map] = votes + returned_text += "[percentage_text] | [possible_next_map]: [potential_maps[possible_next_map]]" + if(!length(pickable_maps)) + pickable_maps = potential_maps // potential_maps should probably be renamed to `available_maps` or `voteable_maps` + var/datum/map/winner = pickweight(pickable_maps) // Even if no one votes, pickweight will pick from them evenly. This means a map with zero votes *can* be chosen + to_chat(world, "[returned_text.Join("\n")]") + SSmapping.next_map = new winner + to_chat(world, "Map for next round: [SSmapping.next_map.fluff_name] ([SSmapping.next_map.technical_name])") diff --git a/code/datums/action.dm b/code/datums/action.dm index 197f34763880e..cb552deec3752 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -616,6 +616,10 @@ var/obj/item/voice_changer/V = target V.set_voice(usr) +/datum/action/item_action/herald + name = "Mirror Walk" + desc = "Use near a mirror to enter it." + // for clothing accessories like holsters /datum/action/item_action/accessory check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_LYING|AB_CHECK_CONSCIOUS @@ -637,9 +641,6 @@ name = "View Storage" -/datum/action/item_action/accessory/herald - name = "Mirror Walk" - desc = "Use near a mirror to enter it." //Preset for spells /datum/action/spell_action diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index 46852784a0fba..8108bf3f430cf 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -137,6 +137,9 @@ symbol = "\[LOOC] " size ||= "small" output_color = "gray" + if(RUNECHAT_SYMBOL_DEAD) + symbol = null + output_color = "#b826b3" else symbol = null diff --git a/code/datums/components/decal.dm b/code/datums/components/decal.dm deleted file mode 100644 index b0cc7617e3c20..0000000000000 --- a/code/datums/components/decal.dm +++ /dev/null @@ -1,75 +0,0 @@ -/datum/component/decal - dupe_mode = COMPONENT_DUPE_ALLOWED - can_transfer = TRUE - var/cleanable - var/description - var/mutable_appearance/pic - - var/first_dir // This only stores the dir arg from init - -/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable = CLEAN_GOD, _color, _layer = TURF_LAYER, _description, _alpha = 255) - if(!isatom(parent) || !generate_appearance(_icon, _icon_state, _dir, _layer, _color, _alpha)) - return COMPONENT_INCOMPATIBLE - first_dir = _dir - description = _description - cleanable = _cleanable - - apply() - -/datum/component/decal/RegisterWithParent() - if(first_dir) - RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, PROC_REF(rotate_react)) - if(cleanable) - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean_react)) - if(description) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) - -/datum/component/decal/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_ATOM_DIR_CHANGE, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_PARENT_EXAMINE)) - -/datum/component/decal/Destroy() - remove() - return ..() - -/datum/component/decal/PreTransfer() - remove() - -/datum/component/decal/PostTransfer() - remove() - apply() - -/datum/component/decal/proc/generate_appearance(_icon, _icon_state, _dir, _layer, _color, _alpha) - if(!_icon || !_icon_state) - return FALSE - // It has to be made from an image or dir breaks because of a byond bug - var/temp_image = image(_icon, null, _icon_state, _layer, _dir) - pic = new(temp_image) - pic.color = _color - pic.alpha = _alpha - return TRUE - -/datum/component/decal/proc/apply(atom/thing) - var/atom/master = thing || parent - master.add_overlay(pic, TRUE) - if(isitem(master)) - addtimer(CALLBACK(master, TYPE_PROC_REF(/obj/item, update_slot_icon)), 0, TIMER_UNIQUE) - -/datum/component/decal/proc/remove(atom/thing) - var/atom/master = thing || parent - master.cut_overlay(pic, TRUE) - if(isitem(master)) - addtimer(CALLBACK(master, TYPE_PROC_REF(/obj/item, update_slot_icon)), 0, TIMER_UNIQUE) - -/datum/component/decal/proc/rotate_react(datum/source, old_dir, new_dir) - if(old_dir == new_dir) - return - remove() - pic.dir = turn(pic.dir, dir2angle(old_dir) - dir2angle(new_dir)) - apply() - -/datum/component/decal/proc/clean_react(datum/source, strength) - if(strength >= cleanable) - qdel(src) - -/datum/component/decal/proc/examine(datum/source, mob/user, list/examine_list) - examine_list += description diff --git a/code/datums/components/label.dm b/code/datums/components/label.dm index eba55631c5a5b..c76e2ca97210e 100644 --- a/code/datums/components/label.dm +++ b/code/datums/components/label.dm @@ -22,11 +22,12 @@ apply_label() /datum/component/label/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackby)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(Examine)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attack_by)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_NAME, PROC_REF(on_update_name)) /datum/component/label/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_PARENT_ATTACKBY, COMSIG_PARENT_EXAMINE)) + UnregisterSignal(parent, list(COMSIG_PARENT_ATTACKBY, COMSIG_PARENT_EXAMINE, COMSIG_ATOM_UPDATE_NAME)) /** This proc will fire after the parent is hit by a hand labeler which is trying to apply another label. @@ -51,7 +52,8 @@ * attacker: The object that is hitting the parent. * user: The mob who is wielding the attacking object. */ -/datum/component/label/proc/OnAttackby(datum/source, obj/item/attacker, mob/user) +/datum/component/label/proc/on_attack_by(datum/source, obj/item/attacker, mob/user) + SIGNAL_HANDLER // COMSIG_PARENT_ATTACKBY // If the attacking object is not a hand labeler or it's not off (has a label ready to apply), return. // The hand labeler should be off in order to remove a label. var/obj/item/hand_labeler/labeler = attacker @@ -72,7 +74,14 @@ * user: The mob exmaining the parent. * examine_list: The current list of text getting passed from the parent's normal examine() proc. */ -/datum/component/label/proc/Examine(datum/source, mob/user, list/examine_list) + +///Reapplies label when update_name is called on the parent object. Attempts to remove it first just in case. +/datum/component/label/proc/on_update_name() + SIGNAL_HANDLER // COMSIG_ATOM_UPDATE_NAME + remove_label() + apply_label() + +/datum/component/label/proc/on_examine(datum/source, mob/user, list/examine_list) examine_list += "It has a label with some words written on it. Use a hand labeler to remove it." /// Applies a label to the name of the parent in the format of: "parent_name (label)" @@ -96,7 +105,7 @@ return ..() /// Adds detailed information to the examine text. -/datum/component/label/goal/Examine(datum/source, mob/user, list/examine_list) +/datum/component/label/goal/on_examine(datum/source, mob/user, list/examine_list) examine_list += "It has a label on it, marking it as part of a secondary goal for [label_name]. Use a hand labeler to remove it." /// Applies a static label to the parent's name. diff --git a/code/datums/components/parry.dm b/code/datums/components/parry.dm index b2e55c3b02067..be9f3e13d6cd1 100644 --- a/code/datums/components/parry.dm +++ b/code/datums/components/parry.dm @@ -67,7 +67,7 @@ /datum/component/parry/proc/equipped(datum/source, mob/user, slot) SIGNAL_HANDLER - if(slot in list(SLOT_HUD_LEFT_HAND, SLOT_HUD_RIGHT_HAND)) + if(slot & ITEM_SLOT_BOTH_HANDS) RegisterSignal(user, COMSIG_HUMAN_PARRY, PROC_REF(start_parry)) else UnregisterSignal(user, COMSIG_HUMAN_PARRY) diff --git a/code/datums/components/shielded.dm b/code/datums/components/shielded.dm index adbe78c3b7f34..59eb0cd7ce820 100644 --- a/code/datums/components/shielded.dm +++ b/code/datums/components/shielded.dm @@ -111,7 +111,7 @@ /datum/component/shielded/proc/on_equipped(datum/source, mob/user, slot) SIGNAL_HANDLER - if((slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND) && !shield_inhand) + if((slot & ITEM_SLOT_BOTH_HANDS) && !shield_inhand) lost_wearer(source, user) return set_wearer(user) diff --git a/code/datums/components/two_handed.dm b/code/datums/components/two_handed.dm index 5c4ebd73490f5..63c3108efe3e2 100644 --- a/code/datums/components/two_handed.dm +++ b/code/datums/components/two_handed.dm @@ -126,7 +126,7 @@ /datum/component/two_handed/proc/on_equip(datum/source, mob/user, slot) SIGNAL_HANDLER // COMSIG_ITEM_EQUIPPED - if(require_twohands && (slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND)) // force equip the item + if(require_twohands && (slot & ITEM_SLOT_BOTH_HANDS)) // force equip the item INVOKE_ASYNC(src, PROC_REF(wield), user) if(!user.is_holding(parent) && wielded && !require_twohands) INVOKE_ASYNC(src, PROC_REF(unwield), user) @@ -277,7 +277,7 @@ parent_item.update_appearance() if(istype(user)) // tk showed that we might not have a mob here - if(user.get_item_by_slot(SLOT_HUD_BACK) == parent) + if(user.get_item_by_slot(ITEM_SLOT_BACK) == parent) user.update_inv_back() else user.update_inv_l_hand() diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 56a2029797f13..4f0059b543c79 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -150,6 +150,7 @@ GLOBAL_VAR_INIT(record_id_num, 1001) assignment = H.job else assignment = "Unassigned" + GLOB.crew_list[H.real_name] = assignment var/id = num2hex(GLOB.record_id_num++, 6) diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index 24ed6a56aecf1..5a9015d758735 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -102,8 +102,8 @@ if(isobj(H.wear_suit)) Cl = H.wear_suit passed = prob((Cl.permeability_coefficient*100) - 1) - if(passed && isobj(SLOT_HUD_JUMPSUIT)) - Cl = SLOT_HUD_JUMPSUIT + if(passed && isobj(ITEM_SLOT_JUMPSUIT)) + Cl = ITEM_SLOT_JUMPSUIT passed = prob((Cl.permeability_coefficient*100) - 1) if(3) if(isobj(H.wear_suit) && H.wear_suit.body_parts_covered&HANDS) diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index 89dd88ee35ff8..0f8a1cdf896c9 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -45,15 +45,15 @@ if(!istype(H)) // Xenos don't have masks. They can still feel silly though return - if(!H.has_organ_for_slot(SLOT_HUD_WEAR_MASK) || !H.canUnEquip(H.get_item_by_slot(SLOT_HUD_WEAR_MASK))) + if(!H.has_organ_for_slot(ITEM_SLOT_MASK) || !H.canUnEquip(H.get_item_by_slot(ITEM_SLOT_MASK))) return var/saved_internals = H.internal - H.unEquip(H.get_item_by_slot(SLOT_HUD_WEAR_MASK)) + H.unEquip(H.get_item_by_slot(ITEM_SLOT_MASK)) var/obj/item/clothing/mask/gas/clown_hat/peak_comedy = new peak_comedy.flags |= DROPDEL - H.equip_to_slot_or_del(peak_comedy, SLOT_HUD_WEAR_MASK) + H.equip_to_slot_or_del(peak_comedy, ITEM_SLOT_MASK) if(saved_internals) // Let's not stealthily suffocate Vox/Plasmamen, this isn't a murder virus H.internal = saved_internals diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index 22c02a187095f..c09c90f834aa9 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -10,7 +10,7 @@ viable_mobtypes = list(/mob/living/carbon/human) permeability_mod = 0.75 severity = MINOR - /// A mapping of `num2text(SLOT_HUD_XYZ)` -> item path + /// A mapping of `num2text(ITEM_SLOT_XYZ)` -> item path var/list/magic_fashion = list() @@ -18,11 +18,11 @@ . = ..() var/list/magic_fashion_slot_IDs = list( - SLOT_HUD_RIGHT_HAND, - SLOT_HUD_LEFT_HAND, - SLOT_HUD_HEAD, - SLOT_HUD_OUTER_SUIT, - SLOT_HUD_SHOES + ITEM_SLOT_LEFT_HAND, + ITEM_SLOT_RIGHT_HAND, + ITEM_SLOT_HEAD, + ITEM_SLOT_OUTER_SUIT, + ITEM_SLOT_SHOES ) var/list/magic_fashion_items = list( /obj/item/staff, @@ -78,7 +78,7 @@ continue switch(slot_ID) // Extra filtering for specific slots - if(SLOT_HUD_HEAD) + if(ITEM_SLOT_HEAD) if(isplasmaman(H)) continue // We want them to spread the magical joy, not burn to death in agony diff --git a/code/datums/elements/decal_element.dm b/code/datums/elements/decal_element.dm new file mode 100644 index 0000000000000..c15e9f43a480c --- /dev/null +++ b/code/datums/elements/decal_element.dm @@ -0,0 +1,177 @@ +// NOTE: +// This is an incredibly piecemeal port of /tg/'s decal element. +// It does not include several pieces of functionality that exist in /tg/. +// +// Namely: +// - It does not support smoothing decals +// - It does not send a signal when a decal is detached (used for trapdoors on /tg/) +// - It does not support custom plane configuration as this behavior seems primarily concerned with multi-z + +/datum/element/decal + element_flags = ELEMENT_BESPOKE|ELEMENT_DETACH_ON_HOST_DESTROY + argument_hash_start_idx = 2 + /// Whether this decal can be cleaned. + var/cleanable + /// A description this decal appends to the target's examine message. + var/description + /// If true this was initialized with no set direction - will follow the parent dir. + var/directional + /// The base icon state that this decal was initialized with. + var/base_icon_state + /// The overlay applied by this decal to the target. + var/mutable_appearance/pic + +/datum/element/decal/Attach(atom/target, _icon, _icon_state, _dir, _layer=TURF_LAYER, _alpha=255, _color, _cleanable=FALSE, _description, mutable_appearance/_pic) + . = ..() + if(!isatom(target)) + return ELEMENT_INCOMPATIBLE + if(_pic) + pic = _pic + else if(!generate_appearance(_icon, _icon_state, _dir, _layer, _color, _alpha, target)) + return ELEMENT_INCOMPATIBLE + description = _description + cleanable = _cleanable + directional = _dir + base_icon_state = _icon_state + + RegisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_overlay), TRUE) + if(target.initialized) + target.update_appearance(UPDATE_OVERLAYS) //could use some queuing here now maybe. + else + RegisterSignal(target, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE, PROC_REF(late_update_icon), TRUE) + if(isitem(target)) + INVOKE_ASYNC(target, TYPE_PROC_REF(/obj/item/, update_slot_icon), TRUE) + if(_dir) + RegisterSignal(target, COMSIG_ATOM_DECALS_ROTATING, PROC_REF(shuttle_rotate), TRUE) + SSdcs.RegisterSignal(target, COMSIG_ATOM_DIR_CHANGE, TYPE_PROC_REF(/datum/controller/subsystem/processing/dcs, rotate_decals), override=TRUE) + if(_cleanable) + RegisterSignal(target, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean_react), TRUE) + if(_description) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(examine), TRUE) + + RegisterSignal(target, COMSIG_TURF_ON_SHUTTLE_MOVE, PROC_REF(shuttle_move_react), TRUE) + +/// Remove old decals and apply new decals after rotation as necessary +/datum/controller/subsystem/processing/dcs/proc/rotate_decals(datum/source, old_dir, new_dir) + SIGNAL_HANDLER // COMSIG_ATOM_DIR_CHANGE + + if(old_dir == new_dir) + return + + var/list/datum/element/decal/old_decals = list() //instances + SEND_SIGNAL(source, COMSIG_ATOM_DECALS_ROTATING, old_decals) + + if(!length(old_decals)) + UnregisterSignal(source, COMSIG_ATOM_DIR_CHANGE) + return + + var/list/resulting_decals_params = list() // param lists + for(var/datum/element/decal/rotating as anything in old_decals) + resulting_decals_params += list(rotating.get_rotated_parameters(old_dir,new_dir)) + + //Instead we could generate ids and only remove duplicates to save on churn on four-corners symmetry ? + for(var/datum/element/decal/decal in old_decals) + decal.Detach(source) + + for(var/result in resulting_decals_params) + source.AddElement(/datum/element/decal, result["icon"], result["icon_state"], result["dir"], result["layer"], result["alpha"], result["color"], result["cleanable"], result["desc"]) + +/datum/element/decal/proc/get_rotated_parameters(old_dir,new_dir) + var/rotation = 0 + if(directional) //Even when the dirs are the same rotation is coming out as not 0 for some reason + rotation = SIMPLIFY_DEGREES(dir2angle(new_dir)-dir2angle(old_dir)) + new_dir = turn(pic.dir,-rotation) + return list( + "icon" = pic.icon, + "icon_state" = base_icon_state, + "dir" = new_dir, + "plane" = pic.plane, + "layer" = pic.layer, + "alpha" = pic.alpha, + "color" = pic.color, + "cleanable" = cleanable, + "desc" = description + ) + +/datum/element/decal/proc/late_update_icon(atom/source) + SIGNAL_HANDLER // COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE + + if(istype(source) && !(source.flags_2 & DECAL_INIT_UPDATE_EXPERIENCED_2)) + source.flags_2 |= DECAL_INIT_UPDATE_EXPERIENCED_2 + source.update_appearance(UPDATE_OVERLAYS) + UnregisterSignal(source, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE) + +/** + * If the decal was not given an appearance, it will generate one based on the other given arguments. + * element won't be compatible if it cannot do either + * all args are fed into creating an image, they are byond vars for images you'll recognize in the byond docs + * (except source, source is the object whose appearance we're copying.) + */ +/datum/element/decal/proc/generate_appearance(_icon, _icon_state, _dir, _layer, _color, _alpha, source) + if(!_icon || !_icon_state) + return FALSE + var/temp_image = image(_icon, null, _icon_state, _layer, _dir) + pic = new(temp_image) + pic.color = _color + pic.alpha = _alpha + return TRUE + +/datum/element/decal/Detach(atom/source) + UnregisterSignal(source, list( + COMSIG_ATOM_DIR_CHANGE, + COMSIG_COMPONENT_CLEAN_ACT, + COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_UPDATE_OVERLAYS, + COMSIG_TURF_ON_SHUTTLE_MOVE, + COMSIG_ATOM_DECALS_ROTATING + )) + SSdcs.UnregisterSignal(source, COMSIG_ATOM_DIR_CHANGE) + source.update_appearance(UPDATE_OVERLAYS) + if(isitem(source)) + INVOKE_ASYNC(source, TYPE_PROC_REF(/obj/item/, update_slot_icon)) + return ..() + +/datum/element/decal/proc/apply_overlay(atom/source) + SIGNAL_HANDLER // COMSIG_ATOM_UPDATE_OVERLAYS + + source.add_overlay(pic) + // TODO: Fix this disgusting hack + // + // `COMSIG_ATOM_UPDATE_OVERLAYS` is sent at the end of + // /atom/proc/update_icon's stanza for updating overlays, instead + // somewhere useful, like, during it. /tg/ handles this by sending + // a list of overlays with the signal, allowing receivers to add to + // the list, instead of returning their own. + // + // This is much saner and more flexible, but would require refactoring + // many many uses of update_overlay() across the code base, which is left + // as an exercise for the next poor sap to touch this code (probably me). + if(source.managed_overlays && !islist(source.managed_overlays)) + source.managed_overlays = list(source.managed_overlays, pic) + else + LAZYDISTINCTADD(source.managed_overlays, pic) + +/datum/element/decal/proc/clean_react(datum/source, clean_types) + SIGNAL_HANDLER // COMSIG_COMPONENT_CLEAN_ACT + + if(clean_types & cleanable) + Detach(source) + return COMPONENT_CLEANED + return NONE + +/datum/element/decal/proc/examine(datum/source, mob/user, list/examine_list) + SIGNAL_HANDLER // COMSIG_PARENT_EXAMINE + + examine_list += description + +/datum/element/decal/proc/shuttle_move_react(datum/source, turf/new_turf) + SIGNAL_HANDLER // COMSIG_TURF_ON_SHUTTLE_MOVE + + if(new_turf == source) + return + Detach(source) + new_turf.AddElement(type, pic.icon, base_icon_state, directional, pic.layer, pic.alpha, pic.color, cleanable, description) + +/datum/element/decal/proc/shuttle_rotate(datum/source, list/datum/element/decal/rotating) + SIGNAL_HANDLER // COMSIG_ATOM_DECALS_ROTATING + rotating += src diff --git a/code/datums/elements/earhealing.dm b/code/datums/elements/earhealing.dm index 80104ece9d4ea..bfd96c8ee89f7 100644 --- a/code/datums/elements/earhealing.dm +++ b/code/datums/elements/earhealing.dm @@ -20,7 +20,7 @@ /datum/element/earhealing/proc/equippedChanged(datum/source, mob/living/carbon/user, slot) SIGNAL_HANDLER - if(((slot == SLOT_HUD_LEFT_EAR) || (slot == SLOT_HUD_RIGHT_EAR)) && istype(user)) + if((slot & ITEM_SLOT_BOTH_EARS) && istype(user)) user_by_item[source] = user else user_by_item -= source diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index 5ad2ad814cf6c..ce26ce82eb352 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -181,7 +181,7 @@ /// A preset for equipping items onto mob slots /datum/strippable_item/mob_item_slot - /// The SLOT_FLAG_* to equip to. + /// The ITEM_SLOT_* to equip to. var/item_slot /datum/strippable_item/mob_item_slot/get_item(atom/source) @@ -230,7 +230,7 @@ /datum/strippable_item/mob_item_slot/get_obscuring(atom/source) if(ishuman(source)) var/mob/living/carbon/human/human_source = source - if(item_slot in human_source.check_obscured_slots()) + if(item_slot & human_source.check_obscured_slots()) return STRIPPABLE_OBSCURING_COMPLETELY return STRIPPABLE_OBSCURING_NONE diff --git a/code/datums/helper_datums/map_template.dm b/code/datums/helper_datums/map_template.dm index 59fb398fe6c3c..ff159e7d63ca2 100644 --- a/code/datums/helper_datums/map_template.dm +++ b/code/datums/helper_datums/map_template.dm @@ -121,7 +121,6 @@ preloadRuinTemplates() preloadShelterTemplates() preloadShuttleTemplates() - preloadBridgeTemplates() preloadEventTemplates() /proc/preloadRuinTemplates() @@ -169,22 +168,6 @@ GLOB.shuttle_templates[S.shuttle_id] = S GLOB.map_templates[S.shuttle_id] = S -/proc/preloadBridgeTemplates() - for(var/item in subtypesof(/datum/map_template/ruin/bridge/horizontal)) - var/datum/map_template/ruin/bridge/horizontal/horizontal_type = item - if(!(initial(horizontal_type.suffix))) - continue - var/datum/map_template/ruin/bridge/horizontal/S = new horizontal_type() - GLOB.bridge_horizontal_templates[S.suffix] = S - GLOB.map_templates[S.suffix] = S - for(var/item in subtypesof(/datum/map_template/ruin/bridge/vertical)) - var/datum/map_template/ruin/bridge/horizontal/vertical_type = item - if(!(initial(vertical_type.suffix))) - continue - var/datum/map_template/ruin/bridge/vertical/V = new vertical_type() - GLOB.bridge_vertical_templates[V.suffix] = V - GLOB.map_templates[V.suffix] = V - /proc/preloadEventTemplates() for(var/item in subtypesof(/datum/map_template/event)) var/datum/map_template/event/event_type = item diff --git a/code/datums/keybindings/human_keybinds.dm b/code/datums/keybindings/human_keybinds.dm index 0005d17efb9e6..956a408c57e65 100644 --- a/code/datums/keybindings/human_keybinds.dm +++ b/code/datums/keybindings/human_keybinds.dm @@ -11,7 +11,7 @@ /datum/keybinding/human/bag_equip/down(client/C) . = ..() var/mob/living/carbon/human/M = C.mob - M.quick_equip_item(SLOT_HUD_BACK) + M.quick_equip_item(ITEM_SLOT_BACK) /datum/keybinding/human/belt_equip name = "Equip Held Object To Belt" @@ -20,7 +20,7 @@ /datum/keybinding/human/belt_equip/down(client/C) . = ..() var/mob/living/carbon/human/M = C.mob - M.quick_equip_item(SLOT_HUD_BELT) + M.quick_equip_item(ITEM_SLOT_BELT) /datum/keybinding/human/suit_equip name = "Equip Held Object To Suit Storage" @@ -29,7 +29,7 @@ /datum/keybinding/human/suit_equip/down(client/C) . = ..() var/mob/living/carbon/human/M = C.mob - M.quick_equip_item(SLOT_HUD_SUIT_STORE) + M.quick_equip_item(ITEM_SLOT_SUIT_STORE) /datum/keybinding/human/toggle_holster name = "Toggle Holster" diff --git a/code/datums/mind.dm b/code/datums/mind.dm index a7e43be06ff81..f40b8fdb3e16b 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -240,7 +240,7 @@ return FALSE /** - * Gets every objective this mind owns, including all of those from any antag datums they have, and returns them as a list. + * Gets every objective this mind owns, including all of those from any antag datums and teams they have, and returns them as a list. */ /datum/mind/proc/get_all_objectives(include_team = TRUE) var/list/all_objectives = list() @@ -248,11 +248,7 @@ all_objectives += objective_holder.get_objectives() // Get their personal objectives for(var/datum/antagonist/A as anything in antag_datums) - all_objectives += A.objective_holder.get_objectives() // Add all antag datum objectives. - if(include_team) - var/datum/team/team = A.get_team() - if(team) // have to make asure a team exists here, team?. does not work below because it will add the null to the list - all_objectives += team.objective_holder.get_objectives() // Get all of their teams' objectives + all_objectives += A.get_antag_objectives(include_team) // Add all antag datum objectives, and possibly antag team objectives // For custom non-antag role teams // SS220 EDIT START - Commented for #840 @@ -283,9 +279,9 @@ if(!remove_from_everything) return for(var/datum/antagonist/A as anything in antag_datums) - A.objective_holder.remove_objective(O) // Add all antag datum objectives. + A.remove_antag_objective(O) var/datum/team/team = A.get_team() - team?.objective_holder.remove_objective(O) // Get all of their teams' objectives + team?.objective_holder.remove_objective(O) /datum/mind/proc/_memory_edit_header(gamemode, list/alt) . = gamemode diff --git a/code/datums/ores.dm b/code/datums/ores.dm index 7e0747669ab1d..7774a485cff32 100644 --- a/code/datums/ores.dm +++ b/code/datums/ores.dm @@ -108,6 +108,9 @@ /// Note that this is only for explosions caused while the gibtonite is still /// unmined, in contrast to [/obj/item/gibtonite/proc/GibtoniteReaction]. var/notify_admins = FALSE + /// The callback for the explosion that occurs if the gibtonite is not + /// defused in time. + var/explosion_callback /datum/ore/gibtonite/New() // So you don't know exactly when the hot potato will explode @@ -135,7 +138,7 @@ RegisterSignal(source, COMSIG_PARENT_ATTACKBY, PROC_REF(on_parent_attackby)) detonate_start_time = world.time - addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/ore/gibtonite, detonate), source), detonate_time) + explosion_callback = addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/ore/gibtonite, detonate), source), detonate_time, TIMER_STOPPABLE) /datum/ore/gibtonite/on_mine(turf/source, mob/user, triggered_by_explosion = FALSE) switch(stage) @@ -146,7 +149,8 @@ if(GIBTONITE_ACTIVE) detonate(source) - return MINERAL_ALLOW_DIG + // Detonation takes care of this for us. + return MINERAL_PREVENT_DIG if(GIBTONITE_STABLE) var/obj/item/gibtonite/gibtonite = new(source) if(remaining_time <= 0) @@ -172,6 +176,10 @@ if(stage == GIBTONITE_STABLE) return + // Don't explode twice please + if(explosion_callback) + deltimer(explosion_callback) + stage = GIBTONITE_DETONATE explosion(source, 1, 3, 5, adminlog = notify_admins) diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index 6b481b09daaf4..8cacc854158a0 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -10,6 +10,7 @@ var/shoes = null var/head = null var/mask = null + var/neck = null var/l_ear = null var/r_ear = null var/glasses = null @@ -70,29 +71,31 @@ //Start with uniform,suit,backpack for additional slots if(uniform) - equip_item(H, uniform, SLOT_HUD_JUMPSUIT) + equip_item(H, uniform, ITEM_SLOT_JUMPSUIT) if(suit) - equip_item(H, suit, SLOT_HUD_OUTER_SUIT) + equip_item(H, suit, ITEM_SLOT_OUTER_SUIT) if(back) - equip_item(H, back, SLOT_HUD_BACK) + equip_item(H, back, ITEM_SLOT_BACK) if(belt) - equip_item(H, belt, SLOT_HUD_BELT) + equip_item(H, belt, ITEM_SLOT_BELT) if(gloves) - equip_item(H, gloves, SLOT_HUD_GLOVES) + equip_item(H, gloves, ITEM_SLOT_GLOVES) if(shoes) - equip_item(H, shoes, SLOT_HUD_SHOES) + equip_item(H, shoes, ITEM_SLOT_SHOES) if(head) - equip_item(H, head, SLOT_HUD_HEAD) + equip_item(H, head, ITEM_SLOT_HEAD) if(mask) - equip_item(H, mask, SLOT_HUD_WEAR_MASK) + equip_item(H, mask, ITEM_SLOT_MASK) + if(neck) + equip_item(H, neck, ITEM_SLOT_NECK) if(l_ear) - equip_item(H, l_ear, SLOT_HUD_LEFT_EAR) + equip_item(H, l_ear, ITEM_SLOT_LEFT_EAR) if(r_ear) - equip_item(H, r_ear, SLOT_HUD_RIGHT_EAR) + equip_item(H, r_ear, ITEM_SLOT_RIGHT_EAR) if(glasses) - equip_item(H, glasses, SLOT_HUD_GLASSES) + equip_item(H, glasses, ITEM_SLOT_EYES) if(id) - equip_item(H, id, SLOT_HUD_WEAR_ID) + equip_item(H, id, ITEM_SLOT_ID) if(!H.head && toggle_helmet && istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit)) var/obj/item/clothing/suit/space/hardsuit/HS = H.wear_suit @@ -102,7 +105,7 @@ C.quick_activation() if(suit_store) - equip_item(H, suit_store, SLOT_HUD_SUIT_STORE) + equip_item(H, suit_store, ITEM_SLOT_SUIT_STORE) if(l_hand) H.put_in_l_hand(new l_hand(H)) @@ -110,7 +113,7 @@ H.put_in_r_hand(new r_hand(H)) if(pda) - equip_item(H, pda, SLOT_HUD_WEAR_PDA) + equip_item(H, pda, ITEM_SLOT_PDA) if(uniform) for(var/path in accessories) @@ -120,9 +123,9 @@ if(!visualsOnly) // Items in pockets or backpack don't show up on mob's icon. if(l_pocket) - equip_item(H, l_pocket, SLOT_HUD_LEFT_STORE) + equip_item(H, l_pocket, ITEM_SLOT_LEFT_POCKET) if(r_pocket) - equip_item(H, r_pocket, SLOT_HUD_RIGHT_STORE) + equip_item(H, r_pocket, ITEM_SLOT_RIGHT_POCKET) if(box) if(!backpack_contents) @@ -135,7 +138,7 @@ if(!number) number = 1 for(var/i in 1 to number) - H.equip_or_collect(new path(H), SLOT_HUD_IN_BACKPACK) + H.equip_or_collect(new path(H), ITEM_SLOT_IN_BACKPACK) for(var/path in cybernetic_implants) var/obj/item/organ/internal/O = new path @@ -172,6 +175,8 @@ H.wear_suit.add_fingerprint(H, 1) if(H.wear_mask) H.wear_mask.add_fingerprint(H, 1) + if(H.neck) + H.neck.add_fingerprint(H, 1) if(H.head) H.head.add_fingerprint(H, 1) if(H.shoes) @@ -199,7 +204,7 @@ return 1 /datum/outfit/proc/get_chameleon_disguise_info() - var/list/types = list(uniform, suit, back, belt, gloves, shoes, head, mask, l_ear, r_ear, glasses, id, l_pocket, r_pocket, suit_store, r_hand, l_hand, pda) + var/list/types = list(uniform, suit, back, belt, gloves, shoes, head, mask, neck, l_ear, r_ear, glasses, id, l_pocket, r_pocket, suit_store, r_hand, l_hand, pda) types += chameleon_extras listclearnulls(types) return types @@ -225,6 +230,7 @@ shoes = text2path(outfit_data["shoes"]) head = text2path(outfit_data["head"]) mask = text2path(outfit_data["mask"]) + neck = text2path(outfit_data["neck"]) l_ear = text2path(outfit_data["l_ear"]) r_ear = text2path(outfit_data["r_ear"]) glasses = text2path(outfit_data["glasses"]) @@ -281,6 +287,7 @@ .["shoes"] = shoes .["head"] = head .["mask"] = mask + .["neck"] = neck .["l_ear"] = l_ear .["r_ear"] = r_ear .["glasses"] = glasses diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index b995fdf05fcce..a5cbbab2bb637 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -589,8 +589,8 @@ return H.real_name = "[capitalize(pick(GLOB.first_names_soviet))] [capitalize(pick(GLOB.last_names_soviet))]" H.name = H.real_name - H.add_language("Neo-Russkiya") - H.set_default_language(GLOB.all_languages["Neo-Russkiya"]) + H.add_language("Neo-Russkiya") // SS220 EDIT - Zvezhan -> Neo-Russkiya + H.set_default_language(GLOB.all_languages["Neo-Russkiya"]) // SS220 EDIT - Zvezhan -> Neo-Russkiya var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, list(ACCESS_MAINT_TUNNELS), name) @@ -1251,7 +1251,7 @@ if(istype(C)) C.name = "ancient robes" C.hood.name = "ancient hood" - H.equip_to_slot_or_del(C, SLOT_HUD_IN_BACKPACK) + H.equip_to_slot_or_del(C, ITEM_SLOT_IN_BACKPACK) var/obj/item/card/id/I = H.wear_id if(istype(I)) @@ -1293,7 +1293,7 @@ if(istype(C)) C.name = "ancient robes" C.hood.name = "ancient hood" - H.equip_to_slot_or_del(C, SLOT_HUD_IN_BACKPACK) + H.equip_to_slot_or_del(C, ITEM_SLOT_IN_BACKPACK) var/obj/item/card/id/I = H.wear_id if(istype(I)) @@ -1606,7 +1606,7 @@ H.update_dna() H.wear_mask.adjustmask(H) // push it back on the head - equip_item(H, /obj/item/clothing/mask/cigarette/cigar, SLOT_HUD_WEAR_MASK) // get them their cigar + equip_item(H, /obj/item/clothing/mask/cigarette/cigar, ITEM_SLOT_MASK) // get them their cigar if(istype(H.glasses, /obj/item/clothing/glasses)) // this is gonna be always true var/obj/item/clothing/glasses/glassass = H.glasses glassass.over_mask = TRUE diff --git a/code/datums/outfits/outfit_debug.dm b/code/datums/outfits/outfit_debug.dm index 40ad60665c7d6..32aaff8de2f4b 100644 --- a/code/datums/outfits/outfit_debug.dm +++ b/code/datums/outfits/outfit_debug.dm @@ -22,7 +22,7 @@ id = /obj/item/card/id/admin pda = /obj/item/pda/centcom - internals_slot = SLOT_HUD_SUIT_STORE + internals_slot = ITEM_SLOT_SUIT_STORE toggle_helmet = TRUE cybernetic_implants = list( diff --git a/code/datums/outfits/vv_outfit.dm b/code/datums/outfits/vv_outfit.dm index 36401cb41fd3e..43aebaeaa2fcc 100644 --- a/code/datums/outfits/vv_outfit.dm +++ b/code/datums/outfits/vv_outfit.dm @@ -11,37 +11,39 @@ /datum/outfit/varedit/proc/set_equipment_by_slot(slot, item_path) switch(slot) - if(SLOT_HUD_JUMPSUIT) + if(ITEM_SLOT_JUMPSUIT) uniform = item_path - if(SLOT_HUD_BACK) + if(ITEM_SLOT_BACK) back = item_path - if(SLOT_HUD_OUTER_SUIT) + if(ITEM_SLOT_OUTER_SUIT) suit = item_path - if(SLOT_HUD_BELT) + if(ITEM_SLOT_BELT) belt = item_path - if(SLOT_HUD_GLOVES) + if(ITEM_SLOT_GLOVES) gloves = item_path - if(SLOT_HUD_SHOES) + if(ITEM_SLOT_SHOES) shoes = item_path - if(SLOT_HUD_HEAD) + if(ITEM_SLOT_HEAD) head = item_path - if(SLOT_HUD_WEAR_MASK) + if(ITEM_SLOT_MASK) mask = item_path - if(SLOT_HUD_LEFT_EAR) + if(ITEM_SLOT_NECK) + neck = item_path + if(ITEM_SLOT_LEFT_EAR) l_ear = item_path - if(SLOT_HUD_RIGHT_EAR) + if(ITEM_SLOT_RIGHT_EAR) r_ear = item_path - if(SLOT_HUD_GLASSES) + if(ITEM_SLOT_EYES) glasses = item_path - if(SLOT_HUD_WEAR_ID) + if(ITEM_SLOT_ID) id = item_path - if(SLOT_HUD_WEAR_PDA) + if(ITEM_SLOT_PDA) pda = item_path - if(SLOT_HUD_SUIT_STORE) + if(ITEM_SLOT_SUIT_STORE) suit_store = item_path - if(SLOT_HUD_LEFT_STORE) + if(ITEM_SLOT_LEFT_POCKET) l_pocket = item_path - if(SLOT_HUD_RIGHT_STORE) + if(ITEM_SLOT_RIGHT_POCKET) r_pocket = item_path @@ -70,7 +72,7 @@ // Copy equipment var/list/result = list() - var/list/slots_to_check = list(SLOT_HUD_JUMPSUIT, SLOT_HUD_BACK, SLOT_HUD_OUTER_SUIT, SLOT_HUD_BELT, SLOT_HUD_GLOVES, SLOT_HUD_SHOES, SLOT_HUD_HEAD, SLOT_HUD_WEAR_MASK, SLOT_HUD_LEFT_EAR, SLOT_HUD_RIGHT_EAR, SLOT_HUD_GLASSES, SLOT_HUD_WEAR_ID, SLOT_HUD_WEAR_PDA, SLOT_HUD_SUIT_STORE, SLOT_HUD_LEFT_STORE, SLOT_HUD_RIGHT_STORE) + var/list/slots_to_check = list(ITEM_SLOT_JUMPSUIT, ITEM_SLOT_BACK, ITEM_SLOT_OUTER_SUIT, ITEM_SLOT_BELT, ITEM_SLOT_GLOVES, ITEM_SLOT_SHOES, ITEM_SLOT_HEAD, ITEM_SLOT_MASK, ITEM_SLOT_LEFT_EAR, ITEM_SLOT_RIGHT_EAR, ITEM_SLOT_EYES, ITEM_SLOT_ID, ITEM_SLOT_PDA, ITEM_SLOT_SUIT_STORE, ITEM_SLOT_LEFT_POCKET, ITEM_SLOT_RIGHT_POCKET, ITEM_SLOT_NECK) for(var/s in slots_to_check) var/obj/item/I = get_item_by_slot(s) var/vedits = collect_vv(I) @@ -81,7 +83,7 @@ // Copy access O.stored_access = list() - var/obj/item/id_slot = get_item_by_slot(SLOT_HUD_WEAR_ID) + var/obj/item/id_slot = get_item_by_slot(ITEM_SLOT_ID) if(id_slot) O.stored_access |= id_slot.GetAccess() var/obj/item/card/id/ID = id_slot.GetID() @@ -105,7 +107,7 @@ O.vv_values = result // Copy backpack contents if exist. - var/obj/item/backpack = get_item_by_slot(SLOT_HUD_BACK) + var/obj/item/backpack = get_item_by_slot(ITEM_SLOT_BACK) if(istype(backpack) && LAZYLEN(backpack.contents) > 0) var/list/typecounts = list() for(var/obj/item/I in backpack) @@ -129,7 +131,7 @@ O.cybernetic_implants |= aug.type // Copy accessories - var/obj/item/clothing/under/uniform_slot = get_item_by_slot(SLOT_HUD_JUMPSUIT) + var/obj/item/clothing/under/uniform_slot = get_item_by_slot(ITEM_SLOT_JUMPSUIT) if(uniform_slot) O.accessories = list() for(var/obj/item/clothing/accessory/A in uniform_slot.accessories) @@ -160,7 +162,7 @@ I.vv_edit_var(vname,edits[vname]) // Apply access - var/obj/item/id_slot = H.get_item_by_slot(SLOT_HUD_WEAR_ID) + var/obj/item/id_slot = H.get_item_by_slot(ITEM_SLOT_ID) if(!id_slot) return diff --git a/code/datums/revision.dm b/code/datums/revision.dm index cd0ba8e414389..66addb3da6ead 100644 --- a/code/datums/revision.dm +++ b/code/datums/revision.dm @@ -91,6 +91,11 @@ GLOBAL_PROTECT(revision_info) // Dont mess with this msg += "Информация о сервере" // Round ID first msg += "Номер раунда: [GLOB.round_id ? GLOB.round_id : "NULL"]" + #ifdef PARADISE_PRODUCTION_HARDWARE + msg += "Production-hardware specific compile: Yes" + #else + msg += "Production-hardware specific compile: No" + #endif // Commit info if(GLOB.revision_info.commit_hash && GLOB.revision_info.commit_date && GLOB.configuration.url.github_url) @@ -103,7 +108,9 @@ GLOBAL_PROTECT(revision_info) // Dont mess with this msg += "RUST-G Build: [rustg_get_version()]" if(world.TgsAvailable()) - msg += "TGS Version: [world.TgsVersion()] (API: [world.TgsApiVersion()])" + var/datum/tgs_version/tgs_ver = world.TgsVersion() + var/datum/tgs_version/api_ver = world.TgsApiVersion() + msg += "TGS Version: [tgs_ver.deprefixed_parameter] (API: [api_ver.deprefixed_parameter])" if(world.TgsAvailable() && length(GLOB.revision_info.testmerges)) msg += "Активные тестовые обновления:" diff --git a/code/datums/ruins.dm b/code/datums/ruins.dm index 7cfc24fdd16a1..76462159b292d 100644 --- a/code/datums/ruins.dm +++ b/code/datums/ruins.dm @@ -10,7 +10,6 @@ var/unpickable = FALSE //If TRUE these won't be placed automatically (can still be forced or loaded with another ruin) var/always_place = FALSE //Will skip the whole weighting process and just plop this down, ideally you want the ruins of this kind to have no cost. var/placement_weight = 1 //How often should this ruin appear - var/cost = 0 //Cost in ruin budget placement system var/allow_duplicates = TRUE var/list/never_spawn_with = null //If this ruin is spawned these will not eg list(/datum/map_template/ruin/base_alternate) @@ -23,3 +22,12 @@ mappath = prefix + suffix ..(path = mappath) + +/// The cost of a ruin is the square root of the product of its dimensions. +/// This encodes the size of the ruin relative to each other without the +/// numbers getting ridiculous. +/datum/map_template/ruin/proc/get_cost() + if(!width || !height) + CRASH("cost of [name]/[suffix] requested before loaded size") + + return floor(sqrt(width * height)) diff --git a/code/datums/ruins/bridges/bridges.dm b/code/datums/ruins/bridges/bridges.dm index 6d5770419a3c4..3f991b3a867e2 100644 --- a/code/datums/ruins/bridges/bridges.dm +++ b/code/datums/ruins/bridges/bridges.dm @@ -1,87 +1,237 @@ -/datum/map_template/ruin/bridge - prefix = "_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/" - ci_exclude = /datum/map_template/ruin/bridge - -/datum/map_template/ruin/bridge/horizontal - ci_exclude = /datum/map_template/ruin/bridge/horizontal - -/datum/map_template/ruin/bridge/horizontal/one - name = "Horizontal Bridge One" - suffix = "lavaland_bridge_horizontal_1.dmm" - -/datum/map_template/ruin/bridge/horizontal/two - name = "Horizontal Bridge Two" - suffix = "lavaland_bridge_horizontal_2.dmm" - -/datum/map_template/ruin/bridge/horizontal/three - name = "Horizontal Bridge Three" - suffix = "lavaland_bridge_horizontal_3.dmm" - -/datum/map_template/ruin/bridge/horizontal/four - name = "Horizontal Bridge Four" - suffix = "lavaland_bridge_horizontal_4.dmm" - -/datum/map_template/ruin/bridge/horizontal/five - name = "Horizontal Bridge Five" - suffix = "lavaland_bridge_horizontal_5.dmm" - -/datum/map_template/ruin/bridge/horizontal/six - name = "Horizontal Bridge Six" - suffix = "lavaland_bridge_horizontal_6.dmm" - -/datum/map_template/ruin/bridge/vertical - ci_exclude = /datum/map_template/ruin/bridge/vertical - -/datum/map_template/ruin/bridge/vertical/one - name = "Vertical Bridge One" - suffix = "lavaland_bridge_vertical_1.dmm" - -/datum/map_template/ruin/bridge/vertical/two - name = "Vertical Bridge Two" - suffix = "lavaland_bridge_vertical_2.dmm" - -/datum/map_template/ruin/bridge/vertical/three - name = "Vertical Bridge Three" - suffix = "lavaland_bridge_vertical_3.dmm" - -/datum/map_template/ruin/bridge/vertical/four - name = "Vertical Bridge Four" - suffix = "lavaland_bridge_vertical_4.dmm" - -/datum/map_template/ruin/bridge/vertical/five - name = "Vertical Bridge Five" - suffix = "lavaland_bridge_vertical_5.dmm" - -/datum/map_template/ruin/bridge/vertical/six - name = "Vertical Bridge Six" - suffix = "lavaland_bridge_vertical_6.dmm" - -/obj/effect/spawner/bridge - name = "Bridge spawner" - var/datum/map_template/ruin/bridge/template - -/obj/effect/spawner/bridge/Initialize(mapload) +#define LONG_BRIDGE_THEME_CULT "cult" +#define LONG_BRIDGE_THEME_HIERO "hiero" +#define LONG_BRIDGE_THEME_CLOCKWORK "clockwork" +#define LONG_BRIDGE_THEME_STONE "stone" +#define LONG_BRIDGE_THEME_WOOD "wood" +#define LONG_BRIDGE_THEME_CATWALK "catwalk" + +/** + * A spawner for dynamic bridges, largely with hardcoded expectations to be + * operating on Lavaland. + * + * It does this by starting at its spawn point, placed by a + * [/datum/river_spawner] during generation, and walking in each direction + * "forwards" and "backwards" until it reaches the maximum possible length of + * the bridge, or a tile that doesn't appear to be a valid "passage" + * (essentially a tile that doesn't have lava on both sides and thus wouldn't + * look good or make an effective bridge). If it manages to do this and find two + * tiles that work as the start and end of the bridge, it places the paths, + * pillars, and "cleans up" the tiles contiguous to its entrance and exit turfs, + * removing any lava if present. + * + * It attempts this first in the vertical direction, and then the horizontal. So + * "fowards" and "backwards" can mean NORTH/SOUTH or EAST/WEST depending on the + * direction it's attempting. + * + * There are several bridge "themes" implemented in `make_walkway()` and + * `make_pillar()`, and more can be added if desired. + */ +/obj/effect/spawner/dynamic_bridge + var/max_length = 8 + var/min_length = 4 + var/bridge_theme = LONG_BRIDGE_THEME_CULT + var/list/forwards_backwards + var/list/side_to_side + +/obj/effect/spawner/dynamic_bridge/Initialize(mapload) . = ..() - SSlate_mapping.bridge_spawners += src - -/obj/effect/spawner/bridge/Destroy() - SSlate_mapping.bridge_spawners -= src - return ..() - -/obj/effect/spawner/bridge/proc/generate_bridge() - var/turf/east = locate(x + 3, y, z) - var/turf/west = locate(x - 3, y, z) - var/turf/north = locate(x, y + 3, z) - var/turf/south = locate(x, y - 3, z) - var/turf/e1 = locate(x + 1, y, z) - var/turf/w1 = locate(x - 1, y, z) - var/turf/n1 = locate(x, y + 1, z) - var/turf/s1 = locate(x, y - 1, z) - - - if((ismineralturf(east) || istype(east, /turf/simulated/floor/plating/asteroid)) && (ismineralturf(west) || istype(west, /turf/simulated/floor/plating/asteroid)) && !(ismineralturf(n1) || istype(n1, /turf/simulated/floor/plating/asteroid)) && !(ismineralturf(s1) || istype(s1, /turf/simulated/floor/plating/asteroid))) - template = GLOB.bridge_horizontal_templates[pick("lavaland_bridge_horizontal_1.dmm", "lavaland_bridge_horizontal_2.dmm", "lavaland_bridge_horizontal_3.dmm", "lavaland_bridge_horizontal_4.dmm", "lavaland_bridge_horizontal_5.dmm", "lavaland_bridge_horizontal_6.dmm")] - template.load(loc, centered = TRUE) - else if((ismineralturf(north) || istype(north, /turf/simulated/floor/plating/asteroid)) && (ismineralturf(south) || istype(south, /turf/simulated/floor/plating/asteroid)) && !(ismineralturf(e1) || istype(e1, /turf/simulated/floor/plating/asteroid)) && !(ismineralturf(w1) || istype(w1, /turf/simulated/floor/plating/asteroid))) - template = GLOB.bridge_vertical_templates[pick("lavaland_bridge_vertical_1.dmm", "lavaland_bridge_vertical_2.dmm", "lavaland_bridge_vertical_3.dmm", "lavaland_bridge_vertical_4.dmm", "lavaland_bridge_vertical_5.dmm", "lavaland_bridge_vertical_6.dmm")] - template.load(loc, centered = TRUE) + bridge_theme = pick( + LONG_BRIDGE_THEME_CULT, + LONG_BRIDGE_THEME_HIERO, + LONG_BRIDGE_THEME_CLOCKWORK, + LONG_BRIDGE_THEME_STONE, + LONG_BRIDGE_THEME_WOOD, + LONG_BRIDGE_THEME_CATWALK, + ) + return INITIALIZE_HINT_LATELOAD + +/obj/effect/spawner/dynamic_bridge/LateInitialize() + forwards_backwards = list(NORTH, SOUTH) + side_to_side = list(EAST, WEST) + if(!attempt_bridge()) + forwards_backwards = list(EAST, WEST) + side_to_side = list(NORTH, SOUTH) + attempt_bridge() + + qdel(src) + +/// Returns whether the passed in turf is a valid "landing". A valid landing is +/// a tile that hasn't been reserved by another bridge, and has a non-lava tile +/// leading directly to it. +/obj/effect/spawner/dynamic_bridge/proc/valid_landing(turf/T, direction) + if(T.flags & LAVA_BRIDGE || T.flags & NO_LAVA_GEN) + return FALSE + + var/turf/end = get_step(T, direction) + if(end.flags & LAVA_BRIDGE || !(ismineralturf(end) || istype(end, /turf/simulated/floor/plating/asteroid))) + return FALSE + + return TRUE + +/// Returns whether the passed in turf is a valid "passage". A valid passage is +/// a lava tile that has lava on both sides of it. Invalid passage tiles do not +/// look good as bridge walkways and defeat the purpose of there is floor right +/// next to it. +/obj/effect/spawner/dynamic_bridge/proc/valid_passage(turf/T) + if(T.flags & LAVA_BRIDGE) + return FALSE + if(!istype(T, /turf/simulated/floor/lava/mapping_lava)) + return FALSE + if(!istype(get_step(T, side_to_side[1]), /turf/simulated/floor/lava/mapping_lava)) + return FALSE + if(!istype(get_step(T, side_to_side[2]), /turf/simulated/floor/lava/mapping_lava)) + return FALSE + + return TRUE + +/obj/effect/spawner/dynamic_bridge/proc/make_pillar(turf/T) + for(var/obj/structure/spawner/S in T) + qdel(S) + for(var/mob/living/M in T) + qdel(M) + for(var/obj/structure/flora/F in T) + qdel(F) + + switch(bridge_theme) + if(LONG_BRIDGE_THEME_CULT) + T.ChangeTurf(/turf/simulated/wall/cult) + if(LONG_BRIDGE_THEME_HIERO) + T.ChangeTurf(/turf/simulated/wall/indestructible/hierophant) + if(LONG_BRIDGE_THEME_CLOCKWORK) + T.ChangeTurf(/turf/simulated/wall/clockwork) + if(LONG_BRIDGE_THEME_STONE) + T.ChangeTurf(/turf/simulated/wall/cult) + if(LONG_BRIDGE_THEME_WOOD) + T.ChangeTurf(/turf/simulated/wall/mineral/wood/nonmetal) + if(LONG_BRIDGE_THEME_CATWALK) + new /obj/structure/lattice/catwalk/mining(T) + new /obj/structure/marker_beacon/dock_marker/collision(T) + + T.flags |= LAVA_BRIDGE + +/obj/effect/spawner/dynamic_bridge/proc/make_walkway(turf/T) + for(var/obj/structure/spawner/S in T) + qdel(S) + for(var/mob/living/M in T) + qdel(M) + for(var/obj/structure/flora/F in T) + qdel(F) + + switch(bridge_theme) + if(LONG_BRIDGE_THEME_CULT) + T.ChangeTurf(/turf/simulated/floor/engine/cult/lavaland_air) + if(LONG_BRIDGE_THEME_HIERO) + T.ChangeTurf(/turf/simulated/floor/indestructible/hierophant) + if(LONG_BRIDGE_THEME_CLOCKWORK) + T.ChangeTurf(/turf/simulated/floor/clockwork/lavaland_air) + if(LONG_BRIDGE_THEME_STONE) + // Stone tiles are different sizes and shapes so these are + // "safe-looking" arrangements + switch(rand(1, 5)) + if(1) + new /obj/structure/stone_tile/block(T) + var/obj/structure/stone_tile/block/cracked/C = new(T) + C.dir = NORTH + if(2) + new /obj/structure/stone_tile/slab(T) + if(3) + new /obj/structure/stone_tile/surrounding(T) + new /obj/structure/stone_tile/center(T) + if(4) + new /obj/structure/stone_tile/slab/cracked(T) + if(5) + new /obj/structure/stone_tile/burnt(T) + var/obj/structure/stone_tile/surrounding_tile/ST = new(T) + ST.dir = WEST + var/obj/structure/stone_tile/block/B = new(T) + B.dir = NORTH + if(LONG_BRIDGE_THEME_WOOD) + T.ChangeTurf(/turf/simulated/floor/wood/lavaland_air) + if(prob(20)) + new /obj/effect/mapping_helpers/turfs/damage(T) + if(LONG_BRIDGE_THEME_CATWALK) + new /obj/structure/lattice/catwalk/mining(T) + + T.flags |= LAVA_BRIDGE + +/// Make a tile safe for player passage, for use at the bridge entrance and exits +/obj/effect/spawner/dynamic_bridge/proc/cleanup_edge(turf/T) + if(istype(T, /turf/simulated/floor/lava/mapping_lava)) + T.ChangeTurf(/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface) + T.icon_state = "basalt" // hate + +/obj/effect/spawner/dynamic_bridge/proc/attempt_bridge() + var/count = 1 + var/walk_dir = forwards_backwards[1] + var/turf/forward_step = get_turf(src) + var/turf/backward_step = get_turf(src) + var/turf/forward_goal + var/turf/backward_goal + var/bad_passage = FALSE + + while(count <= max_length && !(forward_goal && backward_goal) && !bad_passage) + if(walk_dir == forwards_backwards[1]) + if(!forward_goal) + if(out_of_bounds(walk_dir, forward_step)) + break // Out of bounds + forward_step = get_step(forward_step, walk_dir) + if(valid_landing(forward_step, walk_dir)) + forward_goal = forward_step + else if(!valid_passage(forward_step)) + bad_passage = TRUE + count++ + walk_dir = forwards_backwards[2] + else + if(!backward_goal) + if(out_of_bounds(walk_dir, backward_step)) + break // Out of bounds + backward_step = get_step(backward_step, walk_dir) + if(valid_landing(backward_step, walk_dir)) + backward_goal = backward_step + else if(!valid_passage(backward_step)) + bad_passage = TRUE + count++ + walk_dir = forwards_backwards[1] + + if(!bad_passage && count >= min_length && forward_goal && backward_goal) + for(var/turf/T in get_line(forward_goal, backward_goal)) + make_walkway(T) + for(var/turf/T in list( + get_step(forward_goal, side_to_side[1]), + get_step(forward_goal, side_to_side[2]), + get_step(backward_goal, side_to_side[1]), + get_step(backward_goal, side_to_side[2]))) + make_pillar(T) + for(var/turf/T in get_line( + get_step(get_step(forward_goal, side_to_side[1]), forwards_backwards[1]), + get_step(get_step(forward_goal, side_to_side[2]), forwards_backwards[1]))) + cleanup_edge(T) + for(var/turf/T in get_line( + get_step(get_step(backward_goal, side_to_side[1]), forwards_backwards[2]), + get_step(get_step(backward_goal, side_to_side[2]), forwards_backwards[2]))) + cleanup_edge(T) + + return TRUE + +/// Checks if we are going out of bounds. Returns TRUE if we are close (less than or equal to 2 turfs) to a border +/obj/effect/spawner/dynamic_bridge/proc/out_of_bounds(direction, turf/current_turf) + if(!direction || !current_turf) + return TRUE + + switch(direction) + if(NORTH) + return current_turf.y >= world.maxy - 2 + if(EAST) + return current_turf.x >= world.maxx - 2 + if(SOUTH) + return current_turf.y <= 2 + if(WEST) + return current_turf.x <= 2 + return TRUE + +#undef LONG_BRIDGE_THEME_CULT +#undef LONG_BRIDGE_THEME_HIERO +#undef LONG_BRIDGE_THEME_CLOCKWORK +#undef LONG_BRIDGE_THEME_STONE +#undef LONG_BRIDGE_THEME_WOOD +#undef LONG_BRIDGE_THEME_CATWALK diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index de957d20cec7e..e6ffaba8c9112 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -3,7 +3,6 @@ ci_exclude = /datum/map_template/ruin/lavaland /datum/map_template/ruin/lavaland/biodome - cost = 5 allow_duplicates = FALSE ci_exclude = /datum/map_template/ruin/lavaland/biodome // This is a parent holder, not a ruin itself @@ -36,7 +35,6 @@ Probably best to stay clear." suffix = "lavaland_surface_ash_walker1.dmm" allow_duplicates = FALSE - cost = 20 // Not auto due to the nature of walkers /datum/map_template/ruin/lavaland/free_golem name = "Free Golem Ship" @@ -52,7 +50,6 @@ id = "althland-facility" description = "A grim testament to the Althland Mining Company's ambitions, this facility lies in ruin, swallowed by the very planet it sought to exploit. \ Once a beacon of mining promise, it now stands as a stark reminder of the company's catastrophic demise." - cost = 5 suffix = "lavaland_surface_althland_facility.dmm" allow_duplicates = FALSE @@ -61,12 +58,10 @@ id = "althland-excavation" description = "An abandoned mining pit, once operated by the late Althland Mining Corporation, stands as a testament to the extensive efforts of numerous labor groups who endeavored to exploit the ore-rich depths of the planet. \ Now, it lies abandoned, wholly reclaimed by the hostile environment, transforming into yet another relic of a lost company." - cost = 5 suffix = "lavaland_surface_althland_excavation.dmm" allow_duplicates = FALSE /datum/map_template/ruin/lavaland/sin - cost = 10 allow_duplicates = FALSE ci_exclude = /datum/map_template/ruin/lavaland/sin // This is a parent holder, not a ruin itself @@ -99,14 +94,12 @@ id = "sloth" description = "..." suffix = "lavaland_surface_sloth.dmm" - cost = 0 /datum/map_template/ruin/lavaland/ratvar name = "Dead God" id = "ratvar" description = "Ratvars final resting place." suffix = "lavaland_surface_dead_ratvar.dmm" - cost = 0 allow_duplicates = FALSE /datum/map_template/ruin/lavaland/hierophant @@ -122,7 +115,6 @@ id = "blooddrunk" description = "A strange arrangement of stone tiles and an insane, beastly miner contemplating them." suffix = "lavaland_surface_blooddrunk1.dmm" - cost = 0 allow_duplicates = FALSE //will only spawn one variant of the ruin /datum/map_template/ruin/lavaland/blood_drunk_miner/guardian @@ -138,7 +130,6 @@ id = "ufo-crash" description = "Turns out that keeping your abductees unconscious is really important. Who knew?" suffix = "lavaland_surface_ufo_crash.dmm" - cost = 5 /datum/map_template/ruin/lavaland/xeno_nest name = "Xenomorph Nest" @@ -146,21 +137,19 @@ description = "These xenomorphs got bored of horrifically slaughtering people on space stations, and have settled down on a nice lava filled hellscape to focus on what's really important in life. \ Quality memes." suffix = "lavaland_surface_xeno_nest.dmm" - cost = 20 /datum/map_template/ruin/lavaland/fountain name = "Fountain Hall" id = "fountain" description = "The fountain has a warning on the side. DANGER: May have undeclared side effects that only become obvious when implemented." suffix = "lavaland_surface_fountain_hall.dmm" - cost = 5 + /datum/map_template/ruin/lavaland/survivalcapsule name = "Survival Capsule Ruins" id = "survivalcapsule" description = "What was once sanctuary to the common miner, is now their tomb." suffix = "lavaland_surface_survivalpod.dmm" - cost = 5 /datum/map_template/ruin/lavaland/pizza name = "Ruined Pizza Party" @@ -168,7 +157,6 @@ description = "Little Timmy's birthday pizza-bash took a turn for the worse when a bluespace anomaly passed by." suffix = "lavaland_surface_pizzaparty.dmm" allow_duplicates = FALSE - cost = 5 /datum/map_template/ruin/lavaland/cultaltar name = "Summoning Ritual" @@ -176,7 +164,6 @@ description = "A place of vile worship, the scrawling of blood in the middle glowing eerily. A demonic laugh echoes throughout the caverns" suffix = "lavaland_surface_cultaltar.dmm" allow_duplicates = FALSE - cost = 10 /datum/map_template/ruin/lavaland/hermit name = "Makeshift Shelter" @@ -192,21 +179,18 @@ description = "A heavily-damaged mining ripley, property of a very unfortunate miner. You might have to do a bit of work to fix this thing up." suffix = "lavaland_surface_random_ripley.dmm" allow_duplicates = FALSE - cost = 5 /datum/map_template/ruin/lavaland/puzzle name = "Ancient Puzzle" id = "puzzle" description = "Mystery to be solved." suffix = "lavaland_surface_puzzle.dmm" - cost = 5 /datum/map_template/ruin/lavaland/tumor name = "Elite Tumor" id = "tumor" description = "The victor freed, the loser the next fighter. The ghosts, the endless spectators. And thus the cycle loops..." suffix = "lavaland_surface_elite_tumor.dmm" - cost = 5 always_place = TRUE /datum/map_template/ruin/lavaland/monster_nest @@ -215,14 +199,12 @@ description = "A cave of several tunnels, housing the local fauna deep underground." suffix = "lavaland_surface_monster_nest.dmm" allow_duplicates = FALSE - cost = 5 /datum/map_template/ruin/lavaland/watcher_grave name = "Watchers' Grave" id = "watcher-grave" description = "A lonely cave where an orphaned child awaits a new parent." suffix = "lavaland_surface_watcher_grave.dmm" - cost = 5 allow_duplicates = FALSE /datum/map_template/ruin/lavaland/shuttlecrash @@ -230,5 +212,4 @@ id = "shuttlecrash" description = "A passenger shuttle crashsite of indeterminate origin." suffix = "lavaland_surface_shuttlecrash.dmm" - cost = 5 allow_duplicates = FALSE diff --git a/code/datums/ruins/ruin_placer.dm b/code/datums/ruins/ruin_placer.dm new file mode 100644 index 0000000000000..3f0d80bb4a67a --- /dev/null +++ b/code/datums/ruins/ruin_placer.dm @@ -0,0 +1,108 @@ +/datum/ruin_placer + var/ruin_budget + var/area_whitelist + var/list/templates + +/datum/ruin_placer/proc/place_ruins(z_levels) + if(!z_levels || !length(z_levels)) + WARNING("No Z levels provided - Not generating ruins") + return + + for(var/zl in z_levels) + var/turf/T = locate(1, 1, zl) + if(!T) + WARNING("Z level [zl] does not exist - Not generating ruins") + return + + var/list/ruins = templates.Copy() + + var/list/forced_ruins = list() //These go first on the z level associated (same random one by default) + var/list/ruins_availible = list() //we can try these in the current pass + var/forced_z //If set we won't pick z level and use this one instead. + + //Set up the starting ruin list + for(var/key in ruins) + var/datum/map_template/ruin/R = ruins[key] + if(R.get_cost() > ruin_budget) //Why would you do that + continue + if(R.always_place) + forced_ruins[R] = -1 + if(R.unpickable) + continue + ruins_availible[R] = R.placement_weight + + while(ruin_budget > 0 && (length(ruins_availible) || length(forced_ruins))) + var/datum/map_template/ruin/current_pick + var/forced = FALSE + if(length(forced_ruins)) //We have something we need to load right now, so just pick it + for(var/ruin in forced_ruins) + current_pick = ruin + if(forced_ruins[ruin] > 0) //Load into designated z + forced_z = forced_ruins[ruin] + forced = TRUE + break + else //Otherwise just pick random one + current_pick = pickweight(ruins_availible) + + var/placement_tries = PLACEMENT_TRIES + var/failed_to_place = TRUE + var/z_placed = 0 + while(placement_tries > 0) + placement_tries-- + z_placed = pick(z_levels) + if(!current_pick.try_to_place(forced_z ? forced_z : z_placed, area_whitelist)) + continue + else + failed_to_place = FALSE + break + + //That's done remove from priority even if it failed + if(forced) + //TODO : handle forced ruins with multiple variants + forced_ruins -= current_pick + forced = FALSE + + if(failed_to_place) + for(var/datum/map_template/ruin/R in ruins_availible) + if(R.id == current_pick.id) + ruins_availible -= R + log_world("Failed to place [current_pick.name] ruin.") + else + ruin_budget -= current_pick.get_cost() + if(!current_pick.allow_duplicates) + for(var/datum/map_template/ruin/R in ruins_availible) + if(R.id == current_pick.id) + ruins_availible -= R + if(current_pick.never_spawn_with) + for(var/blacklisted_type in current_pick.never_spawn_with) + for(var/possible_exclusion in ruins_availible) + if(istype(possible_exclusion,blacklisted_type)) + ruins_availible -= possible_exclusion + forced_z = 0 + + //Update the availible list + for(var/datum/map_template/ruin/R in ruins_availible) + if(R.get_cost() > ruin_budget) + ruins_availible -= R + + log_world("Ruin loader finished with [ruin_budget] left to spend.") + +/datum/ruin_placer/space + area_whitelist = /area/space + +/datum/ruin_placer/space/New() + ruin_budget = rand( + GLOB.configuration.ruins.space_ruin_budget_min, + GLOB.configuration.ruins.space_ruin_budget_max + ) + templates = GLOB.space_ruins_templates + +/datum/ruin_placer/lavaland + area_whitelist = /area/lavaland/surface/outdoors/unexplored + +/datum/ruin_placer/lavaland/New() + ruin_budget = rand( + GLOB.configuration.ruins.lavaland_ruin_budget_min, + GLOB.configuration.ruins.lavaland_ruin_budget_max + ) + templates = GLOB.lava_ruins_templates diff --git a/code/datums/ruins/space_ruins.dm b/code/datums/ruins/space_ruins.dm index bb9fe505f34cb..1e22462d1e712 100644 --- a/code/datums/ruins/space_ruins.dm +++ b/code/datums/ruins/space_ruins.dm @@ -1,7 +1,5 @@ -//The bigger ones lag like hell if there is more than one on a z-level, so cost 2 for them /datum/map_template/ruin/space prefix = "_maps/map_files/RandomRuins/SpaceRuins/" - cost = 1 ci_exclude = /datum/map_template/ruin/space /datum/map_template/ruin/space/zoo @@ -12,7 +10,6 @@ zoos to working order with the breeding stock kept in these 100% \ secure and unbreachable storage facilities. At no point has anything \ escaped. That's our story, and we're sticking to it." - cost = 2 /datum/map_template/ruin/space/asteroid1 id = "asteroid1" @@ -58,7 +55,6 @@ a giant unused asteroid. Then make it self sufficient, mask any \ evidence of construction, hook it covertly into the \ telecommunications network and hope for the best." - cost = 2 allow_duplicates = FALSE // this shouldn't be spawning more than once anymore /datum/map_template/ruin/space/derelict1 @@ -138,7 +134,6 @@ gutted asteroids, we suspect that a mining ship using a restricted \ engine is somewhere in the area. We'd like to request a patrol vessel \ to investigate." - cost = 2 /datum/map_template/ruin/space/spacebar id = "spacebar" @@ -149,7 +144,6 @@ Rampant Golem and Yellow Hound. Can I take your order?" allow_duplicates = FALSE //it spawn ship docking, no more than one to avoid duplication in console. always_place = TRUE - cost = 0 /datum/map_template/ruin/space/turreted_outpost id = "turreted-outpost" @@ -170,7 +164,6 @@ name = "Ancient Space Station" description = "The crew of a space station awaken one hundred years after a crisis. Awaking to a derelict space station on the verge of collapse, and a hostile force of invading \ hivebots. Can the surviving crew overcome the odds and survive and rebuild, or will the cold embrace of the stars become their new home?" - cost = 0 always_place = TRUE allow_duplicates = FALSE @@ -179,7 +172,6 @@ suffix = "wizardcrash.dmm" name = "Crashed Wizard Shuttle" description = "A shuttle of the Wizard Federation, sent out to crush some wandless scum. Unfortunately, the pilot suffered a magic-related accident and the shuttle crashed into a nearby asteroid." - cost = 2 /datum/map_template/ruin/space/abandonedtele id = "abandonedtele" @@ -192,7 +184,6 @@ suffix = "blowntcommsat.dmm" name = "Blown-out Telecommunications Satellite" description = "The remains of an old telecommunications satellite once utilised by Nanotrasen. It lays derelict, with quite a few pieces missing." - cost = 5 // This is a chonky boy allow_duplicates = FALSE // Absolutely huge, also has its own APC and the area isnt set to allow many /datum/map_template/ruin/space/malftcommsat @@ -200,7 +191,6 @@ suffix = "telecomns_returns.dmm" name = "D.V.O.R.A.K'S Telecommunications Satellite" description = "Seems the telecomunication satellite that went dark 4 years ago finally re-appeared on scanners? Strange signals are coming from it." - cost = 5 // Huge. Large. In charge allow_duplicates = FALSE // One sadistic malfunctioning AI is enough. Also unique apcs. /datum/map_template/ruin/space/clownmime @@ -214,7 +204,6 @@ suffix = "dj.dmm" name = "Soviet DJ Station" description = "A USSP listening post masquerading as a popular Soviet entertainment broadcaster, keeping tabs on Nanotrasen activity in the system and relaying it back to the Union." - cost = 2 allow_duplicates = FALSE /datum/map_template/ruin/space/druglab @@ -229,7 +218,6 @@ name = "Suspicious Station" description = "A syndicate drug laboratory hidden on an asteroid. It is strangely well-protected." allow_duplicates = FALSE - cost = 3 /datum/map_template/ruin/space/syndiedepot id = "syndiedepot" @@ -238,7 +226,6 @@ description = "A syndicate supply depot, heavily stocked, but heavily guarded with an assortment of shields, sentry bots, armed operatives and more." allow_duplicates = FALSE // One of these is enough always_place = TRUE // This is on the always spawn list because of the shielding chance - cost = 0 // Force spawned so shouldnt have a cost /datum/map_template/ruin/space/ussp_tele id = "ussp_tele" @@ -253,7 +240,6 @@ name = "USSP" description = "A decript station of seemingly Soviet origin. The last contact had with this station was a distress signal, and the rest was dark." allow_duplicates = FALSE // One of these has enough loot - cost = 5 // This ruin is 100x100 tiles, so we dont want it to be treated like a 10x10 meteor /datum/map_template/ruin/space/whiteship id = "whiteship" @@ -262,7 +248,6 @@ description = "A small expeditionary ship for use in local space exploration and salvaging." allow_duplicates = FALSE // I dont even want to think about what happens if you have 2 shuttles with the same ID. Likely scary stuff. always_place = TRUE // Its designed to make exploring other space ruins more accessible - cost = 0 // Force spawned so shouldnt have a cost /datum/map_template/ruin/space/golem_destination id = "golemtarget" @@ -271,14 +256,12 @@ description = "Just a handful of rocks floating in space. Guaranteed space destination for the Golem shuttle in case other destinations don't spawn." allow_duplicates = FALSE always_place = TRUE - cost = 0 /datum/map_template/ruin/space/syndicate_space_base name = "Syndicate Space Base" id = "syndie-space-base" description = "A secret base researching illegal bioweapons, it is closely guarded by an elite team of syndicate agents." suffix = "syndie_space_base.dmm" - cost = 0 always_place = TRUE allow_duplicates = FALSE @@ -288,7 +271,6 @@ name = "Syndicakes Factory" description = "Syndicate used to get funds selling corgi cakes produced here. Was it hit by meteors or by a Nanotrasen comando?" allow_duplicates = FALSE - cost = 2 //telecomms + multiple mobs /datum/map_template/ruin/space/debris1 id = "debris1" @@ -314,7 +296,6 @@ name = "Meat Packers" description = "An old transport ship, possibly with a dubious past. It smells faintly of meat." allow_duplicates = FALSE - cost = 2 // Pretty big /datum/map_template/ruin/space/mo19 id = "mo19" @@ -322,7 +303,6 @@ name = "Moon Outpost 19" description = "A now-defunct outpost, with the last received signal being that of distress." allow_duplicates = FALSE - cost = 2 // Also pretty big /datum/map_template/ruin/space/voyager id = "voyager" @@ -330,7 +310,6 @@ name = "Voyager" description = "A relic of old times, you don't know what it hide inside." allow_duplicates = FALSE - cost = 1 // Gives research levels and it should be hard-to-find /datum/map_template/ruin/space/wreckedcargoship id = "wreckedcargoship" @@ -338,7 +317,6 @@ name = "Wrecked Cargoship" description = "A cargo shuttle in a wrecked condition. There are many unknown horrors in space and looks like its last crew has faced one of them." allow_duplicates = FALSE - cost = 1 // With the loot it contains it shouldn't be found frequently /datum/map_template/ruin/space/abandoned_engi_sat id = "abandoned_engi_sat" @@ -346,7 +324,6 @@ name = "Abandoned NT Engineering Satellite" description = "A derelict operating base for NT engineering crew." allow_duplicates = FALSE - cost = 1 /datum/map_template/ruin/space/rocky_motel id = "rocky_motel" @@ -354,7 +331,6 @@ name = "Rocky Motel" description = "A cozy little home nestled in an asteroid, perfect for one or two people!" allow_duplicates = FALSE - cost = 1 /datum/map_template/ruin/space/casino id = "casino" @@ -369,3 +345,16 @@ name = "Abandoned Security Shuttle" description = "A security shuttle that has been floating in space." allow_duplicates = FALSE + +/datum/map_template/ruin/space/freighter + id = "freighter" + suffix = "freighter.dmm" + name = "Voidhopper of Nexus" + description = "A cargo ship headed to a nearby system." + +/datum/map_template/ruin/space/drakehound_breacher + id = "drakehound_breacher" + suffix = "unathi_skiff.dmm" + name = "Damaged Drakehound Skiff" + description = "A small Drakehound craft, damaged from an engine malfunction." + allow_duplicates = FALSE diff --git a/code/datums/spells/banana_touch.dm b/code/datums/spells/banana_touch.dm index 6fc3a835313e8..2c289884a91cd 100644 --- a/code/datums/spells/banana_touch.dm +++ b/code/datums/spells/banana_touch.dm @@ -54,17 +54,17 @@ unEquip(wear_mask, TRUE) unEquip(head, TRUE) unEquip(wear_suit, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/head/wizard/clown, SLOT_HUD_HEAD, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/suit/wizrobe/clown, SLOT_HUD_OUTER_SUIT, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/magical, SLOT_HUD_SHOES, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clownwiz, SLOT_HUD_WEAR_MASK, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/head/wizard/clown, ITEM_SLOT_HEAD, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/suit/wizrobe/clown, ITEM_SLOT_OUTER_SUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/magical, ITEM_SLOT_SHOES, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clownwiz, ITEM_SLOT_MASK, TRUE, TRUE) else qdel(shoes) qdel(wear_mask) qdel(w_uniform) - equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/clown/nodrop, SLOT_HUD_JUMPSUIT, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/nodrop, SLOT_HUD_SHOES, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat/nodrop, SLOT_HUD_WEAR_MASK, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/clown/nodrop, ITEM_SLOT_JUMPSUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/nodrop, ITEM_SLOT_SHOES, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat/nodrop, ITEM_SLOT_MASK, TRUE, TRUE) dna.SetSEState(GLOB.clumsyblock, TRUE, TRUE) dna.SetSEState(GLOB.comicblock, TRUE, TRUE) singlemutcheck(src, GLOB.clumsyblock, MUTCHK_FORCED) diff --git a/code/datums/spells/cluwne.dm b/code/datums/spells/cluwne.dm index 14996e6a5bd32..58279b573f46b 100644 --- a/code/datums/spells/cluwne.dm +++ b/code/datums/spells/cluwne.dm @@ -41,10 +41,10 @@ tumor.insert(src) if(!istype(wear_mask, /obj/item/clothing/mask/cursedclown)) //Infinite loops otherwise unEquip(wear_mask, 1) - equip_to_slot_if_possible(new /obj/item/clothing/under/cursedclown, SLOT_HUD_JUMPSUIT, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/gloves/cursedclown, SLOT_HUD_GLOVES, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/mask/cursedclown, SLOT_HUD_WEAR_MASK, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/shoes/cursedclown, SLOT_HUD_SHOES, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/under/cursedclown, ITEM_SLOT_JUMPSUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/gloves/cursedclown, ITEM_SLOT_GLOVES, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/mask/cursedclown, ITEM_SLOT_MASK, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/shoes/cursedclown, ITEM_SLOT_SHOES, TRUE, TRUE) /mob/living/carbon/human/proc/makeAntiCluwne() to_chat(src, "You don't feel very funny.") @@ -85,5 +85,5 @@ unEquip(gloves, 1) qdel(G) - equip_to_slot_if_possible(new /obj/item/clothing/under/rank/procedure/iaa/formal/black, SLOT_HUD_JUMPSUIT, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, SLOT_HUD_SHOES, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/under/rank/procedure/iaa/formal/black, ITEM_SLOT_JUMPSUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, ITEM_SLOT_SHOES, TRUE, TRUE) diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm index 86781aa426c6f..fa6cd24a8a8c8 100644 --- a/code/datums/spells/horsemask.dm +++ b/code/datums/spells/horsemask.dm @@ -36,6 +36,6 @@ "Your face burns up, and shortly after the fire you realise you have the face of a horse!") if(!target.unEquip(target.wear_mask)) qdel(target.wear_mask) - target.equip_to_slot_if_possible(magichead, SLOT_HUD_WEAR_MASK, TRUE, TRUE) + target.equip_to_slot_if_possible(magichead, ITEM_SLOT_MASK, TRUE, TRUE) target.flash_eyes() diff --git a/code/datums/spells/lichdom.dm b/code/datums/spells/lichdom.dm index 68af16b3a7925..b40c1a19d499b 100644 --- a/code/datums/spells/lichdom.dm +++ b/code/datums/spells/lichdom.dm @@ -138,7 +138,7 @@ return TRUE /datum/spell/lichdom/proc/equip_lich(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), SLOT_HUD_OUTER_SUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), SLOT_HUD_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), ITEM_SLOT_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), ITEM_SLOT_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), ITEM_SLOT_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), ITEM_SLOT_JUMPSUIT) diff --git a/code/datums/spells/mime_malaise.dm b/code/datums/spells/mime_malaise.dm index 6c448b91bd6e7..209863ada380f 100644 --- a/code/datums/spells/mime_malaise.dm +++ b/code/datums/spells/mime_malaise.dm @@ -37,17 +37,17 @@ unEquip(wear_mask, TRUE) unEquip(w_uniform, TRUE) unEquip(wear_suit, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime, SLOT_HUD_WEAR_MASK, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime, SLOT_HUD_JUMPSUIT, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders, SLOT_HUD_OUTER_SUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime, ITEM_SLOT_MASK, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime, ITEM_SLOT_JUMPSUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders, ITEM_SLOT_OUTER_SUIT, TRUE, TRUE) Silence(14 SECONDS) else qdel(wear_mask) qdel(w_uniform) qdel(wear_suit) - equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime/nodrop, SLOT_HUD_WEAR_MASK, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime/nodrop, SLOT_HUD_JUMPSUIT, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders/nodrop, SLOT_HUD_OUTER_SUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime/nodrop, ITEM_SLOT_MASK, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime/nodrop, ITEM_SLOT_JUMPSUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders/nodrop, ITEM_SLOT_OUTER_SUIT, TRUE, TRUE) dna.SetSEState(GLOB.muteblock , TRUE, TRUE) singlemutcheck(src, GLOB.muteblock, MUTCHK_FORCED) dna.default_blocks.Add(GLOB.muteblock) diff --git a/code/datums/spells/projectile_spell.dm b/code/datums/spells/projectile_spell.dm index fd724b5019b24..07e83ec6686a7 100644 --- a/code/datums/spells/projectile_spell.dm +++ b/code/datums/spells/projectile_spell.dm @@ -30,6 +30,7 @@ projectile.icon_state = proj_icon_state projectile.dir = get_dir(target, projectile) projectile.name = proj_name + projectile.firer = user var/current_loc = get_turf(projectile) for(var/i in 1 to proj_lifespan) diff --git a/code/datums/spells/summonitem.dm b/code/datums/spells/summonitem.dm index d7b0cf278fab2..7d2d7f7251cf3 100644 --- a/code/datums/spells/summonitem.dm +++ b/code/datums/spells/summonitem.dm @@ -130,12 +130,12 @@ N.visible_message("As [item_to_retrieve] vanishes, [N] remains behind!") break //If you have 2 nads, well, congrats? Keeps message from doubling up if(target.hand) //left active hand - if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_LEFT_HAND, FALSE, TRUE)) - if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_RIGHT_HAND, FALSE, TRUE)) + if(!target.equip_to_slot_if_possible(item_to_retrieve, ITEM_SLOT_LEFT_HAND, FALSE, TRUE)) + if(!target.equip_to_slot_if_possible(item_to_retrieve, ITEM_SLOT_RIGHT_HAND, FALSE, TRUE)) butterfingers = TRUE else //right active hand - if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_RIGHT_HAND, FALSE, TRUE)) - if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_LEFT_HAND, FALSE, TRUE)) + if(!target.equip_to_slot_if_possible(item_to_retrieve, ITEM_SLOT_RIGHT_HAND, FALSE, TRUE)) + if(!target.equip_to_slot_if_possible(item_to_retrieve, ITEM_SLOT_LEFT_HAND, FALSE, TRUE)) butterfingers = TRUE if(butterfingers) item_to_retrieve.loc = target.loc diff --git a/code/datums/spells/touch_attacks.dm b/code/datums/spells/touch_attacks.dm index 948cfe80ef892..455bbdf5b0b03 100644 --- a/code/datums/spells/touch_attacks.dm +++ b/code/datums/spells/touch_attacks.dm @@ -21,12 +21,12 @@ user.put_in_hands(attached_hand) return if(user.hand) //left active hand - if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_LEFT_HAND, FALSE, TRUE)) - if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_RIGHT_HAND, FALSE, TRUE)) + if(!user.equip_to_slot_if_possible(attached_hand, ITEM_SLOT_LEFT_HAND, FALSE, TRUE)) + if(!user.equip_to_slot_if_possible(attached_hand, ITEM_SLOT_RIGHT_HAND, FALSE, TRUE)) hand_handled = 0 else //right active hand - if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_RIGHT_HAND, FALSE, TRUE)) - if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_LEFT_HAND, FALSE, TRUE)) + if(!user.equip_to_slot_if_possible(attached_hand, ITEM_SLOT_RIGHT_HAND, FALSE, TRUE)) + if(!user.equip_to_slot_if_possible(attached_hand, ITEM_SLOT_LEFT_HAND, FALSE, TRUE)) hand_handled = 0 if(!hand_handled) qdel(attached_hand) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index a45c6cb99fbd0..858f9076582bc 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -752,7 +752,7 @@ #define HALLUCINATE_COOLDOWN_MIN 20 SECONDS #define HALLUCINATE_COOLDOWN_MAX 50 SECONDS -/// This is multiplied with [/mob/var/hallucination] to determine the final cooldown. A higher hallucination value means shorter cooldown. +/// This is multiplied with [/datum/status_effect/transient/var/strength] to determine the final cooldown. A higher hallucination value means shorter cooldown. #define HALLUCINATE_COOLDOWN_FACTOR 0.003 /// Percentage defining the chance at which an hallucination may spawn past the cooldown. #define HALLUCINATE_CHANCE 80 @@ -1406,3 +1406,64 @@ duration = 5 SECONDS alert_type = null status_type = STATUS_EFFECT_REPLACE + +/// This is the threshold where the attack will stun on the last hit. Why? Because it is cool, that's why. +#define FINISHER_THRESHOLD 7 + +/datum/status_effect/temporal_slash + id = "temporal_slash" + duration = 3 SECONDS + status_type = STATUS_EFFECT_REFRESH + alert_type = null + /// How many times the user has been cut. Each cut adds a damage value below + var/cuts = 1 + /// How much damage the blade will do each slice + var/damage_per_cut = 20 + +/datum/status_effect/temporal_slash/on_creation(mob/living/new_owner, cut_damage = 20) + . = ..() + damage_per_cut = cut_damage + +/datum/status_effect/temporal_slash/refresh() + cuts++ + return ..() + +/datum/status_effect/temporal_slash/on_remove() + owner.apply_status_effect(STATUS_EFFECT_TEMPORAL_SLASH_FINISHER, cuts, damage_per_cut) //We apply this to a new status effect, to avoid refreshing while on_remove happens. + +/datum/status_effect/temporal_slash_finisher + id = "temporal_slash_finisher" + status_type = STATUS_EFFECT_UNIQUE + alert_type = null + tick_interval = 0.25 SECONDS + /// How many times the user has been cut. Each cut adds a damage value below + var/cuts = 1 + /// How much damage the blade will do each slice + var/damage_per_cut = 20 + /// Have we done enough damage to trigger the finisher? + var/finishing_cuts = FALSE + +/datum/status_effect/temporal_slash_finisher/on_creation(mob/living/new_owner, final_cuts = 1, cut_damage = 20) + . = ..() + cuts = final_cuts + damage_per_cut = cut_damage + if(ismegafauna(owner)) + damage_per_cut *= 4 //This will deal 40 damage bonus per cut on megafauna as a miner, and 80 as a wizard. To kill a megafauna, you need to hit it 48 times. You don't get the buffs of a crusher though. Also you already killed bubblegum, so, you know. + if(cuts >= FINISHER_THRESHOLD) + finishing_cuts = TRUE + new /obj/effect/temp_visual/temporal_slash(get_turf(owner), owner) + +/datum/status_effect/temporal_slash_finisher/tick() + . = ..() + owner.visible_message("[owner] gets slashed by a cut through spacetime!", "You get slashed by a cut through spacetime!") + playsound(owner, 'sound/weapons/rapierhit.ogg', 50, TRUE) + owner.apply_damage(damage_per_cut, BRUTE, pick(BODY_ZONE_CHEST, BODY_ZONE_HEAD, BODY_ZONE_L_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_ARM, BODY_ZONE_R_LEG), 0, TRUE, null, FALSE) + cuts-- + if(cuts <= 0) + if(finishing_cuts) + owner.Weaken(7 SECONDS) + qdel(src) + else + new /obj/effect/temp_visual/temporal_slash(get_turf(owner), owner) + +#undef FINISHER_THRESHOLD diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm index 18a1484f66982..956fa75b400ca 100644 --- a/code/datums/uplink_items/uplink_general.dm +++ b/code/datums/uplink_items/uplink_general.dm @@ -494,13 +494,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/stealthy_tools category = "Stealth and Camouflage Items" -/datum/uplink_item/stealthy_tools/chameleon_stamp - name = "Chameleon Stamp" - desc = "A stamp that can be activated to imitate an official Nanotrasen Stamp. The disguised stamp will work exactly like the real stamp and will allow you to forge false documents to gain access or equipment; \ - it can also be used in a washing machine to forge clothing." - reference = "CHST" - item = /obj/item/stamp/chameleon - cost = 1 +/datum/uplink_item/stealthy_tools/forgers_kit + name = "Forger's Kit" + desc = "A set consisting of a stamp and a special pen. The stamp can be activated to imitate an official Nanotrasen Stamp, \ + allowing you to forge false documents for access or equipment, and can also be used in a washing machine to create counterfeit clothing. \ + The included pen lets you create fake signatures, further enhancing your forgery capabilities." + reference = "FGK" + item = /obj/item/storage/box/syndie_kit/forgers_kit + cost = 10 surplus = 35 /datum/uplink_item/stealthy_tools/chameleonflag diff --git a/code/datums/uplink_items/uplink_nuclear.dm b/code/datums/uplink_items/uplink_nuclear.dm index 342f4af31b712..7c13a9ed15ffe 100644 --- a/code/datums/uplink_items/uplink_nuclear.dm +++ b/code/datums/uplink_items/uplink_nuclear.dm @@ -90,6 +90,14 @@ uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) surplus = 0 +/datum/uplink_item/dangerous/bulldog + name = "Bulldog Shotgun" + desc = "Lean and mean: Optimized for people that want to get up close and personal. Extra Ammo sold separately." + reference = "BULD" + item = /obj/item/gun/projectile/automatic/shotgun/bulldog + cost = 15 + uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) + //////////////////////////////////////// // MARK: SUPPORT AND MECHAS //////////////////////////////////////// @@ -101,11 +109,10 @@ /datum/uplink_item/support/gygax name = "Gygax Exosuit" - desc = "A lightweight exosuit, painted in a dark scheme. Its speed and equipment selection make it excellent for hit-and-run style attacks. \ - This model lacks a method of space propulsion, and therefore it is advised to repair the mothership's teleporter if you wish to make use of it." + desc = "A lightweight exosuit, painted in a dark scheme. Its speed and equipment selection make it excellent for hit-and-run style attacks." reference = "GE" item = /obj/mecha/combat/gygax/dark/loaded - cost = 400 + cost = 350 /datum/uplink_item/support/mauler name = "Mauler Exosuit" @@ -223,18 +230,19 @@ /datum/uplink_item/ammo/bulldog_ammobag name = "Bulldog - 12g Ammo Duffel Bag" - desc = "A duffel bag filled with enough 12g ammo to supply an entire team, at a discounted price." + desc = "A duffel bag filled with nine 8 round drum magazines. (6 Slug, 2 Buckshot, 1 Dragon's Breath)" reference = "12ADB" item = /obj/item/storage/backpack/duffel/syndie/shotgun cost = 60 // normally 90 uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) /datum/uplink_item/ammo/bulldog_XLmagsbag - name = "Bulldog - 12g XL Magazine Duffel Bag" - desc = "A duffel bag containing three 16 round drum magazines(Slug, Buckshot, Dragon's Breath)." + name = "Bulldog - 12g Extra-Large Magazine Duffel Bag" + desc = "A duffel bag containing five XL 16 round drum magazines. (3 Slug, 1 Buckshot, 1 Dragon's Breath)." reference = "12XLDB" item = /obj/item/storage/backpack/duffel/syndie/shotgunXLmags - cost = 60 // normally 90 + // same price for more ammo, but you're likely to lose more ammo if you drop your bulldog. High risk, high reward. + cost = 60 uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) /datum/uplink_item/ammo/smg @@ -613,15 +621,6 @@ // MARK: BUNDLES //////////////////////////////////////// -/datum/uplink_item/bundles_TC/bulldog - name = "Bulldog Bundle" - desc = "Lean and mean: Optimized for people that want to get up close and personal. Contains the popular \ - Bulldog shotgun, two 12g buckshot drums, and a pair of Thermal imaging goggles." - reference = "BULB" - item = /obj/item/storage/backpack/duffel/syndie/bulldogbundle - cost = 45 // normally 60 - uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) - /datum/uplink_item/bundles_TC/c20r name = "C-20r Bundle" desc = "Old Faithful: The classic C-20r, bundled with three magazines and a (surplus) suppressor at discount price." diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 662b9ed349a88..c71e9683859bf 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -106,7 +106,7 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes) - var/obj/item/clothing/glasses/glasses = H.get_item_by_slot(SLOT_HUD_GLASSES) + var/obj/item/clothing/glasses/glasses = H.get_item_by_slot(ITEM_SLOT_EYES) if(eyes && HAS_TRAIT(H, TRAIT_COLORBLIND) && (!glasses || !glasses.correct_wires)) // Check if the human has colorblindness. replace_colors = eyes.replace_colours // Get the colorblind replacement colors list. diff --git a/code/defines/procs/announcer_datum.dm b/code/defines/procs/announcer_datum.dm index 90c9018ebe8d9..c2259aa72ca3e 100644 --- a/code/defines/procs/announcer_datum.dm +++ b/code/defines/procs/announcer_datum.dm @@ -174,3 +174,10 @@ GLOBAL_DATUM_INIT(major_announcement, /datum/announcer, new(config_type = /datum log_name = ANNOUNCE_KIND_AI sound = sound('sound/misc/notice2.ogg') style = "major" + +/datum/announcement_configuration/ptl + default_title = ANNOUNCE_KIND_PTL + add_log = FALSE + sound = sound('sound/misc/notice2.ogg') + style = "major" + diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm index 8c102edd865a3..2cb9f05e64466 100644 --- a/code/game/area/ai_monitored.dm +++ b/code/game/area/ai_monitored.dm @@ -10,7 +10,6 @@ for(var/obj/machinery/camera/M in src) if(M.isMotion()) motioncameras.Add(M) - M.AddComponent(/datum/component/proximity_monitor) M.set_area_motion(src) /area/station/ai_monitored/Entered(atom/movable/O) diff --git a/code/game/area/areas/mining_areas.dm b/code/game/area/areas/mining_areas.dm index 47f8e73d89828..61f346f5fd472 100644 --- a/code/game/area/areas/mining_areas.dm +++ b/code/game/area/areas/mining_areas.dm @@ -172,3 +172,5 @@ icon_state = "danger" /area/lavaland/surface/outdoors/explored + +/area/lavaland/surface/outdoors/targetable diff --git a/code/game/area/areas/ruins/space_areas.dm b/code/game/area/areas/ruins/space_areas.dm index 17fe9567e1853..09550b3b43ace 100644 --- a/code/game/area/areas/ruins/space_areas.dm +++ b/code/game/area/areas/ruins/space_areas.dm @@ -43,6 +43,22 @@ name = "DK Excavator 453 Abandoned Bridge" icon_state = "bridge" +// Ruins of the Unathi Breacher ship +/area/ruin/space/unathi_breacher/engineering + name = "Breacher Engine Bay" + +/area/ruin/space/unathi_breacher/dorms + name = "Breacher Crew Quarters" + +/area/ruin/space/unathi_breacher/bar + name = "Breacher Bar" + +/area/ruin/space/unathi_breacher/bridge + name = "Breacher Bridge" + +/area/ruin/space/unathi_breacher/hold + name = "Breacher Hold" + //DJSTATION /area/ruin/space/djstation name = "\improper Soviet DJ Station" diff --git a/code/game/area/ss13_areas/engineering_areas.dm b/code/game/area/ss13_areas/engineering_areas.dm index 9bc77bb509491..202f1f5ca81cc 100644 --- a/code/game/area/ss13_areas/engineering_areas.dm +++ b/code/game/area/ss13_areas/engineering_areas.dm @@ -85,6 +85,10 @@ name = "Генератор Гравитации" icon_state = "gravgen" +/area/station/engineering/transmission_laser + name = "\improper Power Transmission Laser" + icon_state = "engi" + /area/station/engineering/ai_transit_tube name = "Транзитная Труба Спутника ИИ" icon_state = "ai" diff --git a/code/game/atoms.dm b/code/game/atoms.dm index b709a08159383..838de5d24408d 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1061,6 +1061,9 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) if(belt) if(belt.clean_blood(radiation_clean)) update_inv_belt() + if(neck) + if(neck.clean_blood(radiation_clean)) + update_inv_neck() ..(clean_hands, clean_mask, clean_feet) update_icons() //apply the now updated overlays to the mob diff --git a/code/game/gamemodes/cult/blood_magic.dm b/code/game/gamemodes/cult/blood_magic.dm index cc0b0f22c20f2..348345a6aee57 100644 --- a/code/game/gamemodes/cult/blood_magic.dm +++ b/code/game/gamemodes/cult/blood_magic.dm @@ -688,10 +688,10 @@ if(iscarbon(target) && proximity) uses-- var/mob/living/carbon/C = target - var/armour = C.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), SLOT_HUD_OUTER_SUIT) - C.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(user), SLOT_HUD_JUMPSUIT) - C.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), SLOT_HUD_BACK) - C.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), SLOT_HUD_SHOES) + var/armour = C.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), ITEM_SLOT_OUTER_SUIT) + C.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(user), ITEM_SLOT_JUMPSUIT) + C.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), ITEM_SLOT_BACK) + C.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), ITEM_SLOT_SHOES) if(C == user) qdel(src) //Clears the hands diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 2ac482d1184c8..4ad3720b3420f 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -206,7 +206,7 @@ user.unEquip(src, 1) user.Confused(20 SECONDS) user.Weaken(10 SECONDS) - else if(slot == SLOT_HUD_OUTER_SUIT) + else if(slot == ITEM_SLOT_OUTER_SUIT) ADD_TRAIT(user, TRAIT_GOTTAGOFAST, "cultrobes[UID()]") /obj/item/clothing/suit/hooded/cultrobes/flagellant_robe/dropped(mob/user) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 0df833a3620b7..88b3008aa2178 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -358,7 +358,7 @@ structure_check() searches for nearby cultist structures required for the invoca H.reagents.del_reagent("holywater") // Also prevent fill stomach with holy water and "forgot" about it after converting var/obj/item/melee/cultblade/dagger/D = new(get_turf(src)) - if(H.equip_to_slot_if_possible(D, SLOT_HUD_IN_BACKPACK, FALSE, TRUE)) + if(H.equip_to_slot_if_possible(D, ITEM_SLOT_IN_BACKPACK, FALSE, TRUE)) to_chat(H, "You have a dagger in your backpack. Use it to do [GET_CULT_DATA(entity_title1, "your god")]'s bidding.") else to_chat(H, "There is a dagger on the floor. Use it to do [GET_CULT_DATA(entity_title1, "your god")]'s bidding.") diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index cd03720964807..79ff304e4a8ed 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -107,7 +107,7 @@ CONTENTS: A.UpdateButtons() /obj/item/clothing/suit/armor/abductor/vest/item_action_slot_check(slot, mob/user) - if(slot == SLOT_HUD_OUTER_SUIT) //we only give the mob the ability to activate the vest if he's actually wearing it. + if(slot == ITEM_SLOT_OUTER_SUIT) //we only give the mob the ability to activate the vest if he's actually wearing it. return 1 /obj/item/clothing/suit/armor/abductor/vest/proc/SetDisguise(datum/icon_snapshot/entry) @@ -245,7 +245,7 @@ CONTENTS: righthand_file = 'icons/mob/inhands/weapons_righthand.dmi' icon_state = "wonderprodStun" item_state = "wonderprod" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "materials=4;combat=4;biotech=7;abductor=4" w_class = WEIGHT_CLASS_NORMAL actions_types = list(/datum/action/item_action/toggle_mode) diff --git a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm index 82a903afa37c6..5b2f73c5245c1 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm @@ -25,7 +25,7 @@ console.vest = V V.flags |= NODROP - var/obj/item/abductor/gizmo/G = locate() in H.get_item_by_slot(SLOT_HUD_BACK) + var/obj/item/abductor/gizmo/G = locate() in H.get_item_by_slot(ITEM_SLOT_BACK) if(G) console.gizmo = G G.console = console diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index 8a5b7ee8f4052..f8166f010a92f 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -239,7 +239,6 @@ if(!occupant) return to_chat(occupant, "Something is electrifying you!") - sleep(1 SECONDS) occupant.electrocute_act(10, src) do_sparks(5, TRUE, src) @@ -248,7 +247,7 @@ return to_chat(occupant, "Something is stabbing you in the back!") occupant.apply_damage(5, BRUTE, BODY_ZONE_CHEST) - occupant.reagents.add_reagent("ether", 5) + occupant.reagents.add_reagent("pancuronium", 3) /obj/machinery/abductor/experiment/force_eject_occupant(mob/target) eject_abductee() diff --git a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm index 904a3f5b6dece..6a768f9d6bacc 100644 --- a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm +++ b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm @@ -6,8 +6,6 @@ #define ALERT_CATEGORY_NOPOWER "pulse_nopower" #define ALERT_CATEGORY_NOREGEN "pulse_noregen" /// Conversion ratio from Watt ticks to joules. -/// Should be a pulse demon's life tick length in seconds. -#define WATT_TICK_TO_JOULE 2 /mob/living/simple_animal/demon/pulse_demon name = "pulse demon" @@ -867,4 +865,3 @@ #undef PULSEDEMON_PLATING_SPARK_CHANCE #undef PULSEDEMON_APC_CHARGE_MULTIPLIER #undef PULSEDEMON_SMES_DRAIN_MULTIPLIER -#undef WATT_TICK_TO_JOULE diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index 904cc49d3b059..7f10d94166435 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -1,13 +1,14 @@ //Revenants: based off of wraiths from Goon //"Ghosts" that are invisible and move like ghosts, cannot take damage while invsible -//Don't hear deadchat and are NOT normal ghosts +//Wreck havoc with haunting themed abilities //Admin-spawn or random event #define INVISIBILITY_REVENANT 45 #define REVENANT_NAME_FILE "revenant_names.json" /mob/living/simple_animal/revenant - name = "revenant" + name = "revenant" //The name shown on examine + real_name = "revenant" //The name shown in dchat desc = "A malevolent spirit." icon = 'icons/mob/mob.dmi' icon_state = "revenant_idle" @@ -120,11 +121,7 @@ if(copytext(message, 1, 2) == "*") return emote(copytext(message, 2), intentional = TRUE) - var/rendered - for(var/mob/M in GLOB.mob_list) - rendered = "[src] [(isobserver(M) ? ("([ghost_follow_link(src, ghost=M)])") : "")] says, \"[message]\"" - if(istype(M, /mob/living/simple_animal/revenant) || isobserver(M)) - to_chat(M, rendered) + say_dead(message) /mob/living/simple_animal/revenant/get_status_tab_items() var/list/status_tab_data = ..() @@ -148,6 +145,7 @@ built_name += pick(strings(REVENANT_NAME_FILE, "adjective")) built_name += pick(strings(REVENANT_NAME_FILE, "theme")) name = built_name + real_name = built_name /mob/living/simple_animal/revenant/proc/firstSetupAttempt() if(mind) @@ -310,6 +308,7 @@ // No other state is happening, therefore we are stunned icon_state = icon_stun + /datum/objective/revenant needs_target = FALSE var/targetAmount = 100 diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 67470854f0d12..323943bd78dd7 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -202,7 +202,7 @@ to_chat(synd_mind.current, "In your hand you will find a special item capable of triggering a greater challenge for your team. Examine it carefully and consult with your fellow operatives before activating it.") var/obj/item/nuclear_challenge/challenge = new /obj/item/nuclear_challenge - synd_mind.current.equip_to_slot_or_del(challenge, SLOT_HUD_RIGHT_HAND) + synd_mind.current.equip_to_slot_or_del(challenge, ITEM_SLOT_RIGHT_HAND) update_syndicate_id(synd_mind, leader_title, TRUE) @@ -219,7 +219,7 @@ else var/mob/living/carbon/human/H = synd_mind.current P.loc = H.loc - H.equip_to_slot_or_del(P, SLOT_HUD_RIGHT_STORE, 0) + H.equip_to_slot_or_del(P, ITEM_SLOT_RIGHT_POCKET, 0) H.update_icons() @@ -259,7 +259,7 @@ var/obj/item/radio/R = new /obj/item/radio/headset/syndicate/alt(synd_mob) R.set_frequency(radio_freq) - synd_mob.equip_to_slot_or_del(R, SLOT_HUD_LEFT_EAR) + synd_mob.equip_to_slot_or_del(R, ITEM_SLOT_LEFT_EAR) var/back @@ -275,18 +275,18 @@ else back = /obj/item/storage/backpack - synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), SLOT_HUD_JUMPSUIT) - synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(synd_mob), SLOT_HUD_SHOES) - synd_mob.equip_or_collect(new /obj/item/clothing/gloves/combat(synd_mob), SLOT_HUD_GLOVES) - synd_mob.equip_to_slot_or_del(new /obj/item/card/id/syndicate(synd_mob), SLOT_HUD_WEAR_ID) - synd_mob.equip_to_slot_or_del(new back(synd_mob), SLOT_HUD_BACK) - synd_mob.equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/pistol(synd_mob), SLOT_HUD_BELT) - synd_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival_syndi(synd_mob.back), SLOT_HUD_IN_BACKPACK) - synd_mob.equip_to_slot_or_del(new /obj/item/pinpointer/nukeop(synd_mob), SLOT_HUD_WEAR_PDA) + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), ITEM_SLOT_JUMPSUIT) + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(synd_mob), ITEM_SLOT_SHOES) + synd_mob.equip_or_collect(new /obj/item/clothing/gloves/combat(synd_mob), ITEM_SLOT_GLOVES) + synd_mob.equip_to_slot_or_del(new /obj/item/card/id/syndicate(synd_mob), ITEM_SLOT_ID) + synd_mob.equip_to_slot_or_del(new back(synd_mob), ITEM_SLOT_BACK) + synd_mob.equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/pistol(synd_mob), ITEM_SLOT_BELT) + synd_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival_syndi(synd_mob.back), ITEM_SLOT_IN_BACKPACK) + synd_mob.equip_to_slot_or_del(new /obj/item/pinpointer/nukeop(synd_mob), ITEM_SLOT_PDA) var/obj/item/radio/uplink/nuclear/U = new /obj/item/radio/uplink/nuclear(synd_mob) U.hidden_uplink.uplink_owner="[synd_mob.key]" U.hidden_uplink.uses = uplink_uses - synd_mob.equip_to_slot_or_del(U, SLOT_HUD_IN_BACKPACK) + synd_mob.equip_to_slot_or_del(U, ITEM_SLOT_IN_BACKPACK) synd_mob.mind.offstation_role = TRUE if(synd_mob.dna.species) @@ -294,17 +294,17 @@ switch(race) if("Vox") - synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), SLOT_HUD_WEAR_MASK) - synd_mob.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen/double/vox(synd_mob), SLOT_HUD_LEFT_HAND) + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), ITEM_SLOT_MASK) + synd_mob.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen/double/vox(synd_mob), ITEM_SLOT_LEFT_HAND) synd_mob.internal = synd_mob.l_hand synd_mob.update_action_buttons_icon() if("Plasmaman") - synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), SLOT_HUD_WEAR_MASK) - synd_mob.equip_or_collect(new /obj/item/tank/internals/plasmaman(synd_mob), SLOT_HUD_SUIT_STORE) - synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), SLOT_HUD_IN_BACKPACK) - synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), SLOT_HUD_IN_BACKPACK) - synd_mob.internal = synd_mob.get_item_by_slot(SLOT_HUD_SUIT_STORE) + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), ITEM_SLOT_MASK) + synd_mob.equip_or_collect(new /obj/item/tank/internals/plasmaman(synd_mob), ITEM_SLOT_SUIT_STORE) + synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), ITEM_SLOT_IN_BACKPACK) + synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), ITEM_SLOT_IN_BACKPACK) + synd_mob.internal = synd_mob.get_item_by_slot(ITEM_SLOT_SUIT_STORE) synd_mob.update_action_buttons_icon() synd_mob.rejuvenate() //fix any damage taken by naked vox/plasmamen/etc while round setups diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index f5f8487e1b2d7..a8106a2d21076 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -16,7 +16,7 @@ icon = 'icons/obj/device.dmi' icon_state = "pinoff" flags = CONDUCT - slot_flags = SLOT_FLAG_PDA | SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_PDA | ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL item_state = "electronic" throw_speed = 4 @@ -275,7 +275,7 @@ /////////////////////// /obj/item/pinpointer/nukeop var/obj/docking_port/mobile/home = null - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_PDA + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_PDA syndicate = TRUE modes = list(MODE_DISK, MODE_NUKE) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 96ccb59d78595..367b3af687559 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -674,11 +674,11 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) var/obj/item/item_to_give = new item_path var/static/list/slots = list( - "backpack" = SLOT_HUD_IN_BACKPACK, - "left pocket" = SLOT_HUD_LEFT_STORE, - "right pocket" = SLOT_HUD_RIGHT_STORE, - "left hand" = SLOT_HUD_LEFT_HAND, - "right hand" = SLOT_HUD_RIGHT_HAND, + "backpack" = ITEM_SLOT_IN_BACKPACK, + "left pocket" = ITEM_SLOT_LEFT_POCKET, + "right pocket" = ITEM_SLOT_RIGHT_POCKET, + "left hand" = ITEM_SLOT_LEFT_HAND, + "right hand" = ITEM_SLOT_RIGHT_HAND, ) for(var/datum/mind/kit_receiver_mind as anything in shuffle(objective_owners)) @@ -928,3 +928,20 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) /datum/objective/delayed/proc/reveal_objective() return holder.replace_objective(src, new objective_to_replace_with(null, team, owner), target_department, steal_list) + +// A warning objective for that an agent is after you and knows you are an agent (or that you are paranoid) +/datum/objective/potentially_backstabbed + name = "Potentially Backstabbed" + explanation_text = "Our intelligence suggests that you are likely to be the target of a rival member of the Syndicate. \ + Remain vigilant, they know who you are and what you can do." + needs_target = FALSE + +/datum/objective/potentially_backstabbed/check_completion() + for(var/datum/mind/M in get_owners()) + var/datum/antagonist/traitor/T = M.has_antag_datum(/datum/antagonist/traitor) + for(var/datum/objective/our_objective in T.get_antag_objectives(FALSE)) + if(istype(our_objective, /datum/objective/potentially_backstabbed)) + continue + if(!our_objective.check_completion()) + return FALSE + return TRUE diff --git a/code/game/gamemodes/objective_holder.dm b/code/game/gamemodes/objective_holder.dm index 4cbeb50d1d51d..c3d7b455487be 100644 --- a/code/game/gamemodes/objective_holder.dm +++ b/code/game/gamemodes/objective_holder.dm @@ -4,15 +4,15 @@ /datum/objective_holder /// Our list of current objectives - var/list/datum/objective/objectives = list() + VAR_PRIVATE/list/datum/objective/objectives = list() /// Who do we belong to [mind, antagonist, team] - var/datum/objective_owner + VAR_PRIVATE/datum/objective_owner /// A list of strings which contain [targets][/datum/objective/var/target] of the antagonist's objectives. Used to prevent duplicate objectives. - var/list/assigned_targets = list() + VAR_PRIVATE/list/assigned_targets = list() /// A callback invoked when a new objective is added. This is required because sometimes objectives are added directly without going through objective_owner. Not currently used. - var/datum/callback/on_add_callback + VAR_PRIVATE/datum/callback/on_add_callback /// A callback invoked when a new objective is added. This is required because sometimes objectives are removed directly without going through objective_owner (EX: replace_objective(), clear()). Not currently used. - var/datum/callback/on_remove_callback + VAR_PRIVATE/datum/callback/on_remove_callback /datum/objective_holder/New(new_owner) . = ..() diff --git a/code/game/gamemodes/objectives_subtypes.dm b/code/game/gamemodes/objectives_subtypes.dm index 656ce63148e5a..07944a0db9b18 100644 --- a/code/game/gamemodes/objectives_subtypes.dm +++ b/code/game/gamemodes/objectives_subtypes.dm @@ -15,8 +15,8 @@ if(target?.current) explanation_text = "Assassinate [target.current.real_name], the Syndicate agent undercover as the [target.assigned_role]." if(target && length(target.antag_datums)) - for(var/datum/antagonist/A in target.antag_datums) - A.targeted_by_antag = TRUE + for(var/datum/antagonist/traitor/A in target.antag_datums) + A.queue_backstab() /datum/objective/assassinateonce/arc name = "Assassinate once (ARC)" diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm index 09dcd1352a969..ad5d6da9479c4 100644 --- a/code/game/gamemodes/scoreboard.dm +++ b/code/game/gamemodes/scoreboard.dm @@ -31,6 +31,8 @@ GLOBAL_VAR(scoreboard) // Variable to save the scoreboard string once it's been var/score_events_endured = 0 /// How many APCs have poor charge? var/score_power_loss = 0 + /// How many GigaJoules of power did we export? + var/score_gigajoules_exported = 0 /// How many people got out alive? var/score_escapees = 0 /// How many people /didn't/ get out alive? @@ -253,6 +255,7 @@ GLOBAL_VAR(scoreboard) // Variable to save the scoreboard string once it's been Ore Mined: [score_ore_mined] ([points_ore_mined] Points)
"} if(score_escapees) dat += "Shuttle Escapees: [score_escapees] ([points_escapees] Points)
" + dat += "Energy Exported: [score_gigajoules_exported] GigaJoules
" dat += "Whole Station Powered: [power_bonus ? "Yes" : "No"] ([power_bonus * 2500] Points)
" dat += "Whole Station Cleaned: [mess_bonus ? "Yes" : "No"] ([mess_bonus * 1500] Points)

" diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 1546afc8c1160..cd7d2b48e911f 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -262,7 +262,7 @@ GLOBAL_LIST_EMPTY(multiverse) item_state = "energy_katana" hitsound = 'sound/weapons/bladeslice.ogg' flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 20 throwforce = 10 sharp = TRUE @@ -411,199 +411,199 @@ GLOBAL_LIST_EMPTY(multiverse) //Duplicates the user's current equipent var/mob/living/carbon/human/H = usr - var/obj/head = H.get_item_by_slot(SLOT_HUD_HEAD) + var/obj/head = H.get_item_by_slot(ITEM_SLOT_HEAD) if(head) - M.equip_to_slot_or_del(new head.type(M), SLOT_HUD_HEAD) + M.equip_to_slot_or_del(new head.type(M), ITEM_SLOT_HEAD) - var/obj/mask = H.get_item_by_slot(SLOT_HUD_WEAR_MASK) + var/obj/mask = H.get_item_by_slot(ITEM_SLOT_MASK) if(mask) - M.equip_to_slot_or_del(new mask.type(M), SLOT_HUD_WEAR_MASK) + M.equip_to_slot_or_del(new mask.type(M), ITEM_SLOT_MASK) - var/obj/glasses = H.get_item_by_slot(SLOT_HUD_GLASSES) + var/obj/glasses = H.get_item_by_slot(ITEM_SLOT_EYES) if(glasses) - M.equip_to_slot_or_del(new glasses.type(M), SLOT_HUD_GLASSES) + M.equip_to_slot_or_del(new glasses.type(M), ITEM_SLOT_EYES) - var/obj/left_ear = H.get_item_by_slot(SLOT_HUD_LEFT_EAR) + var/obj/left_ear = H.get_item_by_slot(ITEM_SLOT_LEFT_EAR) if(left_ear) - M.equip_to_slot_or_del(new left_ear.type(M), SLOT_HUD_LEFT_EAR) + M.equip_to_slot_or_del(new left_ear.type(M), ITEM_SLOT_LEFT_EAR) - var/obj/right_ear = H.get_item_by_slot(SLOT_HUD_RIGHT_EAR) + var/obj/right_ear = H.get_item_by_slot(ITEM_SLOT_RIGHT_EAR) if(right_ear) - M.equip_to_slot_or_del(new right_ear.type(M), SLOT_HUD_RIGHT_EAR) + M.equip_to_slot_or_del(new right_ear.type(M), ITEM_SLOT_RIGHT_EAR) - var/obj/uniform = H.get_item_by_slot(SLOT_HUD_JUMPSUIT) + var/obj/uniform = H.get_item_by_slot(ITEM_SLOT_JUMPSUIT) if(uniform) - M.equip_to_slot_or_del(new uniform.type(M), SLOT_HUD_JUMPSUIT) + M.equip_to_slot_or_del(new uniform.type(M), ITEM_SLOT_JUMPSUIT) - var/obj/suit = H.get_item_by_slot(SLOT_HUD_OUTER_SUIT) + var/obj/suit = H.get_item_by_slot(ITEM_SLOT_OUTER_SUIT) if(suit) - M.equip_to_slot_or_del(new suit.type(M), SLOT_HUD_OUTER_SUIT) + M.equip_to_slot_or_del(new suit.type(M), ITEM_SLOT_OUTER_SUIT) - var/obj/gloves = H.get_item_by_slot(SLOT_HUD_GLOVES) + var/obj/gloves = H.get_item_by_slot(ITEM_SLOT_GLOVES) if(gloves) - M.equip_to_slot_or_del(new gloves.type(M), SLOT_HUD_GLOVES) + M.equip_to_slot_or_del(new gloves.type(M), ITEM_SLOT_GLOVES) - var/obj/shoes = H.get_item_by_slot(SLOT_HUD_SHOES) + var/obj/shoes = H.get_item_by_slot(ITEM_SLOT_SHOES) if(shoes) - M.equip_to_slot_or_del(new shoes.type(M), SLOT_HUD_SHOES) + M.equip_to_slot_or_del(new shoes.type(M), ITEM_SLOT_SHOES) - var/obj/belt = H.get_item_by_slot(SLOT_HUD_BELT) + var/obj/belt = H.get_item_by_slot(ITEM_SLOT_BELT) if(belt) - M.equip_to_slot_or_del(new belt.type(M), SLOT_HUD_BELT) + M.equip_to_slot_or_del(new belt.type(M), ITEM_SLOT_BELT) - var/obj/pda = H.get_item_by_slot(SLOT_HUD_WEAR_PDA) + var/obj/pda = H.get_item_by_slot(ITEM_SLOT_PDA) if(pda) - M.equip_to_slot_or_del(new pda.type(M), SLOT_HUD_WEAR_PDA) + M.equip_to_slot_or_del(new pda.type(M), ITEM_SLOT_PDA) - var/obj/back = H.get_item_by_slot(SLOT_HUD_BACK) + var/obj/back = H.get_item_by_slot(ITEM_SLOT_BACK) if(back) - M.equip_to_slot_or_del(new back.type(M), SLOT_HUD_BACK) + M.equip_to_slot_or_del(new back.type(M), ITEM_SLOT_BACK) - var/obj/suit_storage = H.get_item_by_slot(SLOT_HUD_SUIT_STORE) + var/obj/suit_storage = H.get_item_by_slot(ITEM_SLOT_SUIT_STORE) if(suit_storage) - M.equip_to_slot_or_del(new suit_storage.type(M), SLOT_HUD_SUIT_STORE) + M.equip_to_slot_or_del(new suit_storage.type(M), ITEM_SLOT_SUIT_STORE) - var/obj/left_pocket = H.get_item_by_slot(SLOT_HUD_LEFT_STORE) + var/obj/left_pocket = H.get_item_by_slot(ITEM_SLOT_LEFT_POCKET) if(left_pocket) - M.equip_to_slot_or_del(new left_pocket.type(M), SLOT_HUD_LEFT_STORE) + M.equip_to_slot_or_del(new left_pocket.type(M), ITEM_SLOT_LEFT_POCKET) - var/obj/right_pocket = H.get_item_by_slot(SLOT_HUD_RIGHT_STORE) + var/obj/right_pocket = H.get_item_by_slot(ITEM_SLOT_RIGHT_POCKET) if(right_pocket) - M.equip_to_slot_or_del(new right_pocket.type(M), SLOT_HUD_RIGHT_STORE) + M.equip_to_slot_or_del(new right_pocket.type(M), ITEM_SLOT_RIGHT_POCKET) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) //Don't duplicate what's equipped to hands, or else duplicate swords could be generated...or weird cases of factionless swords. + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) //Don't duplicate what's equipped to hands, or else duplicate swords could be generated...or weird cases of factionless swords. else if(istajaran(M) || isunathi(M)) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), SLOT_HUD_SHOES) //If they can't wear shoes, give them a pair of sandals. + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), ITEM_SLOT_SHOES) //If they can't wear shoes, give them a pair of sandals. var/randomize = pick("mobster","roman","wizard","cyborg","syndicate","assistant", "animu", "cultist", "highlander", "clown", "killer", "pirate", "soviet", "officer", "gladiator") switch(randomize) if("mobster") - M.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), SLOT_HUD_GLOVES) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), SLOT_HUD_GLASSES) - M.equip_to_slot_or_del(new /obj/item/clothing/under/suit/really_black(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), ITEM_SLOT_GLOVES) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), ITEM_SLOT_EYES) + M.equip_to_slot_or_del(new /obj/item/clothing/under/suit/really_black(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("roman") var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) - M.equip_to_slot_or_del(new hat(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/shield/riot/roman(M), SLOT_HUD_LEFT_HAND) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new hat(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/shield/riot/roman(M), ITEM_SLOT_LEFT_HAND) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("wizard") - M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), SLOT_HUD_OUTER_SUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), ITEM_SLOT_OUTER_SUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("cyborg") if(!ismachineperson(M)) for(var/obj/item/organ/O in M.bodyparts) O.robotize(make_tough = 1) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), SLOT_HUD_GLASSES) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), ITEM_SLOT_EYES) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("syndicate") - M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), SLOT_HUD_GLOVES) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), SLOT_HUD_OUTER_SUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M),SLOT_HUD_WEAR_MASK) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), ITEM_SLOT_GLOVES) + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), ITEM_SLOT_OUTER_SUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M),ITEM_SLOT_MASK) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("assistant") - M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("animu") - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("cultist") - M.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(M), SLOT_HUD_OUTER_SUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(M), ITEM_SLOT_OUTER_SUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("highlander") - M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/head/beret(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/head/beret(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("clown") - M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), SLOT_HUD_WEAR_MASK) - M.equip_to_slot_or_del(new /obj/item/bikehorn(M), SLOT_HUD_LEFT_STORE) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), ITEM_SLOT_MASK) + M.equip_to_slot_or_del(new /obj/item/bikehorn(M), ITEM_SLOT_LEFT_POCKET) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("killer") - M.equip_to_slot_or_del(new /obj/item/clothing/under/misc/overalls(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex(M), SLOT_HUD_GLOVES) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), SLOT_HUD_WEAR_MASK) - M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), SLOT_HUD_OUTER_SUIT) - M.equip_to_slot_or_del(new /obj/item/kitchen/knife(M), SLOT_HUD_LEFT_STORE) - M.equip_to_slot_or_del(new /obj/item/scalpel(M), SLOT_HUD_RIGHT_STORE) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/under/misc/overalls(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex(M), ITEM_SLOT_GLOVES) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), ITEM_SLOT_MASK) + M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), ITEM_SLOT_OUTER_SUIT) + M.equip_to_slot_or_del(new /obj/item/kitchen/knife(M), ITEM_SLOT_LEFT_POCKET) + M.equip_to_slot_or_del(new /obj/item/scalpel(M), ITEM_SLOT_RIGHT_POCKET) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) for(var/obj/item/carried_item in M.contents) if(!istype(carried_item, /obj/item/bio_chip)) carried_item.add_mob_blood(M) if("pirate") - M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), SLOT_HUD_GLASSES) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), ITEM_SLOT_EYES) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("soviet") - M.equip_to_slot_or_del(new /obj/item/clothing/head/sovietofficerhat(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), SLOT_HUD_GLOVES) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/sovietcoat(M), SLOT_HUD_OUTER_SUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/under/new_soviet/sovietofficer(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/head/sovietofficerhat(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), ITEM_SLOT_GLOVES) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/sovietcoat(M), ITEM_SLOT_OUTER_SUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/under/new_soviet/sovietofficer(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("officer") - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), SLOT_HUD_GLOVES) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), SLOT_HUD_WEAR_MASK) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/jacket/miljacket(M), SLOT_HUD_OUTER_SUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), SLOT_HUD_GLASSES) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), ITEM_SLOT_GLOVES) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), ITEM_SLOT_MASK) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/jacket/miljacket(M), ITEM_SLOT_OUTER_SUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), ITEM_SLOT_EYES) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("gladiator") - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/gladiator(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/gladiator(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) else @@ -611,7 +611,7 @@ GLOBAL_LIST_EMPTY(multiverse) var/obj/item/card/id/W = new /obj/item/card/id if(duplicate_self) - var/duplicated_access = usr.get_item_by_slot(SLOT_HUD_WEAR_ID) + var/duplicated_access = usr.get_item_by_slot(ITEM_SLOT_ID) if(duplicated_access && istype(duplicated_access, /obj/item/card/id)) var/obj/item/card/id/duplicated_id = duplicated_access W.access = duplicated_id.access @@ -626,7 +626,7 @@ GLOBAL_LIST_EMPTY(multiverse) W.registered_name = M.real_name W.update_label(M.real_name) W.SetOwnerInfo(M) - M.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + M.equip_to_slot_or_del(W, ITEM_SLOT_ID) if(isvox(M)) M.dna.species.after_equip_job(null, M) //Nitrogen tanks @@ -759,38 +759,38 @@ GLOBAL_LIST_EMPTY(multiverse) switch(skeleton_type) if("roman") var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) - victim.equip_to_slot_or_del(new hat(victim), SLOT_HUD_HEAD) - victim.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(victim), SLOT_HUD_JUMPSUIT) - victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(victim), SLOT_HUD_SHOES) - victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), SLOT_HUD_LEFT_HAND) - victim.equip_to_slot_or_del(new /obj/item/claymore(victim), SLOT_HUD_RIGHT_HAND) - victim.equip_to_slot_or_del(new /obj/item/spear(victim), SLOT_HUD_BACK) + victim.equip_to_slot_or_del(new hat(victim), ITEM_SLOT_HEAD) + victim.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(victim), ITEM_SLOT_JUMPSUIT) + victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(victim), ITEM_SLOT_SHOES) + victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), ITEM_SLOT_LEFT_HAND) + victim.equip_to_slot_or_del(new /obj/item/claymore(victim), ITEM_SLOT_RIGHT_HAND) + victim.equip_to_slot_or_del(new /obj/item/spear(victim), ITEM_SLOT_BACK) if("pirate") - victim.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(victim), SLOT_HUD_JUMPSUIT) - victim.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(victim), SLOT_HUD_OUTER_SUIT) - victim.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(victim), SLOT_HUD_HEAD) - victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), SLOT_HUD_SHOES) - victim.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(victim), SLOT_HUD_GLASSES) - victim.equip_to_slot_or_del(new /obj/item/claymore(victim), SLOT_HUD_RIGHT_HAND) - victim.equip_to_slot_or_del(new /obj/item/spear(victim), SLOT_HUD_BACK) - victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), SLOT_HUD_LEFT_HAND) + victim.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(victim), ITEM_SLOT_JUMPSUIT) + victim.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(victim), ITEM_SLOT_OUTER_SUIT) + victim.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(victim), ITEM_SLOT_HEAD) + victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), ITEM_SLOT_SHOES) + victim.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(victim), ITEM_SLOT_EYES) + victim.equip_to_slot_or_del(new /obj/item/claymore(victim), ITEM_SLOT_RIGHT_HAND) + victim.equip_to_slot_or_del(new /obj/item/spear(victim), ITEM_SLOT_BACK) + victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), ITEM_SLOT_LEFT_HAND) if("yand")//mine is an evil laugh - victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), SLOT_HUD_SHOES) - victim.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(victim), SLOT_HUD_HEAD) - victim.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(victim), SLOT_HUD_JUMPSUIT) - victim.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(victim), SLOT_HUD_OUTER_SUIT) - victim.equip_to_slot_or_del(new /obj/item/katana(victim), SLOT_HUD_RIGHT_HAND) - victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), SLOT_HUD_LEFT_HAND) - victim.equip_to_slot_or_del(new /obj/item/spear(victim), SLOT_HUD_BACK) + victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), ITEM_SLOT_SHOES) + victim.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(victim), ITEM_SLOT_HEAD) + victim.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(victim), ITEM_SLOT_JUMPSUIT) + victim.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(victim), ITEM_SLOT_OUTER_SUIT) + victim.equip_to_slot_or_del(new /obj/item/katana(victim), ITEM_SLOT_RIGHT_HAND) + victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), ITEM_SLOT_LEFT_HAND) + victim.equip_to_slot_or_del(new /obj/item/spear(victim), ITEM_SLOT_BACK) if("clown") - victim.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(victim), SLOT_HUD_JUMPSUIT) - victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(victim), SLOT_HUD_SHOES) - victim.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(victim), SLOT_HUD_WEAR_MASK) - victim.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(victim), SLOT_HUD_HEAD) - victim.equip_to_slot_or_del(new /obj/item/bikehorn(victim), SLOT_HUD_LEFT_STORE) - victim.equip_to_slot_or_del(new /obj/item/claymore(victim), SLOT_HUD_RIGHT_HAND) - victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), SLOT_HUD_LEFT_HAND) - victim.equip_to_slot_or_del(new /obj/item/spear(victim), SLOT_HUD_BACK) + victim.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(victim), ITEM_SLOT_JUMPSUIT) + victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(victim), ITEM_SLOT_SHOES) + victim.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(victim), ITEM_SLOT_MASK) + victim.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(victim), ITEM_SLOT_HEAD) + victim.equip_to_slot_or_del(new /obj/item/bikehorn(victim), ITEM_SLOT_LEFT_POCKET) + victim.equip_to_slot_or_del(new /obj/item/claymore(victim), ITEM_SLOT_RIGHT_HAND) + victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), ITEM_SLOT_LEFT_HAND) + victim.equip_to_slot_or_del(new /obj/item/spear(victim), ITEM_SLOT_BACK) ///Updates the mobs species and gear to anime /obj/item/necromantic_stone/proc/equip_heresy(mob/living/carbon/human/victim) @@ -812,13 +812,13 @@ GLOBAL_LIST_EMPTY(multiverse) victim.grab_ghost() victim.revive() - victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), SLOT_HUD_SHOES) - victim.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(victim), SLOT_HUD_HEAD) - victim.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(victim), SLOT_HUD_JUMPSUIT) - victim.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(victim), SLOT_HUD_OUTER_SUIT) - victim.equip_to_slot_or_del(new /obj/item/katana(victim), SLOT_HUD_RIGHT_HAND) - victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), SLOT_HUD_LEFT_HAND) - victim.equip_to_slot_or_del(new /obj/item/spear(victim), SLOT_HUD_BACK) + victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), ITEM_SLOT_SHOES) + victim.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(victim), ITEM_SLOT_HEAD) + victim.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(victim), ITEM_SLOT_JUMPSUIT) + victim.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(victim), ITEM_SLOT_OUTER_SUIT) + victim.equip_to_slot_or_del(new /obj/item/katana(victim), ITEM_SLOT_RIGHT_HAND) + victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), ITEM_SLOT_LEFT_HAND) + victim.equip_to_slot_or_del(new /obj/item/spear(victim), ITEM_SLOT_BACK) if(!victim.real_name || victim.real_name == "unknown") victim.real_name = "Neko-chan" diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm index 77e4f3cbb7b4a..592de13f2b91e 100644 --- a/code/game/gamemodes/wizard/godhand.dm +++ b/code/game/gamemodes/wizard/godhand.dm @@ -6,6 +6,8 @@ var/datum/spell/touch/attached_spell icon = 'icons/obj/weapons/magical_weapons.dmi' icon_state = "disintegrate" + lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items_righthand.dmi' item_state = null flags = ABSTRACT | NODROP | DROPDEL w_class = WEIGHT_CLASS_HUGE diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index f312d1f4de09b..82217d065fd73 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -118,7 +118,7 @@ wizard.additional_text = "Make sure the station pays for its actions against our diplomats. We might send more Wizards to the station if the situation is not developing in our favour." new_character.mind.add_antag_datum(wizard) new_character.forceMove(pick(GLOB.wizardstart)) - new_character.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/mugwort(harry), SLOT_HUD_IN_BACKPACK) + new_character.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/mugwort(harry), ITEM_SLOT_IN_BACKPACK) // The first wiznerd can get their mugwort from the wizard's den, new ones will also need mugwort! mages_made++ dust_if_respawnable(harry) diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 0cc06bbd8b71b..7e3c863c14817 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -8,7 +8,7 @@ var/icon_state_full = "soulstone2" desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artifact's power." w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "bluespace=4;materials=5" /// Should we show rays? Triggered by a held body diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 624ac346f7b92..4df54ff12eef7 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -520,7 +520,7 @@ /datum/spellbook_entry/item/spell_blade name = "Spellblade" - desc = "A magical sword that can be enchanted by using it in hand to have a unique on-hit effect. Lighting: arcs electricity between nearby targets, stunning and damaging them. Fire: creates a massive ball of fire on hit, and makes the wielder immune to fire. Bluespace: allows you to strike people from a range, teleporting you to them. Forceshield: on hit, makes you stun immune for 3 seconds and reduces damage by half." + desc = "A magical sword that can be enchanted by using it in hand to have a unique on-hit effect. Lighting: arcs electricity between nearby targets, stunning and damaging them. Fire: creates a massive ball of fire on hit, and makes the wielder immune to fire. Bluespace: allows you to strike people from a range, teleporting you to them. Forceshield: on hit, makes you stun immune for 3 seconds and reduces damage by half. Spacetime: will slice faster but weaker and will curse the target, slashing them a few seconds after they have not been swinged at for each hit" item_path = /obj/item/melee/spellblade category = "Weapons and Armors" @@ -1107,7 +1107,7 @@ magichead.voicechange = TRUE //NEEEEIIGHH if(!user.unEquip(user.wear_mask)) qdel(user.wear_mask) - user.equip_to_slot_if_possible(magichead, SLOT_HUD_WEAR_MASK, TRUE, TRUE) + user.equip_to_slot_if_possible(magichead, ITEM_SLOT_MASK, TRUE, TRUE) qdel(src) else to_chat(user, "I say thee neigh") diff --git a/code/game/gamemodes/wizard/wizloadouts.dm b/code/game/gamemodes/wizard/wizloadouts.dm index 8608d9132777c..480ee9dfd610a 100644 --- a/code/game/gamemodes/wizard/wizloadouts.dm +++ b/code/game/gamemodes/wizard/wizloadouts.dm @@ -61,10 +61,10 @@ is_ragin_restricted = TRUE /datum/spell/lichdom/gunslinger/equip_lich(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit(H), SLOT_HUD_OUTER_SUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(H), SLOT_HUD_GLOVES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit(H), ITEM_SLOT_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), ITEM_SLOT_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(H), ITEM_SLOT_GLOVES) + H.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(H), ITEM_SLOT_JUMPSUIT) /datum/spellbook_entry/loadout/greytide name = "Tyde the Grey" @@ -87,9 +87,9 @@ new /obj/item/clothing/head/helmet/space/plasmaman/assistant(get_turf(user)) new /obj/item/clothing/under/plasmaman/assistant(get_turf(user)) user.unEquip(user.wear_id) - user.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/glorf, SLOT_HUD_JUMPSUIT) //Just in case they're naked + user.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/glorf, ITEM_SLOT_JUMPSUIT) //Just in case they're naked var/obj/item/card/id/wizid = new /obj/item/card/id(src) - user.equip_to_slot_or_del(wizid, SLOT_HUD_WEAR_ID) + user.equip_to_slot_or_del(wizid, ITEM_SLOT_ID) wizid.registered_name = user.real_name wizid.access = list(ACCESS_MAINT_TUNNELS) wizid.assignment = "Assistant" @@ -144,10 +144,10 @@ ADD_TRAIT(user, TRAIT_RESISTHEAT, MAGIC_TRAIT) ADD_TRAIT(user, TRAIT_RESISTHIGHPRESSURE, MAGIC_TRAIT) - user.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red/fireball(user), SLOT_HUD_OUTER_SUIT) - user.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red/fireball(user), SLOT_HUD_HEAD) + user.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red/fireball(user), ITEM_SLOT_OUTER_SUIT) + user.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red/fireball(user), ITEM_SLOT_HEAD) - user.equip_or_collect(new /obj/item/storage/belt/wands/fireballs(), SLOT_HUD_BELT) + user.equip_or_collect(new /obj/item/storage/belt/wands/fireballs(), ITEM_SLOT_BELT) /obj/item/clothing/suit/wizrobe/red/fireball name = "infernal robe" diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 19cd1be962910..fdf42c7559824 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -391,7 +391,7 @@ "Tourist") /proc/get_all_job_icons() //For all existing HUD icons - return GLOB.joblist + get_all_ERT_jobs() + list("Prisoner") + return GLOB.joblist + get_all_ERT_jobs() + list("Prisoner", "Centcom", "Solgov", "Soviet", "Unknown") /proc/get_accesslist_static_data(num_min_region = REGION_GENERAL, num_max_region = REGION_COMMAND) var/list/retval diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index cf1fab79c2869..95c2e1f110c5b 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -138,7 +138,7 @@ mask = /obj/item/clothing/mask/gas/explorer glasses = /obj/item/clothing/glasses/meson suit_store = /obj/item/tank/internals/emergency_oxygen - internals_slot = SLOT_HUD_SUIT_STORE + internals_slot = ITEM_SLOT_SUIT_STORE backpack_contents = list( /obj/item/flashlight/seclite=1,\ /obj/item/kitchen/knife/combat/survival=1, diff --git a/code/game/machinery/camera/camera_presets.dm b/code/game/machinery/camera/camera_presets.dm index 64ab059fd8b0a..9c7f0fc61bc0f 100644 --- a/code/game/machinery/camera/camera_presets.dm +++ b/code/game/machinery/camera/camera_presets.dm @@ -155,6 +155,7 @@ if(name == initial(name)) name = "motion-sensitive security camera" assembly.upgrades.Add(new /obj/item/assembly/prox_sensor(assembly)) + AddComponent(/datum/component/proximity_monitor, CAMERA_VIEW_DISTANCE) setPowerUsage() // Add it to machines that process START_PROCESSING(SSmachines, src) diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm index 68010c1fb3c1f..5f2e83b11a269 100644 --- a/code/game/machinery/camera/motion.dm +++ b/code/game/machinery/camera/motion.dm @@ -12,7 +12,7 @@ else if(detectTime == -1) for(var/thing in getTargetList()) var/mob/target = locateUID(thing) - if(QDELETED(target) || target.stat == DEAD || (!area_motion && !in_range(src, target))) + if(QDELETED(target) || target.stat == DEAD || (!area_motion && (!(get_dist(src, target) <= view_range) || !(target in hearers(view_range, get_turf(src)))))) //If not part of a monitored area and the camera is not in range or the target is dead lostTargetRef(thing) @@ -24,6 +24,10 @@ /obj/machinery/camera/proc/newTarget(mob/target) if(isAI(target)) return FALSE + if(isbot(target)) //No armsky, you don't get to set off the motion alarm constantly + return FALSE + if(!area_motion && (!(get_dist(src, target) <= view_range) || !(target in hearers(view_range, get_turf(src))))) + return FALSE if(detectTime == 0) detectTime = world.time // start the clock var/list/targets = getTargetList() @@ -33,7 +37,7 @@ /obj/machinery/camera/proc/lostTargetRef(uid) var/list/targets = getTargetList() targets -= uid - if(length(targets)) + if(!length(targets)) cancelAlarm() /obj/machinery/camera/proc/cancelAlarm() @@ -47,7 +51,8 @@ if(!detectTime) return FALSE if(status) - GLOB.alarm_manager.trigger_alarm("Motion", get_area(src), list(UID()), src) + var/area/A = get_area(src) + GLOB.alarm_manager.trigger_alarm("Motion", A, A.cameras, src) visible_message("A red light flashes on [src]!") detectTime = -1 return TRUE diff --git a/code/game/machinery/computer/robot_control.dm b/code/game/machinery/computer/robot_control.dm index b1c43b4eb10f7..f15a9014be023 100644 --- a/code/game/machinery/computer/robot_control.dm +++ b/code/game/machinery/computer/robot_control.dm @@ -38,7 +38,7 @@ * Returns TRUE if a robot will show up in the console * Returns FALSE if a robot will not show up in the console * Arguments: - * * R - The [mob/living/silicon/robot] to be checked + * * R - The [/mob/living/silicon/robot] to be checked */ /obj/machinery/computer/robotics/proc/console_shows(mob/living/silicon/robot/R) if(!istype(R)) @@ -57,8 +57,8 @@ * Returns TRUE if a user can send the command (does not guarantee it will work) * Returns FALSE if a user cannot * Arguments: - * * user - The [mob/user] to be checked - * * R - The [mob/living/silicon/robot] to be checked + * * user - The [/mob] to be checked + * * R - The [/mob/living/silicon/robot] to be checked * * telluserwhy - Bool of whether the user should be sent a to_chat message if they don't have access */ /obj/machinery/computer/robotics/proc/can_control(mob/user, mob/living/silicon/robot/R, telluserwhy = FALSE) @@ -100,7 +100,7 @@ * Returns TRUE if a user is a traitor AI, or aghost * Returns FALSE otherwise * Arguments: - * * user - The [mob/user] to be checked + * * user - The [/mob] to be checked */ /obj/machinery/computer/robotics/proc/can_hack_any(mob/user) if(!istype(user)) @@ -117,8 +117,8 @@ * Returns TRUE if a user can hack the specific cyborg * Returns FALSE if a user cannot * Arguments: - * * user - The [mob/user] to be checked - * * R - The [mob/living/silicon/robot] to be checked + * * user - The [/mob] to be checked + * * R - The [/mob/living/silicon/robot] to be checked */ /obj/machinery/computer/robotics/proc/can_hack(mob/user, mob/living/silicon/robot/R) if(!can_hack_any(user)) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 37f7f08704cc2..7fddc1f916195 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -404,7 +404,7 @@ if(G.fields["name"] == occupant.real_name) announce_rank = G.fields["rank"] qdel(G) - + GLOB.crew_list -= occupant.real_name icon_state = base_icon_state //Make an announcement and log the person entering storage + their rank diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 1c1451bb5669c..2b7553f0f8698 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -2,7 +2,7 @@ name = "door" desc = "It opens and closes." icon = 'icons/obj/doors/doorint.dmi' - icon_state = "door1" + icon_state = null anchored = TRUE opacity = TRUE density = TRUE @@ -494,6 +494,7 @@ /obj/machinery/door/morgue icon = 'icons/obj/doors/doormorgue.dmi' + icon_state = "door1" /obj/machinery/door/proc/lock() return diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 1ea656c3aa34f..5371d4f704b15 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -567,15 +567,6 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ pixel_y = -32 alpha = 100 -/* - * Other Stuff: Is this even used? - */ -/obj/machinery/hologram/projector - name = "hologram projector" - desc = "It makes a hologram appear...with magnets or something..." - icon = 'icons/obj/stationobjs.dmi' - icon_state = "hologram0" - #undef HOLOPAD_PASSIVE_POWER_USAGE #undef HOLOGRAM_POWER_USAGE diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/machine_frame.dm similarity index 90% rename from code/game/machinery/constructable_frame.dm rename to code/game/machinery/machine_frame.dm index f9fc2b92e7bed..a9cef854d78fd 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/machine_frame.dm @@ -1,26 +1,34 @@ -/// Made into a seperate type to make future revisions easier. -/obj/machinery/constructable_frame +#define MACHINE_FRAME_EMPTY 1 +#define MACHINE_FRAME_WIRED 2 +#define MACHINE_FRAME_CIRCUITBOARD 3 + +/obj/structure/machine_frame name = "machine frame" + desc = "The standard frame for most station machines. Its appearance and function is controlled by the inserted board." icon = 'icons/obj/stock_parts.dmi' icon_state = "box_0" density = TRUE anchored = TRUE - power_state = NO_POWER_USE + + pressure_resistance = 15 max_integrity = 250 + layer = BELOW_OBJ_LAYER + armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 70) + atom_say_verb = "beeps" + flags_ricochet = RICOCHET_HARD + receive_ricochet_chance_mod = 0.3 + var/obj/item/circuitboard/circuit = null var/list/components = null var/list/req_components = null - var/list/req_component_names = null // user-friendly names of components - var/state = 1 + var/state = MACHINE_FRAME_EMPTY + var/frame_type = "machine" + var/extra_desc - // For pods - var/list/connected_parts = list() - var/pattern_idx=0 - -/obj/machinery/constructable_frame/deconstruct(disassembled = TRUE) +/obj/structure/machine_frame/deconstruct(disassembled = TRUE) if(!(flags & NODECONSTRUCT)) new /obj/item/stack/sheet/metal(loc, 5) - if(state >= 2) + if(state >= MACHINE_FRAME_WIRED) var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil(loc) A.amount = 5 if(circuit) @@ -28,63 +36,73 @@ circuit = null return ..() -/obj/machinery/constructable_frame/obj_break(damage_flag) +/obj/structure/machine_frame/obj_break(damage_flag) deconstruct() -// unfortunately, we have to instance the objects really quickly to get the names -// fortunately, this is only called once when the board is added and the items are immediately GC'd -// and none of the parts do much in their constructors -/obj/machinery/constructable_frame/proc/update_namelist() - if(!req_components) - return - - req_component_names = new() - for(var/tname in req_components) - var/path = tname - var/obj/O = new path() - req_component_names[tname] = O.name - -/obj/machinery/constructable_frame/proc/get_req_components_amt() +/obj/structure/machine_frame/proc/get_req_components_amt() var/amt = 0 for(var/path in req_components) amt += req_components[path] return amt -// update description of required components remaining -/obj/machinery/constructable_frame/proc/update_req_desc() - if(!req_components || !req_component_names) - desc = "Does not require any more components." +/obj/structure/machine_frame/examine(mob/user) + . = ..() + if(extra_desc) + . += "[extra_desc]" + +/obj/structure/machine_frame/update_name(updates) + . = ..() + if(circuit) + name = "[initial(name)] ([circuit.board_name])" return + name = initial(name) - var/hasContent = 0 - desc = "Requires" - for(var/i = 1 to length(req_components)) - var/tname = req_components[i] - var/amt = req_components[tname] - if(amt == 0) +/obj/structure/machine_frame/update_desc(updates) + . = ..() + if(!circuit) + extra_desc = null + return + if(!req_components) + extra_desc = "Does not require any more components." + return + + var/list/needed_components = list() + for(var/obj/component as anything in req_components) + var/amt = req_components[component] + if(amt <= 0) continue - var/use_and = i == length(req_components) - desc += "[(hasContent ? (use_and ? ", and" : ",") : "")] [amt] [amt == 1 ? req_component_names[tname] : "[req_component_names[tname]]\s"]" - hasContent = 1 + needed_components += "[amt] [component.name]\s" - if(!hasContent) - desc = "Does not require any more components." - else - desc += "." + if(!length(needed_components)) + extra_desc = "Does not require any more components." + return + extra_desc = "Requires [english_list(needed_components)]." -/obj/machinery/constructable_frame/machine_frame/attackby(obj/item/P, mob/user, params) +/obj/structure/machine_frame/update_icon_state() + . = ..() switch(state) - if(1) + if(MACHINE_FRAME_EMPTY) + icon_state = "box_0" + if(MACHINE_FRAME_WIRED) + icon_state = "box_1" + if(MACHINE_FRAME_CIRCUITBOARD) + icon_state = "box_2" + else + icon_state = "box_0" + +/obj/structure/machine_frame/attackby(obj/item/P, mob/user, params) + switch(state) + if(MACHINE_FRAME_EMPTY) if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = P if(C.get_amount() >= 5) playsound(src.loc, C.usesound, 50, 1) to_chat(user, "You start to add cables to the frame.") if(do_after(user, 20 * C.toolspeed, target = src)) - if(state == 1 && C.get_amount() >= 5 && C.use(5)) + if(state == MACHINE_FRAME_EMPTY && C.get_amount() >= 5 && C.use(5)) to_chat(user, "You add cables to the frame.") - state = 2 - icon_state = "box_1" + state = MACHINE_FRAME_WIRED + update_icon(UPDATE_ICON_STATE) else to_chat(user, "At some point during construction you lost some cable. Make sure you have five lengths before trying again.") return @@ -97,10 +115,12 @@ to_chat(user, "You dismantle the frame.") deconstruct(TRUE) return - if(2) + if(MACHINE_FRAME_WIRED) + // see wirecutter_act() + if(istype(P, /obj/item/circuitboard)) var/obj/item/circuitboard/B = P - if(B.board_type == "machine") + if(B.board_type == frame_type) if(!B.build_path) to_chat(user, "This is not a functional machine board!") return @@ -108,43 +128,17 @@ to_chat(user, "You add the circuit board to the frame.") circuit = P user.drop_item() - P.loc = src - name += " ([B.board_name])" - icon_state = "box_2" - state = 3 + P.forceMove(src) + state = MACHINE_FRAME_CIRCUITBOARD components = list() req_components = circuit.req_components?.Copy() - update_namelist() - update_req_desc() + update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_ICON_STATE) else to_chat(user, "This frame does not accept circuit boards of this type!") return - if(istype(P, /obj/item/wirecutters)) - playsound(src.loc, P.usesound, 50, 1) - to_chat(user, "You remove the cables.") - state = 1 - icon_state = "box_0" - var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil(src.loc,5) - A.amount = 5 - return - if(3) - if(P.tool_behaviour == TOOL_CROWBAR) - playsound(src.loc, P.usesound, 50, 1) - state = 2 - circuit.loc = src.loc - circuit = null - if(length(components) == 0) - to_chat(user, "You remove the circuit board.") - else - to_chat(user, "You remove the circuit board and other components.") - for(var/obj/item/I in components) - I.loc = src.loc - name = initial(name) - desc = initial(desc) - req_components = null - components = null - icon_state = "box_1" - return + + if(MACHINE_FRAME_CIRCUITBOARD) + // see crowbar_act() if(istype(P, /obj/item/storage/part_replacer) && length(P.contents) && get_req_components_amt()) var/obj/item/storage/part_replacer/replacer = P @@ -171,7 +165,7 @@ to_chat(user, "[part.name] applied.") replacer.play_rped_sound() - update_req_desc() + update_appearance(UPDATE_DESC) return if(isitem(P)) @@ -189,13 +183,13 @@ S.use(camt) components += NS req_components[I] -= camt - update_req_desc() + update_appearance(UPDATE_DESC) break user.drop_item() P.forceMove(src) components += P req_components[I]-- - update_req_desc() + update_appearance(UPDATE_DESC) return 1 if(!success) to_chat(user, "You cannot add that to the machine!") @@ -204,10 +198,45 @@ if(user.a_intent == INTENT_HARM) return ..() -/obj/machinery/constructable_frame/machine_frame/screwdriver_act(mob/living/user, obj/item/I) - if(state != 3) +/obj/structure/machine_frame/wirecutter_act(mob/living/user, obj/item/I) + if(state != MACHINE_FRAME_WIRED) return + . = TRUE + if(!I.use_tool(src, user, 0, volume = I.tool_volume)) + return + to_chat(user, "You remove the cables.") + state = MACHINE_FRAME_EMPTY + new /obj/item/stack/cable_coil(loc, 5) + update_appearance(UPDATE_ICON_STATE) + +/obj/structure/machine_frame/crowbar_act(mob/living/user, obj/item/I) + if(state != MACHINE_FRAME_CIRCUITBOARD) + return + + . = TRUE + if(!I.use_tool(src, user, 0, volume = I.tool_volume)) + return + state = MACHINE_FRAME_WIRED + circuit.forceMove(loc) + circuit = null + if(length(components) == 0) + to_chat(user, "You remove the circuit board.") + else + to_chat(user, "You remove the circuit board and other components.") + for(var/obj/item/comp in components) + comp.forceMove(loc) + + req_components = null + components = null + update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_ICON_STATE) + + +/obj/structure/machine_frame/screwdriver_act(mob/living/user, obj/item/I) + if(state != MACHINE_FRAME_CIRCUITBOARD) + return + . = TRUE + var/component_check = 1 for(var/R in req_components) if(req_components[R] > 0) @@ -222,12 +251,15 @@ qdel(O) new_machine.component_parts = list() for(var/obj/O in src) - O.loc = null + O.forceMove(null) new_machine.component_parts += O - circuit.loc = null + circuit.forceMove(null) new_machine.RefreshParts() qdel(src) - return TRUE + +#undef MACHINE_FRAME_EMPTY +#undef MACHINE_FRAME_WIRED +#undef MACHINE_FRAME_CIRCUITBOARD //Machine Frame Circuit Boards /*Common Parts: Parts List: Ignitor, Timer, Infra-red laser, Infra-red sensor, t_scanner, Capacitor, Valve, sensor unit, diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index c4c46fbb601f7..b325cf00d0fac 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -142,9 +142,12 @@ if(machine_powernet?.powernet_area != get_area(src)) var/area/machine_area = get_area(src) if(machine_area) + var/old_power_mode = power_state + change_power_mode(NO_POWER_USE) // Take away our current power from the old network machine_powernet?.unregister_machine(src) machine_powernet = machine_area.powernet machine_powernet.register_machine(src) + change_power_mode(old_power_mode) // add it to the new network /// Helper proc to change the machines power usage mode, automatically adjusts static power usage to maintain perfect parity /obj/machinery/proc/change_power_mode(use_type = IDLE_POWER_USE) @@ -290,7 +293,7 @@ qdel(src) /obj/machinery/proc/spawn_frame(disassembled) - var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(loc) + var/obj/structure/machine_frame/M = new /obj/structure/machine_frame(loc) . = M M.anchored = anchored if(!disassembled) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index f1d575b9f3e61..4864a68880b5b 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -84,30 +84,26 @@ /obj/machinery/suit_storage_unit/blueshield/secure secure = TRUE -/obj/machinery/suit_storage_unit/engine +/obj/machinery/suit_storage_unit/industrial/engine name = "engineering suit storage unit" - icon_state = "industrial" - base_icon_state = "industrial" mask_type = /obj/item/clothing/mask/breath boots_type = /obj/item/clothing/shoes/magboots suit_type = /obj/item/mod/control/pre_equipped/engineering req_access = list(ACCESS_ENGINE_EQUIP) board_type = /obj/item/circuitboard/suit_storage_unit/industrial -/obj/machinery/suit_storage_unit/engine/secure +/obj/machinery/suit_storage_unit/industrial/engine/secure secure = TRUE -/obj/machinery/suit_storage_unit/ce +/obj/machinery/suit_storage_unit/industrial/ce name = "chief engineer's suit storage unit" - icon_state = "industrial" - base_icon_state = "industrial" mask_type = /obj/item/clothing/mask/gas boots_type = /obj/item/clothing/shoes/magboots/advance suit_type = /obj/item/mod/control/pre_equipped/advanced req_access = list(ACCESS_CE) board_type = /obj/item/circuitboard/suit_storage_unit/industrial -/obj/machinery/suit_storage_unit/ce/secure +/obj/machinery/suit_storage_unit/industrial/ce/secure secure = TRUE /obj/machinery/suit_storage_unit/rd @@ -193,6 +189,7 @@ mask_type = /obj/item/clothing/mask/gas/explorer suit_type = /obj/item/mod/control/pre_equipped/standard/explorer req_access = list(ACCESS_EXPEDITION) + /obj/machinery/suit_storage_unit/cmo name = "chief medical officer's suit storage unit" mask_type = /obj/item/clothing/mask/breath @@ -230,6 +227,8 @@ /obj/machinery/suit_storage_unit/syndicate name = "syndicate suit storage unit" + icon_state = "syndicate" + base_icon_state = "syndicate" mask_type = /obj/item/clothing/mask/gas/syndicate suit_type = /obj/item/mod/control/pre_equipped/nuclear req_access = list(ACCESS_SYNDICATE) @@ -306,6 +305,7 @@ if(state_open) . += "[base_icon_state]_open" + . += "[base_icon_state]_lights_open" if(suit) . += "[base_icon_state]_suit" if(helmet) diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 6c87c92559d6f..1830ca6472de5 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -5,7 +5,7 @@ name = "ominous beacon" desc = "This looks suspicious..." icon = 'icons/obj/singularity.dmi' - icon_state = "beacon" + icon_state = "beacon0" anchored = FALSE density = TRUE diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index 3948a843a294f..14bf8142a8345 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -972,6 +972,7 @@ /obj/item/food/spacetwinkie = 6, /obj/item/food/cheesiehonkers = 6, /obj/item/food/tastybread = 6, + /obj/item/food/deluxe_chocolate_bar = 6, /obj/item/food/stroopwafel = 2) contraband = list(/obj/item/food/syndicake = 6) @@ -986,6 +987,7 @@ /obj/item/food/spacetwinkie = 64, /obj/item/food/cheesiehonkers = 64, /obj/item/food/tastybread = 80, + /obj/item/food/deluxe_chocolate_bar = 100, /obj/item/food/stroopwafel = 100, /obj/item/food/syndicake = 175) //syndicakes are genuinely kind of powerful diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index 877058d2d8270..56f5736359d2b 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -43,7 +43,9 @@ /obj/item/storage/backpack/security = 2, /obj/item/storage/backpack/satchel_sec = 2, /obj/item/clothing/gloves/color/black = 4, - /obj/item/clothing/accessory/armband/sec = 6) + /obj/item/clothing/accessory/armband/sec = 6, + /obj/item/clothing/head/helmet/space/plasmaman/security = 4, + /obj/item/clothing/under/plasmaman/security = 4) contraband = list(/obj/item/clothing/head/helmet/street_judge = 1, /obj/item/clothing/suit/armor/vest/street_judge = 1, @@ -84,6 +86,8 @@ /obj/item/storage/backpack/satchel_sec = 50, /obj/item/clothing/gloves/color/black = 20, /obj/item/clothing/accessory/armband/sec = 20, + /obj/item/clothing/head/helmet/space/plasmaman/security = 60, + /obj/item/clothing/under/plasmaman/security = 60, /obj/item/clothing/shoes/jackboots/noisy = 200) refill_canister = /obj/item/vending_refill/secdrobe @@ -119,7 +123,9 @@ /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/gloves/color/latex = 2, /obj/item/reagent_containers/drinks/flask/detflask = 2, - /obj/item/storage/fancy/cigarettes/dromedaryco = 5) + /obj/item/storage/fancy/cigarettes/dromedaryco = 5, + /obj/item/clothing/head/helmet/space/plasmaman/white = 2, + /obj/item/clothing/under/plasmaman/enviroslacks = 2) prices = list(/obj/item/clothing/under/rank/security/detective = 50, /obj/item/clothing/under/rank/security/detective/black = 75, @@ -141,7 +147,9 @@ /obj/item/clothing/gloves/color/black = 20, /obj/item/clothing/gloves/color/latex = 20, /obj/item/reagent_containers/drinks/flask/detflask = 50, - /obj/item/storage/fancy/cigarettes/dromedaryco = 5) + /obj/item/storage/fancy/cigarettes/dromedaryco = 5, + /obj/item/clothing/head/helmet/space/plasmaman/white = 60, + /obj/item/clothing/under/plasmaman/enviroslacks = 60) contraband = list(/obj/item/toy/figure/crew/detective = 1) @@ -184,7 +192,9 @@ /obj/item/storage/backpack/medic = 2, /obj/item/storage/backpack/satchel_med = 2, /obj/item/storage/backpack/duffel/medical = 2, - /obj/item/clothing/gloves/color/latex/nitrile = 3) + /obj/item/clothing/gloves/color/latex/nitrile = 3, + /obj/item/clothing/head/helmet/space/plasmaman/medical = 3, + /obj/item/clothing/under/plasmaman/medical = 3) contraband = list(/obj/item/toy/figure/crew/md = 1) @@ -214,7 +224,9 @@ /obj/item/storage/backpack/medic = 50, /obj/item/storage/backpack/satchel_med = 50, /obj/item/storage/backpack/duffel/medical = 50, - /obj/item/clothing/gloves/color/latex/nitrile = 50) + /obj/item/clothing/gloves/color/latex/nitrile = 50, + /obj/item/clothing/head/helmet/space/plasmaman/medical = 60, + /obj/item/clothing/under/plasmaman/medical = 60) refill_canister = /obj/item/vending_refill/medidrobe @@ -241,7 +253,9 @@ /obj/item/clothing/shoes/sandal/white = 2, /obj/item/storage/backpack/virology = 2, /obj/item/storage/backpack/satchel_vir = 2, - /obj/item/storage/backpack/duffel/virology = 2) + /obj/item/storage/backpack/duffel/virology = 2, + /obj/item/clothing/head/helmet/space/plasmaman/viro = 2, + /obj/item/clothing/under/plasmaman/viro = 2) contraband = list(/obj/item/toy/figure/crew/virologist = 1) @@ -256,7 +270,9 @@ /obj/item/clothing/shoes/sandal/white = 20, /obj/item/storage/backpack/virology = 50, /obj/item/storage/backpack/satchel_vir = 50, - /obj/item/storage/backpack/duffel/virology = 50) + /obj/item/storage/backpack/duffel/virology = 50, + /obj/item/clothing/head/helmet/space/plasmaman/viro = 60, + /obj/item/clothing/under/plasmaman/viro = 60) refill_canister = /obj/item/vending_refill/virodrobe @@ -283,7 +299,9 @@ /obj/item/storage/bag/chemistry = 2, /obj/item/storage/backpack/chemistry = 2, /obj/item/storage/backpack/satchel_chem = 2, - /obj/item/storage/backpack/duffel/chemistry = 2) + /obj/item/storage/backpack/duffel/chemistry = 2, + /obj/item/clothing/head/helmet/space/plasmaman/chemist = 2, + /obj/item/clothing/under/plasmaman/chemist = 2) prices = list(/obj/item/clothing/under/rank/medical/chemist = 50, /obj/item/clothing/under/rank/medical/chemist/skirt = 50, @@ -296,7 +314,9 @@ /obj/item/clothing/shoes/sandal/white = 20, /obj/item/storage/backpack/chemistry = 50, /obj/item/storage/backpack/satchel_chem = 50, - /obj/item/storage/backpack/duffel/chemistry = 50) + /obj/item/storage/backpack/duffel/chemistry = 50, + /obj/item/clothing/head/helmet/space/plasmaman/chemist = 60, + /obj/item/clothing/under/plasmaman/chemist = 60) contraband = list(/obj/item/toy/figure/crew/chemist = 1) @@ -313,13 +333,15 @@ ads_list = "Perfect for the mad scientist in you!" vend_reply = "Thank you for using the GeneDrobe!" products = list(/obj/item/clothing/under/rank/rnd/geneticist = 3, - /obj/item/clothing/suit/storage/labcoat/genetics = 3, /obj/item/clothing/shoes/laceup = 3, /obj/item/clothing/shoes/white = 3, /obj/item/clothing/shoes/sandal/white = 3, /obj/item/storage/backpack/genetics = 2, /obj/item/storage/backpack/satchel_gen = 2, - /obj/item/storage/backpack/duffel/genetics = 2) + /obj/item/storage/backpack/duffel/genetics = 2, + /obj/item/clothing/suit/storage/labcoat/genetics = 3, + /obj/item/clothing/head/helmet/space/plasmaman/genetics = 3, + /obj/item/clothing/under/plasmaman/genetics = 3) contraband = list(/obj/item/toy/figure/crew/geneticist = 1) @@ -330,7 +352,9 @@ /obj/item/clothing/shoes/sandal/white = 20, /obj/item/storage/backpack/genetics = 50, /obj/item/storage/backpack/satchel_gen = 50, - /obj/item/storage/backpack/duffel/genetics = 50) + /obj/item/storage/backpack/duffel/genetics = 50, + /obj/item/clothing/head/helmet/space/plasmaman/genetics = 60, + /obj/item/clothing/under/plasmaman/genetics = 60) refill_canister = /obj/item/vending_refill/genedrobe @@ -360,7 +384,9 @@ /obj/item/clothing/shoes/sandal/white = 3, /obj/item/storage/backpack/science = 2, /obj/item/storage/backpack/satchel_tox = 2, - /obj/item/storage/backpack/duffel/science = 2) + /obj/item/storage/backpack/duffel/science = 2, + /obj/item/clothing/head/helmet/space/plasmaman/science = 3, + /obj/item/clothing/under/plasmaman/science = 3) contraband = list(/obj/item/toy/figure/crew/rd = 1, /obj/item/toy/figure/crew/scientist = 1) @@ -377,7 +403,9 @@ /obj/item/clothing/shoes/sandal/white = 20, /obj/item/storage/backpack/science = 50, /obj/item/storage/backpack/satchel_tox = 50, - /obj/item/storage/backpack/duffel/science = 50) + /obj/item/storage/backpack/duffel/science = 50, + /obj/item/clothing/head/helmet/space/plasmaman/science = 60, + /obj/item/clothing/under/plasmaman/science = 60) refill_canister = /obj/item/vending_refill/scidrobe @@ -407,7 +435,9 @@ /obj/item/clothing/shoes/black = 3, /obj/item/storage/backpack/robotics = 2, /obj/item/storage/backpack/satchel_robo = 2, - /obj/item/storage/backpack/duffel/robotics = 2) + /obj/item/storage/backpack/duffel/robotics = 2, + /obj/item/clothing/head/helmet/space/plasmaman/robotics = 3, + /obj/item/clothing/under/plasmaman/robotics = 3) contraband = list(/obj/item/toy/figure/crew/roboticist = 1, /obj/item/toy/figure/crew/borg = 1) @@ -426,7 +456,9 @@ /obj/item/clothing/shoes/black = 20, /obj/item/storage/backpack/robotics = 50, /obj/item/storage/backpack/satchel_robo = 50, - /obj/item/storage/backpack/duffel/robotics = 50) + /obj/item/storage/backpack/duffel/robotics = 50, + /obj/item/clothing/head/helmet/space/plasmaman/robotics = 60, + /obj/item/clothing/under/plasmaman/robotics = 60) refill_canister = /obj/item/vending_refill/robodrobe @@ -458,7 +490,9 @@ /obj/item/storage/backpack/satchel_eng = 2, /obj/item/storage/backpack/duffel/engineering = 2, /obj/item/clothing/gloves/color/yellow = 2, - /obj/item/storage/belt/utility = 2) + /obj/item/storage/belt/utility = 2, + /obj/item/clothing/head/helmet/space/plasmaman/engineering = 3, + /obj/item/clothing/under/plasmaman/engineering = 3) contraband = list(/obj/item/toy/figure/crew/ce = 1, /obj/item/toy/figure/crew/engineer = 1) @@ -479,7 +513,9 @@ /obj/item/storage/backpack/satchel_eng = 50, /obj/item/storage/backpack/duffel/engineering = 50, /obj/item/clothing/gloves/color/yellow = 250, - /obj/item/storage/belt/utility = 75) + /obj/item/storage/belt/utility = 75, + /obj/item/clothing/head/helmet/space/plasmaman/engineering = 60, + /obj/item/clothing/under/plasmaman/engineering = 60) refill_canister = /obj/item/vending_refill/engidrobe @@ -512,7 +548,9 @@ /obj/item/storage/backpack/industrial/atmos = 2, /obj/item/storage/backpack/satchel_atmos = 2, /obj/item/storage/backpack/duffel/atmos = 2, - /obj/item/storage/belt/utility = 2) + /obj/item/storage/belt/utility = 2, + /obj/item/clothing/head/helmet/space/plasmaman/atmospherics = 3, + /obj/item/clothing/under/plasmaman/atmospherics = 3) contraband = list(/obj/item/toy/figure/crew/atmos = 1) @@ -533,7 +571,9 @@ /obj/item/storage/backpack/industrial/atmos = 50, /obj/item/storage/backpack/satchel_atmos = 50, /obj/item/storage/backpack/duffel/atmos = 50, - /obj/item/storage/belt/utility = 75) + /obj/item/storage/belt/utility = 75, + /obj/item/clothing/head/helmet/space/plasmaman/atmospherics = 60, + /obj/item/clothing/under/plasmaman/atmospherics = 60) refill_canister = /obj/item/vending_refill/atmosdrobe @@ -563,7 +603,9 @@ /obj/item/clothing/gloves/fingerless = 6, /obj/item/clothing/accessory/armband/cargo = 6, /obj/item/clothing/shoes/black = 3, - /obj/item/clothing/shoes/workboots = 3) + /obj/item/clothing/shoes/workboots = 3, + /obj/item/clothing/head/helmet/space/plasmaman/cargo = 3, + /obj/item/clothing/under/plasmaman/cargo = 3) contraband = list(/obj/item/toy/figure/crew/qm = 1, /obj/item/toy/figure/crew/cargotech = 1, @@ -582,7 +624,9 @@ /obj/item/clothing/gloves/fingerless = 20, /obj/item/clothing/accessory/armband/cargo = 20, /obj/item/clothing/shoes/black = 20, - /obj/item/clothing/shoes/workboots = 20) + /obj/item/clothing/shoes/workboots = 20, + /obj/item/clothing/head/helmet/space/plasmaman/cargo = 60, + /obj/item/clothing/under/plasmaman/cargo = 60) refill_canister = /obj/item/vending_refill/cargodrobe @@ -611,7 +655,9 @@ /obj/item/clothing/shoes/jackboots = 3, /obj/item/clothing/mask/gas/explorer = 3, /obj/item/storage/backpack/explorer = 2, - /obj/item/storage/backpack/satchel/explorer = 2) + /obj/item/storage/backpack/satchel/explorer = 2, + /obj/item/clothing/head/helmet/space/plasmaman/expedition = 3, + /obj/item/clothing/under/plasmaman/expedition = 3) contraband = list(/obj/item/toy/figure/crew/explorer = 1) @@ -626,7 +672,9 @@ /obj/item/clothing/accessory/armband/cargo = 20, /obj/item/clothing/shoes/jackboots = 20, /obj/item/storage/backpack/explorer = 50, - /obj/item/storage/backpack/satchel/explorer = 50) + /obj/item/storage/backpack/satchel/explorer = 50, + /obj/item/clothing/head/helmet/space/plasmaman/expedition = 60, + /obj/item/clothing/under/plasmaman/expedition = 60) refill_canister = /obj/item/vending_refill/exploredrobe @@ -655,7 +703,9 @@ /obj/item/clothing/accessory/waistcoat = 2, /obj/item/clothing/accessory/armband/service = 3, /obj/item/reagent_containers/glass/rag = 3, - /obj/item/storage/box/dish_drive = 1) + /obj/item/storage/box/dish_drive = 1, + /obj/item/clothing/head/helmet/space/plasmaman/chef = 2, + /obj/item/clothing/under/plasmaman/chef = 2) contraband = list(/obj/item/toy/figure/crew/chef = 1) @@ -672,7 +722,9 @@ /obj/item/clothing/accessory/waistcoat = 20, /obj/item/clothing/accessory/armband/service = 20, /obj/item/reagent_containers/glass/rag = 5, - /obj/item/storage/box/dish_drive = 100) + /obj/item/storage/box/dish_drive = 100, + /obj/item/clothing/head/helmet/space/plasmaman/chef = 60, + /obj/item/clothing/under/plasmaman/chef = 60) refill_canister = /obj/item/vending_refill/chefdrobe @@ -697,7 +749,9 @@ /obj/item/clothing/accessory/waistcoat = 2, /obj/item/clothing/accessory/armband/service = 3, /obj/item/reagent_containers/glass/rag = 3, - /obj/item/storage/box/dish_drive = 1) + /obj/item/storage/box/dish_drive = 1, + /obj/item/clothing/head/helmet/space/plasmaman/white = 2, + /obj/item/clothing/under/plasmaman/enviroslacks = 2) contraband = list(/obj/item/toy/figure/crew/bartender = 1) @@ -712,7 +766,9 @@ /obj/item/clothing/accessory/waistcoat = 20, /obj/item/clothing/accessory/armband/service = 20, /obj/item/reagent_containers/glass/rag = 5, - /obj/item/storage/box/dish_drive = 100) + /obj/item/storage/box/dish_drive = 100, + /obj/item/clothing/head/helmet/space/plasmaman/white = 60, + /obj/item/clothing/under/plasmaman/enviroslacks = 60) refill_canister = /obj/item/vending_refill/bardrobe @@ -739,7 +795,9 @@ /obj/item/clothing/accessory/armband/service = 3, /obj/item/storage/backpack/botany = 2, /obj/item/storage/backpack/satchel_hyd = 2, - /obj/item/storage/backpack/duffel/hydro = 2) + /obj/item/storage/backpack/duffel/hydro = 2, + /obj/item/clothing/head/helmet/space/plasmaman/botany = 3, + /obj/item/clothing/under/plasmaman/botany = 3) contraband = list(/obj/item/toy/figure/crew/botanist = 1) @@ -755,7 +813,9 @@ /obj/item/clothing/accessory/armband/service = 20, /obj/item/storage/backpack/botany = 50, /obj/item/storage/backpack/satchel_hyd = 50, - /obj/item/storage/backpack/duffel/hydro = 50) + /obj/item/storage/backpack/duffel/hydro = 50, + /obj/item/clothing/head/helmet/space/plasmaman/botany = 60, + /obj/item/clothing/under/plasmaman/botany = 60) refill_canister = /obj/item/vending_refill/hydrodrobe @@ -781,7 +841,9 @@ /obj/item/clothing/gloves/janitor = 3, /obj/item/clothing/shoes/galoshes = 3, /obj/item/clothing/accessory/armband/service = 3, - /obj/item/storage/belt/janitor = 3) + /obj/item/storage/belt/janitor = 3, + /obj/item/clothing/head/helmet/space/plasmaman/janitor = 3, + /obj/item/clothing/under/plasmaman/janitor = 3) contraband = list(/obj/item/toy/figure/crew/janitor = 1) @@ -792,7 +854,9 @@ /obj/item/clothing/head/soft/janitorpurple = 20, /obj/item/clothing/head/beret/janitor = 20, /obj/item/clothing/suit/storage/hazardvest/staff = 50, - /obj/item/clothing/accessory/armband/service = 20) + /obj/item/clothing/accessory/armband/service = 20, + /obj/item/clothing/head/helmet/space/plasmaman/janitor = 60, + /obj/item/clothing/under/plasmaman/janitor = 60) refill_canister = /obj/item/vending_refill/janidrobe @@ -827,7 +891,9 @@ /obj/item/clothing/shoes/black = 2, /obj/item/clothing/shoes/brown = 2, /obj/item/clothing/glasses/sunglasses/big = 2, - /obj/item/clothing/accessory/armband/procedure = 2) + /obj/item/clothing/accessory/armband/procedure = 2, + /obj/item/clothing/head/helmet/space/plasmaman/white = 2, + /obj/item/clothing/under/plasmaman/enviroslacks = 2) contraband = list(/obj/item/toy/figure/crew/iaa = 1) @@ -850,6 +916,8 @@ /obj/item/clothing/shoes/black = 20, /obj/item/clothing/shoes/brown = 20, /obj/item/clothing/glasses/sunglasses/big = 30, - /obj/item/clothing/accessory/armband/procedure = 20) + /obj/item/clothing/accessory/armband/procedure = 20, + /obj/item/clothing/head/helmet/space/plasmaman/white = 60, + /obj/item/clothing/under/plasmaman/enviroslacks = 60) refill_canister = /obj/item/vending_refill/lawdrobe diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm index bbab6fe3e942e..3ac947a9ef587 100644 --- a/code/game/mecha/combat/durand.dm +++ b/code/game/mecha/combat/durand.dm @@ -1,5 +1,5 @@ /obj/mecha/combat/durand - desc = "A heavily armored exosuit designed for front-line combat." + desc = "Тяжело бронированный экзокостюм, разработанный для боевых действий на передовой." name = "Durand Mk. II" icon_state = "durand" initial_icon = "durand" @@ -30,15 +30,15 @@ /obj/mecha/combat/durand/examine_more(mob/user) . = ..() - . += "A durable heavyweight combat mech designed and produced by Defiance Arms. \ - The Durand is an outdated design among Defiance's line of battlemechs and was initially created to fulfill the role of a combat spearhead, breaking into enemy combat formations. \ - Supplanted by newer, more advanced models, these old machines found themselves on the open market and are popular among corporations, private security firms, and planetary militia." + . += "Надежный тяжелый боевой робот, разработанный и произведенный Defiance Arms. \ + Дюранд является устаревшей моделью среди боевых мехов Defiance Arms и изначально создавался для прорыва обороны противника. \ + Вытесненные более новыми, более совершенными моделями, эти старые экзокостюмы оказались на открытом рынке и пользуются популярностью среди корпораций, частных охранных фирм и планетарной милиции." . += "" - . += "Able to bear a wide array of heavy weapons and defensive tools, Nanotrasen found a use for the Durand as a machine to counter biohazards and hostile alien lifeforms, using it to secure new research installations or to fend off hostile fauna and bioforms. \ - As with all station-side mechs, Nanotrasen has purchased the license to produce the Durand in their facilities." + . += "Дюранд способен нести широкий спектр тяжелого оружия и защитных инструментов, потому Nanotrasen использует его в качестве машины для противодействия биологическим опасностям, враждебным инопланетным формам жизни, а так же для защиты новых исследовательских станций или для отражения враждебной фауны и флоры. \ + Как в случаях со всеми станционными мехами, Nanotrasen приобрела лицензию на производство Дюранда на своих предприятиях." /obj/mecha/combat/durand/old - desc = "A retired, third-generation combat exosuit designed by Defiance Arms. Originally developed to combat hostile alien lifeforms" + desc = "Списанный экзокостюм третьего поколения, разработанный компанией Defiance Arms для боевых действий. Изначально создан для борьбы с враждебными инопланетными формами жизни." name = "Old Durand" icon_state = "old_durand" initial_icon = "old_durand" @@ -55,8 +55,8 @@ /obj/mecha/combat/durand/old/examine_more(mob/user) ..() . = list() - . += "A relic of a mech, once produced by Defiance Arms in the decade of 2470. \ - It is now sought after by collectors and museums alike and has found its way into the hands of many a black market over the decades since its later versions replaced it." + . += "Настоящая реликвия среди мехов, когда-то произведенная Defiance Arms в 2470-х годах. \ + Сейчас его ищут как коллекционеры, так и музеи, и за десятилетия, прошедшие с тех пор, как его заменили более поздние версии, он попал в руки многих черных рынков." . += "" - . += "Built initially to break into and destroy Xenomorph infestations, bigger and better war machines exist. \ - But many still uphold this version of the Durand as an unstoppable classic, and finding one intact and functional has become increasingly rare." + . += "Созданные изначально для уничтожения нашествий ксеноморфов, существуют более крупные и эффективные боевые экзокостюмы. \ + Но многие до сих пор считают эту версию Дюранда непреодолимой классикой, и найти такую ​​неповрежденную и функциональную модель становится все сложнее." diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index 6742c606111cb..b675f78c6120e 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -1,5 +1,5 @@ /obj/mecha/combat/gygax - desc = "A lightweight security exosuit. Popular among private and corporate security." + desc = "Легкий боевой экзокостюм. Популярен среди частных и корпоративных служб безопасности" name = "Gygax" icon_state = "gygax" initial_icon = "gygax" @@ -35,16 +35,16 @@ /obj/mecha/combat/gygax/examine_more(mob/user) . = ..() - . += "A light, fast and cheap combat mech designed and produced by Shellguard Munitions. \ - Originally developed as a mobile flanker for open combat scenarios, a substantial flaw in the mech's Leg Overdrive systems caused poor sales. \ - When using this system, the legs of the Gygax are prone to overheating and damaging the rest of the machine, leading overzealous pilots to harm themselves more than the enemy." + . += "Легкий, быстрый и дешевый боевой экзокостюм, разработанный и произведенный Shellguard Munitions. \ + Первоначально разработан как мобильный мех для сценариев открытого боя, однако существенный недостаток в системе ускорения ног привёл к плохим продажам. \ + При использовании этой системы ноги Гигакса склонны к перегреву и повреждению остальной части экзокостюма, в результате чего чрезмерно усердные пилоты наносят больше вреда себе, чем противнику." . += "" - . += "Despite this flaw, Shellguard was able to reconsider the use of the mech and instead marketed it as a civil defence and policing mech. \ - Popularity soared, especially among corporations like Nanotrasen, who were seeking a light, fast, cheap design to use to equip their security teams. \ - As with all station-side mechs, Nanotrasen has purchased the license to produce the Gygax in their facilities." + . += "Несмотря на этот недостаток, Shellguard Munitions смогли пересмотреть использование этого робота и начали рекламировать его как экзокостюм для гражданской обороны и полиции. \ + Популярность резко возросла, особенно среди таких корпораций, как Nanotrasen, которые искали легкую, быструю и дешевую конструкцию для оснащения своих служб безопасности. \ + Как в случаях со всеми станционными мехами, Nanotrasen приобрела лицензию на производство Гигакса на своих предприятиях." /obj/mecha/combat/gygax/dark - desc = "A lightweight exosuit, painted in a dark scheme. This model appears to have some modifications." + desc = "Легкий экзокостюм, окрашенный в темные тона. Эта модель, похоже, имеет некоторые модификации." name = "Dark Gygax" icon_state = "darkgygax" initial_icon = "darkgygax" @@ -65,7 +65,7 @@ /obj/mecha/combat/gygax/dark/loaded/Initialize(mapload) . = ..() - var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot + var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot/syndie ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster ME.attach(src) @@ -82,8 +82,8 @@ /obj/mecha/combat/gygax/dark/examine_more(mob/user) ..() . = list() - . += "A light, fast and cheap combat mech designed and produced by Shellguard Munitions, though this one appears to be modified. \ - With minor alterations to the loadout, armor, and a slick black paint job, this variant strikes a menacing silhouette, its owner clearly being someone you should not mess with." + . += "Легкий, быстрый и дешевый боевой экзокостюм, разработанный и произведенный Shellguard Munitions, хотя он выглядит модифицированным. \ + С небольшими изменениями в снаряжении, броне и гладкой черной окраске этот вариант выглядит угрожающе, а его владелец явно не из тех, с кем вам следует связываться." . += "" - . += "Despite the flaws of the base model, this modified Gygax has no trouble being a speedy, dangerous killing machine. \ - Alterations such as this are common amongst fringe users and outlaw groups, and the upgrades are most certainly illegal. Don't cut yourself." + . += "Несмотря на недостатки базовой модели, этот модифицированный Гигакс является быстрой и опасной машиной для убийств. \ + Подобные модели распространены среди преступных группировок, и модификации, безусловно, являются незаконными." diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm index 0478f0f904bf0..66e1a3b10a9b5 100644 --- a/code/game/mecha/combat/honker.dm +++ b/code/game/mecha/combat/honker.dm @@ -1,5 +1,5 @@ /obj/mecha/combat/honker - desc = "Produced by \"Tyranny of Honk, INC\", this exosuit is designed as heavy clown-support. Used to spread the fun and joy of life. HONK!" + desc = "Созданный компанией \"Tyranny of Honk, INC\", этот экзокостюм предназначен для мощной поддержки клоунов. Используется для распространения веселья и радости жизни. ХОНК!" name = "H.O.N.K" icon_state = "honker" initial_icon = "honker" @@ -140,8 +140,8 @@ /obj/mecha/combat/honker/examine_more(mob/user) . = ..() - . += "A cheerful, colorful modification of a Durand chassis, the Honk mech is designed as heavy laughterfield support for producing mass honking casualties. \ - Built and perfected by some of the most skilled Clowns ever known to the galaxy, with materials and labor provided by Donk Co, the Honk has somehow managed to have its design smuggled aboard almost ever Nanotrasen station, to the imminent laughter (screams) and joy (despair) of it's crew!" + . += "Веселая и яркая модификация Дюранда Х.О.Н.К. спроектирована для поддержки весёлой атмосферы. \ + Построенный и усовершенствованный одними из самых опытных клоунов, когда-либо известных в галактике, с использованием материалов и рабочей силы, предоставленных Donk Co, Х.О.Н.К. каким-то образом удалось проникнуть на борт почти каждой станции Nanotrasen, для распространения неминуемого смеха (крика) и радости (страданий) всему экипажу!" . += "" - . += "Equipped with a massive HoNkER BlAsT 5000 horn and long range mortars capable of firing both slippery banana peels and dangerous mousetraps, the Honk is well equipped to provide a Clown with everything they need to 'entertain' a station's crew, and to draw the ire of any nearby Security. \ - Honk!" + . += "Оборудованный массивным гудком ХоНКоВзРыВ 5000 и минометами дальнего действия, способными стрелять как скользкими банановыми кожурами, так и опасными мышеловками, Х.О.Н.К. хорошо оснащен для обеспечения клоуна всем необходимым, чтобы «развлечь» экипаж станции и вызвать гнев сотрудников службы безопасности. \ + ХОНК!" diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index 14176514fbcfc..b43bf076a3b7b 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -1,5 +1,5 @@ /obj/mecha/combat/marauder - desc = "Heavy-duty combat exosuit, developed after the Durand model. Rarely found among civilian populations." + desc = "Тяжелый боевой экзокостюм, разработанный на основе модели Дюранд. Редко встречается среди гражданского населения." name = "Marauder" icon_state = "marauder" initial_icon = "marauder" @@ -50,15 +50,15 @@ /obj/mecha/combat/marauder/examine_more(mob/user) . = ..() - . += "The newest combat mech developed by Defiance Arms, the Marauder is now their mainline offering in the galactic arms market. \ - Based on the earlier Durand chassis, the Marauder is a high-tech weapon of war and destruction, fulfilling the spearhead role of Defiance's earlier design while supporting more firepower than ever before." + . += "Новейший боевой экзокостюм, разработанный Defiance Arms, Мародёр теперь является их основным продуктом на галактическом рынке оружия. \ + Мародёр представляет собой высокотехнологичное оружие войны и разрушения, выполняя те же задачи, что и Дюранд, но обеспечивая при этом ещё большую огневую мощь." . += "" - . += "The Marauder is rarely seen in civilian hands; instead, it is marketed towards military and mercenary forces. \ - Recently, Defiance has opened sales to more customers; This includes Nanotrasen, who uses it to equip their ERT dvision." + . += "Мародер редко можно увидеть в руках гражданских лиц, вместо этого он продается военным и наемникам. \ + Недавно Defiance открыла продажи большему количеству клиентов, в их число входит компания Nanotrasen, которая использует его для оснащения своего подразделения ОБР." /obj/mecha/combat/marauder/ares name = "Ares" - desc = "Heavy-duty combat exosuit, adapted from rejected early versions of the Marauder to serve as a biohazard containment exosuit. This model, albeit rare, can be found among civilian populations." + desc = "Сверхмощный боевой экзокостюм, адаптированный из ранних версий Мародера, используется для сдерживания биологической опасности. Эту модель, пусть и редко, но можно встретить среди гражданского населения." icon_state = "ares" initial_icon = "ares" operation_req_access = list(ACCESS_SECURITY) @@ -86,14 +86,14 @@ /obj/mecha/combat/marauder/ares/examine_more(mob/user) ..() . = list() - . += "Developed from earlier Durand prototypes that never saw production, the Ares is produced by Defiance Arms and marketed as the final word in biohazard containment and protection. \ - Heavily armed and armored, and perhaps a little out of date, the Ares is built from the ground up to destroy biological incursions, whatever those may be." + . += "Разработанный на основе более ранних прототипов Дюранда, Арес производится компанией Defiance Arms и позиционируется как последнее слово в сдерживании и защите от биологических опасностей. \ + Тяжело вооруженный и бронированный, пусть и немного устаревший, Арес создан для уничтожения биологических угроз, какими бы они ни были." . += "" - . += "Defiance does not sell the license for the Ares to be produced, and as such, it is rarer than most combat mechs, but is more commonly seen among civilian markets compared to their mainline Marauder chassis. \ - Nanotrases supports a small stable of Ares battlemechs to be used in times of dire emergency." + . += "Defiance Arms не продаёт лицензию на производство Арес, и поэтому он встречается реже, чем большинство боевых мехов. \ + Nanotrasen имеет небольшую группу боевых мехов Арес, которые используются лишь в чрезвычайных ситуациях." /obj/mecha/combat/marauder/seraph - desc = "Heavy-duty command-type exosuit. This is a custom model, utilized only by high-ranking personnel." + desc = "Тяжелый командирский экзокостюм. Это уникальная модель, используемая исключительно высокопоставленным персоналом." name = "Seraph" icon_state = "seraph" initial_icon = "seraph" @@ -130,14 +130,14 @@ /obj/mecha/combat/marauder/seraph/examine_more(mob/user) ..() . = list() - . += "In the field, Nanotrasen teams often needed a command and control unit that could assist where comms failed, and thus, they created a retrofit of the Marauder. \ - This new Seraph variant would serve as a command model, with enhanced comms and command capabilities, but would otherwise be incredibly rare." + . += "В полевых условиях боевым группам Nanotrasen часто требовался пункт коммуникации и командования, который мог бы помочь в случае сбоя связи, и поэтому они создали модификацию Мародёра. \ + Серафим служит командирской моделью с расширенными возможностями связи и командования, невероятно редок среди гражданских." . += "" - . += "Due to the rarity of the Seraph, it can be assumed that things are well and truly fucked if one is seen operating. \ - Deployed only in the direst of emergencies, it will inevitably be the lynchpin of any defense or assault." + . += "Поскольку Серафим встречается редко, можно предположить, что увидеть его в действии - это хороший знак. \ + Используемый только в самых чрезвычайных ситуациях, он неизбежно станет стержнем любой защиты или нападения." /obj/mecha/combat/marauder/mauler - desc = "Heavy-duty combat exosuit, modified with illegal technology and weapons." + desc = "Сверхмощный боевой экзокостюм, модифицированный нелегальными технологиями и оружием." name = "Mauler" icon_state = "mauler" initial_icon = "mauler" @@ -167,8 +167,8 @@ /obj/mecha/combat/marauder/mauler/examine_more(mob/user) ..() . = list() - . += "A bulky, brutish combat mech painted a deep, matte black, highlighted with a menacing red; the Mauler is an illegal retrofit of Defiance's Marauder chassis. \ - Armed to the teeth with various weapons and armored more thickly than some main battle tanks, this mechanical monstrosity is incredibly rare, and little is known about who makes them or why they exist." + . += "Громоздкий, брутальный боевой экзокостюм, окрашенный в глубокий матовый черный цвет с угрожающим красным оттенком. Маулер представляет собой незаконную модификацию модели Мародёр от Defiance Arms. \ +Вооруженый до зубов различным вооружением и имеющий более толстую броню, чем некоторые основные боевые экзокостюмы, это механическое чудовище встречается невероятно редко, и мало что известно о том, кто его производит и зачем оно существует." . += "" - . += "The few confirmed sightings have recently been in the hands of the Gorlex Marauders, a group of hostile pirates with suspected ties to the Syndicate. \ - The Mauler poses a severe threat to any force and should never be taken lightly." + . += "Было замечено несколько Маулеров в руках Мародеров Горлекса, группы враждебных пиратов, подозреваемых в связях с Синдикатом. \ + Маулер представляет серьезную угрозу для любой силы, и к нему никогда не следует относиться легкомысленно." diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm index 7188b0fd10e10..96ce6f66b9bb4 100644 --- a/code/game/mecha/combat/phazon.dm +++ b/code/game/mecha/combat/phazon.dm @@ -1,6 +1,6 @@ /obj/mecha/combat/phazon name = "Phazon" - desc = "An experimental, phase-shifting exosuit developed by Nanotrasen's research division." + desc = "Экспериментальный экзокостюм разработанный Nanotrasen, обладающий способностью фазового сдвига." icon_state = "phazon" initial_icon = "phazon" step_in = 2 @@ -50,10 +50,10 @@ /obj/mecha/combat/phazon/examine_more(mob/user) . = ..() - . += "The Phazon is an experimental Nanotrasen combat design, using a Bluespace Anomaly Core as its heart. \ - This odd crystal allows the mech to phase part way out of reality, allowing it to pass through walls, floors, and other structures as if they never existed in the first place. \ - Designed by an NT research team, the design has recently been distributed to their science stations for testing and preliminary production." + . += "Фазон — это экспериментальный боевой экзокостюм Nanotrasen, в основе которого лежит ядро блюспейс-аномалии. \ + Это странное ядро обеспечивает механизму частичный выход из реальности, позволяя ему проходить сквозь стены и другие препятствия, как если бы их вообще не существовало. \ + Будучи разработанным исследовательской группой Nanotrasen, проект недавно был отправлен на их научные станции для тестирования и предварительного производства." . += "" - . += "Due to the nature of finding Anomaly Cores, Phazons are exceedingly rare. \ - It seems to hum with stored energy, the edges of its chassis blurry in the eyes of others, even at rest. \ - Early test pilots report strange hallucinations and “visions” after extensive use of the phasing ability." + . += "Из-за особенностей обнаружения ядер блюспейс-аномалий Фазоны встречаются чрезвычайно редко. \ + Кажется, что он гудит от накопленной энергии, а края его корпуса размыты для глаз окружающих, даже в состоянии покоя. \ + Первые пилоты-испытатели сообщали о странных галлюцинациях и видениях после интенсивного использования способности фазирования." diff --git a/code/game/mecha/combat/reticence.dm b/code/game/mecha/combat/reticence.dm index 62393bc84a8bc..585c831015400 100644 --- a/code/game/mecha/combat/reticence.dm +++ b/code/game/mecha/combat/reticence.dm @@ -1,5 +1,5 @@ /obj/mecha/combat/reticence - desc = "A silent, fast, and nigh-invisible miming exosuit. Popular among mimes and mime assassins." + desc = "Бесшумный и быстрый экзокостюм для мимов. Популярен среди мимов." name = "\improper Reticence" icon_state = "mime" initial_icon = "mime" @@ -29,9 +29,9 @@ /obj/mecha/combat/reticence/examine_more(mob/user) . = ..() - . += "A dour, colorless modification of a Gygax chassis, the Reticence is a sight to behold…or not behold. \ - It utilizes a mysterious dampening field, added by a cabal of nearly unheard-of mimes, to be entirely silent as it moves over any terrain, making it a favored weapon of this supposed conspiracy and the assassins they may, or may not, employ." + . += "Суровая, бесцветная модификация шасси Гигакса, Молчун — это зрелище, на которое стоит смотреть… или не смотреть. \ + Он использует таинственное поглощающее поле, чтобы сохранять полную тишину при движении по любой местности, что делает его излюбленным оружием для тихих убийц." . += "" - . += "Armed with an S.H.H. “Quietus” Carbine, an utterly silent weapon that can drain the stamina of targets unfortunate enough to be shot by it, it can ensure swift getaways. \ - As a secondary tool, it comes equipped with a mime R.C.D., a device capable of replicating a mime's mysterious ability to create impenetrable, invisible walls. \ - Strangely, the design for the Reticence seems to be present aboard every Nanotrasen station, though to what ends, no one knows." + . += "Вооружен Т.С.С. Карабин «Тихий час», совершенно бесшумным оружием, которое способно истощить цель. \ + В качестве второстепенного инструмента он оснащен УБС мима, устройством, способным воспроизводить таинственную способность пантомимы создавать непроницаемые, невидимые стены. \ + Как ни странно, Молчун, похоже, присутствует на каждой станции Nanotrasen, хотя никто не знает, с какой целью." diff --git a/code/game/mecha/equipment/tools/janitor_tools.dm b/code/game/mecha/equipment/tools/janitor_tools.dm index 5980499582d37..351b8502b5d72 100644 --- a/code/game/mecha/equipment/tools/janitor_tools.dm +++ b/code/game/mecha/equipment/tools/janitor_tools.dm @@ -12,7 +12,7 @@ /obj/item/mecha_parts/mecha_equipment/janitor/mega_mop name = "\improper WLLY mega mop" - desc = "An upsized advanced mop, designed for use in exosuits." + desc = "Увеличенная усовершенствованная швабра, предназначенная для экзокостюмов." icon_state = "mecha_mop" equip_cooldown = 1.5 SECONDS energy_drain = 1 @@ -43,7 +43,7 @@ /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].") + to_chat(user, "Вы выводите из строя автоматическую систему полива на [declent_ru(PREPOSITIONAL)].") reagents.clear_reagents() refill_reagent = "lube" refill_cost = 50 @@ -54,7 +54,7 @@ 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.") + occupant_message("Бак с водой для мега-швабры пополнен.") playsound(chassis, 'sound/effects/refill.ogg', 50, TRUE, -6) return if(reagents.total_volume > 0) @@ -65,11 +65,11 @@ 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].") + chassis.occupant.visible_message("[capitalize(chassis.declent_ru(NOMINATIVE))] начинает мыть [target_turf.declent_ru(ACCUSATIVE)] с помощью [declent_ru(GENITIVE)].", "Вы начинаете мыть [target_turf.declent_ru(ACCUSATIVE)] с помощью [declent_ru(GENITIVE)].") 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].") + chassis.occupant_message("Вы моете [target.declent_ru(ACCUSATIVE)].") if(holosign_enabled) holosign_controller.afterattack(target_turf, chassis.occupant, TRUE) @@ -118,7 +118,7 @@ // 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." + desc = "Модифицированный лампозаменитель для экзокостюмов, который мгновенно устанавливает лампы на место." icon_state = "mecha_light_replacer" equip_cooldown = 1.5 SECONDS energy_drain = 100 @@ -127,7 +127,7 @@ /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].") + to_chat(user, "Вы выводите из строя предохранители на [declent_ru(PREPOSITIONAL)].") /obj/item/mecha_parts/mecha_equipment/janitor/light_replacer/action(atom/target) if(istype(target, /obj/machinery/light)) @@ -139,7 +139,7 @@ // 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." + desc = "Увеличенный пульверизатор для экзокостюмов. Идеально подходит для массовой санитарной обработки." icon_state = "mecha_spray" equip_cooldown = 1.5 SECONDS energy_drain = 200 @@ -170,7 +170,7 @@ /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].") + to_chat(user, "Вы выводите из строя автоматическую систему полива на [declent_ru(PREPOSITIONAL)].") spray_controller.reagents.clear_reagents() refill_reagent = "lube" refill_cost = 50 @@ -220,8 +220,8 @@ // 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." + desc = "Технология блюспейса, интегрированная с увеличенным мусорным мешком и мощными магнитами, позволяет этому устройству подбирать любой мусор. \ + Сложная конструкция мешка предотвращает возможность заглянуть внутрь." icon_state = "mecha_trash_magnet" equip_cooldown = 1.5 SECONDS energy_drain = 5 @@ -278,14 +278,14 @@ 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!") + chassis.occupant_message("Цель вне досягаемости магнита!") 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." + "[capitalize(chassis.occupant.declent_ru(NOMINATIVE))] опустошает [declent_ru(ACCUSATIVE)] в мусорку.", + "Вы опустошаете [declent_ru(ACCUSATIVE)] в мусорку.", + "Вы слышите, как кто-то выбрасывает что-то в мусорку." ) chassis.Beam(target, icon_state = "rped_upgrade", icon = 'icons/effects/effects.dmi', time = 5) playsound(src, 'sound/items/pshoom.ogg', 40, 1) @@ -309,10 +309,10 @@ 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)]") + chassis.occupant_message("Вы подбираете все предметы с помощью [declent_ru(GENITIVE)]. Оставшаяся вместимость грузового отсека: [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].") + chassis.occupant_message("Вы высыпаете всё из [declent_ru(GENITIVE)] в [declent_ru(ACCUSATIVE)].") update_equip_info() diff --git a/code/game/mecha/equipment/tools/mecha_mining_tools.dm b/code/game/mecha/equipment/tools/mecha_mining_tools.dm index e97886ed5400b..2602b2c1fcb06 100644 --- a/code/game/mecha/equipment/tools/mecha_mining_tools.dm +++ b/code/game/mecha/equipment/tools/mecha_mining_tools.dm @@ -6,7 +6,7 @@ /obj/item/mecha_parts/mecha_equipment/drill name = "exosuit drill" - desc = "Equipment for engineering and combat exosuits. This is the drill that'll pierce the heavens!" + desc = "Бур для шахтёрских экзокостюмов. Этот бур пронзит небеса!" icon_state = "mecha_drill" equip_cooldown = 15 energy_drain = 10 @@ -26,12 +26,12 @@ if(target_obj.resistance_flags & UNACIDABLE) return if(is_ancient_rock(target)) - visible_message("This rock appears to be resistant to all mining tools except pickaxes!") + visible_message("Этот камень, похоже, устойчив ко всем инструментам для добычи, кроме кирок!") return - target.visible_message("[chassis] starts to drill [target].", - "[chassis] starts to drill [target]...", - "You hear drilling.") + target.visible_message("[capitalize(chassis.declent_ru(NOMINATIVE))] начинает бурить [target.declent_ru(ACCUSATIVE)].", + "[capitalize(chassis.declent_ru(NOMINATIVE))] начинает бурить [target.declent_ru(ACCUSATIVE)]...", + "Вы слышите шум бурения.") if(do_after_cooldown(target)) set_ready_state(FALSE) @@ -59,29 +59,29 @@ /turf/simulated/wall/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill) if(drill.do_after_mecha(src, 60 / drill.drill_level)) - drill.log_message("Drilled through [src]") + drill.log_message("Бурение [declent_ru(GENITIVE)] завершено") dismantle_wall(TRUE, FALSE) /turf/simulated/wall/r_wall/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill) if(drill.drill_level >= DRILL_HARDENED) if(drill.do_after_mecha(src, 120 / drill.drill_level)) - drill.log_message("Drilled through [src]") + drill.log_message("Бурение [declent_ru(GENITIVE)] завершено") dismantle_wall(TRUE, FALSE) else - drill.occupant_message("[src] is too durable to drill through.") + drill.occupant_message("Бур недостаточно мощный, чтобы пробить [declent_ru(ACCUSATIVE)]") /turf/simulated/mineral/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill) for(var/turf/simulated/mineral/M in range(drill.chassis, 1)) if(get_dir(drill.chassis, M) & drill.chassis.dir) M.gets_drilled() - drill.log_message("Drilled through [src]") + drill.log_message("Бурение [declent_ru(GENITIVE)] завершено") drill.move_ores() /turf/simulated/floor/plating/asteroid/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill) for(var/turf/simulated/floor/plating/asteroid/M in range(1, drill.chassis)) if((get_dir(drill.chassis, M) & drill.chassis.dir) && !M.dug) M.getDug() - drill.log_message("Drilled through [src]") + drill.log_message("Бурение [declent_ru(GENITIVE)] завершено") drill.move_ores() /obj/item/mecha_parts/mecha_equipment/drill/proc/move_ores() @@ -96,8 +96,8 @@ return FALSE /obj/item/mecha_parts/mecha_equipment/drill/proc/drill_mob(mob/living/target, mob/user) - target.visible_message("[chassis] is drilling [target] with [src]!", - "[chassis] is drilling you with [src]!") + target.visible_message("[capitalize(chassis.declent_ru(NOMINATIVE))] бурит [target.declent_ru(ACCUSATIVE)] с помощью [declent_ru(GENITIVE)]!", + "[capitalize(chassis.declent_ru(NOMINATIVE))] бурит вас с помощью [declent_ru(GENITIVE)]!") add_attack_logs(user, target, "DRILLED with [src] ([uppertext(user.a_intent)]) ([uppertext(damtype)])") if(target.stat == DEAD && target.getBruteLoss() >= 200) add_attack_logs(user, target, "gibbed") @@ -125,7 +125,7 @@ /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill name = "diamond-tipped exosuit drill" - desc = "Equipment for engineering and combat exosuits. This is an upgraded version of the drill that'll pierce the heavens!" + desc = "Бур с алмазным наконечником для шахтёрских экзокостюмов. Улучшенная версия бура, который пронзит небеса!" icon_state = "mecha_diamond_drill" origin_tech = "materials=4;engineering=4" equip_cooldown = 10 @@ -136,7 +136,7 @@ /obj/item/mecha_parts/mecha_equipment/mining_scanner name = "exosuit mining scanner" - desc = "Equipment for engineering and combat exosuits. It will automatically check surrounding rock for useful minerals." + desc = "Автоматический сканер руд для шахтёрских экзокостюмов. Автоматически проверяет окружающие породы на наличие полезных минералов." icon_state = "mecha_analyzer" selectable = 0 equip_cooldown = 15 diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index 87cbbae198f8d..73b80c8507224 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -29,7 +29,7 @@ /obj/item/mecha_parts/mecha_equipment/medical/sleeper name = "mounted sleeper" - desc = "Equipment for medical exosuits. A mounted sleeper that stabilizes patients and can inject reagents in the exosuit's reserves." + desc = "Слипер для медицинских экзокостюмов, который поддерживает состояние пациентов и позволяет вводить медикаменты из запасов экзокостюма." icon = 'icons/obj/cryogenic2.dmi' icon_state = "sleeper" origin_tech = "engineering=3;biotech=3;plasmatech=2" @@ -58,8 +58,8 @@ return if(!patient_insertion_check(target)) return - occupant_message("You start putting [target] into [src]...") - chassis.visible_message("[chassis] starts putting [target] into \the [src].") + occupant_message("Вы начинаете помещать [target.declent_ru(ACCUSATIVE)] в [declent_ru(ACCUSATIVE)]...") + chassis.visible_message("[capitalize(chassis.declent_ru(NOMINATIVE))] начинает помещать [target.declent_ru(ACCUSATIVE)] в [declent_ru(ACCUSATIVE)].") if(do_after_cooldown(target)) if(!patient_insertion_check(target)) return @@ -67,19 +67,19 @@ patient = target START_PROCESSING(SSobj, src) update_equip_info() - occupant_message("[target] successfully loaded into [src]. Life support functions engaged.") - chassis.visible_message("[chassis] loads [target] into [src].") + occupant_message("Пациент [target.declent_ru(NOMINATIVE)] успешно помещён в [declent_ru(ACCUSATIVE)]. Функции жизнеобеспечения включены.") + chassis.visible_message("[capitalize(chassis.declent_ru(NOMINATIVE))] помещает [target.declent_ru(ACCUSATIVE)] в [declent_ru(ACCUSATIVE)].") log_message("[target] loaded. Life support functions engaged.") /obj/item/mecha_parts/mecha_equipment/medical/sleeper/proc/patient_insertion_check(mob/living/carbon/target) if(target.buckled) - occupant_message("[target] will not fit into the sleeper because [target.p_they()] [target.p_are()] buckled to [target.buckled]!") + occupant_message("Пациент [target.declent_ru(NOMINATIVE)] не может быть помещён в слипер, потому что пристегнут к [target.buckled.declent_ru(GENITIVE)]!") return FALSE if(target.has_buckled_mobs()) - occupant_message("[target] will not fit into the sleeper because of the creatures attached to it!") + occupant_message("Пациент [target.declent_ru(NOMINATIVE)] не может быть помещён в слипер из-за существ, прикреплённых к нему!") return FALSE if(patient) - occupant_message("The sleeper is already occupied!") + occupant_message("В слипере уже есть пациент!") return FALSE return TRUE @@ -87,7 +87,7 @@ if(!patient) return patient.forceMove(get_turf(src)) - occupant_message("[patient] ejected. Life support functions disabled.") + occupant_message("Пациент [patient.declent_ru(NOMINATIVE)] был извлечён. Функции жизнеобеспечения отключены.") log_message("[patient] ejected. Life support functions disabled.") STOP_PROCESSING(SSobj, src) patient = null @@ -95,7 +95,7 @@ /obj/item/mecha_parts/mecha_equipment/medical/sleeper/detach() if(patient) - occupant_message("Unable to detach [src] - equipment occupied!") + occupant_message("Невозможно отсоединить [declent_ru(ACCUSATIVE)] — оборудование занято!") return STOP_PROCESSING(SSobj, src) return ..() @@ -194,7 +194,7 @@ return var/to_inject = min(R.volume, inject_amount) if(to_inject && patient.reagents.get_reagent_amount(R.id) + to_inject <= inject_amount*2) - occupant_message("Injecting [patient] with [to_inject] units of [R.name].") + occupant_message("Введение [patient.declent_ru(GENITIVE)] [to_inject] юнит[declension_ru(to_inject, "", "а", "ов")] [R.name].") log_message("Injecting [patient] with [to_inject] units of [R.name].") add_attack_logs(chassis.occupant, patient, "Injected with [name] containing [R], transferred [to_inject] units", R.harmless ? ATKLOG_ALMOSTALL : null) SG.reagents.trans_id_to(patient,R.id,to_inject) @@ -219,7 +219,7 @@ if(!chassis.has_charge(energy_drain)) set_ready_state(1) log_message("Deactivated.") - occupant_message("[src] deactivated - no power.") + occupant_message("[capitalize(declent_ru(NOMINATIVE))] деактивирован - нет питания.") STOP_PROCESSING(SSobj, src) return var/mob/living/carbon/M = patient @@ -239,7 +239,7 @@ /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun name = "exosuit syringe gun" - desc = "Equipment for medical exosuits. A chem synthesizer with syringe gun. Reagents inside are held in stasis, so no reactions will occur." + desc = "Шприцемёт для медицинских экзокостюмов. Химический синтезатор с шприцевым пистолетом. Реагенты внутри находятся в стазисе, поэтому реакции не произойдут." icon = 'icons/obj/guns/projectile.dmi' icon_state = "syringegun" var/list/syringes @@ -293,10 +293,10 @@ if(mode) return analyze_reagents(target) if(!length(syringes)) - occupant_message("No syringes loaded.") + occupant_message("Шприцы не загружены.") return if(reagents.total_volume<=0) - occupant_message("No available reagents to load syringe with.") + occupant_message("Нет доступных реагентов для заполнения шприца.") return var/turf/trg = get_turf(target) var/obj/item/reagent_containers/syringe/mechsyringe = syringes[1] @@ -325,7 +325,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.declent_ru(DATIVE)]!") if(M.can_inject(originaloccupant, TRUE, original_target_zone)) if(mechsyringe.reagents) for(var/datum/reagent/A in mechsyringe.reagents.reagent_list) @@ -372,7 +372,7 @@ message += " added to production" START_PROCESSING(SSobj, src) occupant_message(message) - occupant_message("Reagent processing started.") + occupant_message("Обработка реагентов начата.") log_message("Reagent processing started.") return if(afilter.get("show_reagents")) @@ -448,41 +448,41 @@ /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/load_syringe(obj/item/reagent_containers/syringe/S) if(length(syringes)= 2) - occupant_message("The syringe is too far away.") + occupant_message("Шприц слишком далеко.") return FALSE for(var/obj/structure/D in S.loc)//Basic level check for structures in the way (Like grilles and windows) if(!(D.CanPass(S,src.loc))) - occupant_message("Unable to load syringe.") + occupant_message("Невозможно загрузить шприц.") return FALSE for(var/obj/machinery/door/D in S.loc)//Checks for doors if(!(D.CanPass(S,src.loc))) - occupant_message("Unable to load syringe.") + occupant_message("Невозможно загрузить шприц.") return FALSE S.reagents.trans_to(src, S.reagents.total_volume) S.forceMove(src) syringes += S - occupant_message("Syringe loaded.") + occupant_message("Шприц загружен.") update_equip_info() return TRUE - occupant_message("[src] syringe chamber is full.") + occupant_message("Запас шприцов в [declent_ru(PREPOSITIONAL)] полон.") return FALSE /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/analyze_reagents(atom/A) if(get_dist(src,A) >= 4) - occupant_message("The object is too far away.") + occupant_message("Объект слишком далеко.") return FALSE if(!A.reagents || ismob(A)) - occupant_message("No reagent info gained from [A].") + occupant_message("Информация о реагентах [A.declent_ru(GENITIVE)] не получена.") return FALSE - occupant_message("Analyzing reagents...") + occupant_message("Анализ реагентов...") for(var/datum/reagent/R as anything in A.reagents.reagent_list) if(initial(R.id) in GLOB.blocked_chems) - occupant_message("Reagent unable to be analyzed, purging from analyzer.") + occupant_message("Реагент не подлежит анализу, производится его удаление из анализатора.") return FALSE if(add_known_reagent(R.id, R.name)) - occupant_message("Reagent analyzed, identified as [R.name] and added to database.") + occupant_message("Реагент проанализирован, идентифицирован как [R.name] и добавлен в базу данных.") send_byjax(chassis.occupant,"msyringegun.browser","reagents_form",get_reagents_form()) - occupant_message("Analysis complete.") + occupant_message("Анализ завершён.") return TRUE /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/add_known_reagent(r_id,r_name) @@ -506,7 +506,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("Обработка реактивов остановлена.") log_message("Reagent processing stopped.") STOP_PROCESSING(SSobj, src) return @@ -517,7 +517,7 @@ /obj/item/mecha_parts/mecha_equipment/medical/rescue_jaw name = "rescue jaw" - desc = "Emergency rescue jaws, designed to help first responders reach their patients. Opens doors and removes obstacles." + desc = "Аварийная спасательная клешня, предназначенная для помощи спасателям в достижении своих пациентов. Открывает двери и убирает препятствия." icon_state = "mecha_clamp" //can work, might use a blue resprite later but I think it works for now origin_tech = "materials=2;engineering=2" //kind of sad, but identical to jaws of life equip_cooldown = 15 @@ -536,12 +536,12 @@ if(isliving(target)) //interact with living beings var/mob/living/M = target if(chassis.occupant.a_intent == INTENT_HARM)//the patented, medical rescue claw is incapable of doing harm. Worry not. - target.visible_message("[chassis] gently boops [target] on the nose, its hydraulics hissing as safety overrides slow a brutal punch down at the last second.", \ - "") + target.visible_message("[capitalize(chassis.declent_ru(NOMINATIVE))] аккуратно тыкает [target.declent_ru(ACCUSATIVE)] в нос. В последний момент гидравлика шипит и предохранители смягчают жёсткий удар.", \ + "") else push_aside(chassis, M)//out of the way, I have people to save! - occupant_message("You gently push [target] out of the way.") - chassis.visible_message("[chassis] gently pushes [target] out of the way.") + occupant_message("Вы аккуратно отодвигаете [target.declent_ru(ACCUSATIVE)] с дороги.") + chassis.visible_message("[capitalize(chassis.declent_ru(NOMINATIVE))] аккуратно отодвигает [target.declent_ru(ACCUSATIVE)] с дороги.") /obj/item/mecha_parts/mecha_equipment/medical/rescue_jaw/proc/push_aside(obj/mecha/M, mob/living/L) switch(get_dir(M, L)) diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm index d03fb828be0d6..6016529e30af2 100644 --- a/code/game/mecha/equipment/tools/other_tools.dm +++ b/code/game/mecha/equipment/tools/other_tools.dm @@ -8,7 +8,7 @@ /obj/item/mecha_parts/mecha_equipment/teleporter name = "mounted teleporter" - desc = "An exosuit module that allows exosuits to teleport to any position in view." + desc = "Модуль для экзокостюма, который позволяет телепортироваться в любую видимую позицию." icon_state = "mecha_teleport" origin_tech = "bluespace=7" equip_cooldown = 150 @@ -27,7 +27,7 @@ /obj/item/mecha_parts/mecha_equipment/teleporter/precise name = "upgraded teleporter" - desc = "An exosuit module that allows exosuits to teleport to any position in view. This is the high-precision, energy-efficient version." + desc = "Модуль для экзокостюма, который позволяет телепортироваться в любую видимую позицию. Это версия с более высокой точностью и энергоэффективностью." origin_tech = "bluespace=7" energy_drain = 1000 tele_precision = 1 @@ -36,7 +36,7 @@ /obj/item/mecha_parts/mecha_equipment/gravcatapult name = "mounted gravitational catapult" - desc = "An exosuit mounted Gravitational Catapult." + desc = "Гравитационная катапульта для экзокостюмов." icon_state = "mecha_teleport" origin_tech = "bluespace=3;magnets=3;engineering=4" equip_cooldown = 10 @@ -50,16 +50,16 @@ if(!action_checks(target)) return if(cooldown_timer > world.time) - occupant_message("[src] is still recharging.") + occupant_message("[capitalize(declent_ru(NOMINATIVE))] всё еще заряжается.") return switch(mode) if(MECH_GRAVCAT_MODE_GRAVSLING) if(!locked) if(!istype(target) || target.anchored) - occupant_message("Unable to lock on [target]") + occupant_message("Невозможно зафиксировать [target.declent_ru(ACCUSATIVE)].") return locked = target - occupant_message("Locked on [target]") + occupant_message("Зафиксировано на [target.declent_ru(PREPOSITIONAL)].") send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",get_equip_info()) else if(target!=locked) if(locked in view(chassis)) @@ -70,7 +70,7 @@ return 1 else locked = null - occupant_message("Lock on [locked] disengaged.") + occupant_message("Фиксация на [target.declent_ru(PREPOSITIONAL)] отключена.") send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",get_equip_info()) if(MECH_GRAVCAT_MODE_GRAVPUSH) var/list/atoms = list() @@ -106,7 +106,7 @@ /// what is that noise? A BAWWW from TK mutants. /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster name = "armor booster module (Close combat weaponry)" - desc = "Boosts exosuit armor against armed melee attacks. Requires energy to operate." + desc = "Увеличивает броню экзокостюма против ближних атак. Для работы требуется энергия." icon_state = "mecha_abooster_ccw" origin_tech = "materials=4;combat=4" equip_cooldown = 10 @@ -124,7 +124,7 @@ /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster name = "armor booster module (Ranged weaponry)" - desc = "Boosts exosuit armor against ranged attacks. Requires energy to operate." + desc = "Увеличивает броню экзокостюма против дальних атак. Для работы требуется энергия." icon_state = "mecha_abooster_proj" origin_tech = "materials=4;combat=3;engineering=3" equip_cooldown = 10 @@ -144,7 +144,7 @@ /obj/item/mecha_parts/mecha_equipment/repair_droid name = "repair droid" - desc = "Automated repair droid. Scans exosuit for damage and repairs it. Can fix almost all types of external or internal damage." + desc = "Автоматизированный ремонтный дроид. Сканирует экзокостюм на наличие повреждений и выполняет ремонт. Способен исправить почти все виды внешних и внутренних повреждений." icon_state = "repair_droid" origin_tech ="magnets=3;programming=3;engineering=4" equip_cooldown = 20 @@ -230,7 +230,7 @@ /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay name = "exosuit energy relay" - desc = "An exosuit module that wirelessly drains energy from any available power channel in an area. The performance index barely compensates for movement costs." + desc = "Модуль для экзокостюма, который беспроводным образом извлекает энергию из любых доступных источников питания в области. КПД едва компенсирует затраты на движение." icon_state = "tesla" origin_tech = "magnets=4;powerstorage=4;engineering=4" energy_drain = 0 @@ -292,7 +292,7 @@ if(isnull(cur_charge) || !chassis.cell) STOP_PROCESSING(SSobj, src) set_ready_state(1) - occupant_message("No powercell detected.") + occupant_message("Батарея не обнаружена.") return if(cur_charge < chassis.cell.maxcharge) var/area/A = get_area(chassis) @@ -311,7 +311,7 @@ /obj/item/mecha_parts/mecha_equipment/generator name = "exosuit plasma converter" - desc = "An exosuit module that generates power using solid plasma as fuel. Pollutes the environment." + desc = "Модуль для экзокостюма, который генерирует энергию, используя твёрдую плазму в качестве топлива. Загрязняет окружающую среду плазмой при повреждении." icon_state = "tesla" origin_tech = "plasmatech=2;powerstorage=2;engineering=2" range = MECHA_MELEE @@ -369,7 +369,7 @@ return 0 if(fuel_amount >= max_fuel) - occupant_message("Unit is full.") + occupant_message("Генератор полностью заполнен.") return 0 var/obj/item/stack/sheet/P = I @@ -380,7 +380,7 @@ var/added_fuel = units * P.perunit fuel_amount += added_fuel P.use(units) - occupant_message("[units] unit\s of [fuel_name] successfully loaded.") + occupant_message("[units] единиц[declension_ru(units, "а", "ы", "")] [fuel_name] успешно загружено.") return added_fuel else if(istype(I, /obj/structure/ore_box)) @@ -392,7 +392,7 @@ return fuel_added else - occupant_message("[fuel_name] traces in target minimal! [I] cannot be used as fuel.") + occupant_message("[capitalize(fuel_name)] на минимуме! [capitalize(I.declent_ru(NOMINATIVE))] не может использоваться в качестве топлива.") return 0 /obj/item/mecha_parts/mecha_equipment/generator/attackby(weapon,mob/user, params) @@ -425,7 +425,7 @@ /obj/item/mecha_parts/mecha_equipment/generator/nuclear name = "exonuclear reactor" - desc = "An exosuit module that generates power using uranium as fuel. Pollutes the environment." + desc = "Ядерный реактор для экзокостюма, который генерирует энергию, используя уран в качестве топлива. Некоторые называют его «ядерным блоком». Загрязняет окружающую среду при повреждении." icon_state = "tesla" origin_tech = "powerstorage=4;engineering=4" fuel_name = "uranium" // Our fuel name as a string @@ -442,7 +442,7 @@ /obj/item/mecha_parts/mecha_equipment/thrusters name = "exosuit ion thrusters" - desc = "Ion thrusters to be attached to an exosuit. Drains power even while not in flight." + desc = "Ионные ускорители, предназначенные для установки на экзокостюм. Потребляют энергию даже в состоянии покоя." icon_state = "tesla" origin_tech = "powerstorage=4;engineering=4" range = 0 diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm index 2a438536c195d..0484770374170 100644 --- a/code/game/mecha/equipment/tools/work_tools.dm +++ b/code/game/mecha/equipment/tools/work_tools.dm @@ -7,7 +7,7 @@ /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp name = "hydraulic clamp" - desc = "Equipment for engineering exosuits. Lifts objects and loads them into cargo." + desc = "Оборудование для экзокостюмов. Позволяет поднимать объекты и помещать их в грузовой отсек." icon_state = "mecha_clamp" equip_cooldown = 15 energy_drain = 10 @@ -39,17 +39,17 @@ if(istype(target, /obj/machinery/atmospherics/supermatter_crystal)) //No, you can't pick up the SM with this you moron, did you think you were clever? var/obj/mecha/working/ripley/R = chassis QDEL_LIST_CONTENTS(R.cargo) //We don't want to drop cargo that just spam hits the SM, let's delete it - occupant_message("You realise in horror what you have done as [chassis] starts warping around you!") + occupant_message("Вы с ужасом осознаёте, что вы сделали, когда [chassis.declent_ru(NOMINATIVE)] начинает искривляться вокруг вас!") chassis.occupant.dust() target.Bumped(chassis) return if(O.anchored) - occupant_message("[target] is firmly secured!") + occupant_message("[capitalize(target.declent_ru(NOMINATIVE))] надёжно фиксируется!") return if(length(cargo_holder.cargo) >= cargo_holder.cargo_capacity) - occupant_message("Not enough room in cargo compartment!") + occupant_message("Недостаточно места в грузовом отсеке!") return - chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.") + chassis.visible_message("[capitalize(chassis.declent_ru(NOMINATIVE))] поднимает [target.declent_ru(ACCUSATIVE)] и начинает помещать в грузовой отсек.") var/anchor_state_before_load = O.anchored O.anchored = TRUE if(!do_after_cooldown(target)) @@ -58,7 +58,7 @@ cargo_holder.cargo += O O.forceMove(chassis) O.anchored = FALSE - occupant_message("[target] was successfully loaded.") + occupant_message("[capitalize(target.declent_ru(NOMINATIVE))] успешно загружается.") log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - length(cargo_holder.cargo)]") return @@ -71,21 +71,21 @@ if(!M) return M.adjustOxyLoss(round(dam_force/2)) - target.visible_message("[chassis] squeezes [target].", \ - "[chassis] squeezes [target].",\ - "You hear something crack.") + target.visible_message("[capitalize(chassis.declent_ru(NOMINATIVE))] сжимает [target.declent_ru(ACCUSATIVE)].", \ + "[capitalize(chassis.declent_ru(NOMINATIVE))] сжимает [target.declent_ru(ACCUSATIVE)].",\ + "Вы слышите, как что-то хрустит.") add_attack_logs(chassis.occupant, M, "Squeezed with [src] ([uppertext(chassis.occupant.a_intent)]) ([uppertext(damtype)])") start_cooldown() return step_away(M, chassis) - occupant_message("You push [target] out of the way.") - chassis.visible_message("[chassis] pushes [target] out of the way.") + occupant_message("Вы толкаете [target.declent_ru(ACCUSATIVE)] с дороги.") + chassis.visible_message("[capitalize(chassis.declent_ru(NOMINATIVE))] толкает [target.declent_ru(ACCUSATIVE)] с дороги.") //This is pretty much just for the death-ripley /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill name = "\improper KILL CLAMP" - desc = "They won't know what clamped them!" + desc = "Они не поймут, что их сжало!" energy_drain = 0 /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill/action(atom/target) @@ -95,40 +95,40 @@ var/obj/O = target if(!O.anchored) if(length(cargo_holder.cargo) < cargo_holder.cargo_capacity) - chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.") + chassis.visible_message("[capitalize(chassis.declent_ru(NOMINATIVE))] поднимает [target.declent_ru(ACCUSATIVE)] и начинает помещать в грузовой отсек.") O.anchored = TRUE if(do_after_cooldown(target)) cargo_holder.cargo += O O.forceMove(chassis) O.anchored = FALSE - occupant_message("[target] successfully loaded.") + occupant_message("[capitalize(target.declent_ru(NOMINATIVE))] успешно загружается.") log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - length(cargo_holder.cargo)]") else O.anchored = initial(O.anchored) else - occupant_message("Not enough room in cargo compartment!") + occupant_message("Недостаточно места в грузовом отсеке!") else - occupant_message("[target] is firmly secured!") + occupant_message("[capitalize(target.declent_ru(NOMINATIVE))] надёжно фиксируется!") else if(isliving(target)) var/mob/living/M = target if(M.stat == DEAD) return if(chassis.occupant.a_intent == INTENT_HARM) - target.visible_message("[chassis] destroys [target] in an unholy fury.", - "[chassis] destroys [target] in an unholy fury.") + target.visible_message("[capitalize(chassis.declent_ru(NOMINATIVE))] уничтожает [target.declent_ru(ACCUSATIVE)] в нечестивой ярости.", + "[capitalize(chassis.declent_ru(NOMINATIVE))] уничтожает [target.declent_ru(ACCUSATIVE)] в нечестивой ярости.") M.gib() /*if(chassis.occupant.a_intent == INTENT_DISARM) target.visible_message("[chassis] rips [target]'s arms off.", "[chassis] rips [target]'s arms off.")*/ else step_away(M,chassis) - target.visible_message("[chassis] tosses [target] like a piece of paper.") + target.visible_message("[capitalize(chassis.declent_ru(NOMINATIVE))] бросает [target.declent_ru(ACCUSATIVE)], словно комок бумаги.") return /obj/item/mecha_parts/mecha_equipment/extinguisher name = "exosuit extinguisher" - desc = "Equipment for engineering exosuits. A rapid-firing high capacity fire extinguisher." + desc = "Оборудование для инженерных экзокостюмов. Огнетушитель с высокой ёмкостью и скоростью работы." icon_state = "mecha_exting" equip_cooldown = 5 energy_drain = 0 @@ -197,7 +197,7 @@ /obj/item/mecha_parts/mecha_equipment/rcd name = "mounted RCD" - desc = "An exosuit-mounted Rapid Construction Device. (Can be attached to: Any exosuit)" + desc = "Устройство быстрого строительства для экзокостюмов. Можно установить на все экзокостюмы." icon_state = "mecha_rcd" origin_tech = "materials=4;bluespace=3;magnets=4;powerstorage=4;engineering=4" equip_cooldown = 10 @@ -234,21 +234,21 @@ if((isreinforcedwallturf(target) && !canRwall) || istype(target, /turf/simulated/wall/indestructible)) return 0 var/turf/simulated/wall/W = target - occupant_message("Deconstructing [target]...") + occupant_message("Деконструкция [target.declent_ru(GENITIVE)]...") if(do_after_cooldown(W)) chassis.spark_system.start() W.ChangeTurf(/turf/simulated/floor/plating) playsound(W, usesound, 50, 1) else if(isfloorturf(target)) var/turf/simulated/floor/F = target - occupant_message("Deconstructing [target]...") + occupant_message("Деконструкция [target.declent_ru(GENITIVE)]...") if(do_after_cooldown(F)) chassis.spark_system.start() F.ChangeTurf(F.baseturf) F.recalculate_atmos_connectivity() playsound(F, usesound, 50, 1) else if(istype(target, /obj/machinery/door/airlock)) - occupant_message("Deconstructing [target]...") + occupant_message("Деконструкция [target.declent_ru(GENITIVE)]...") if(do_after_cooldown(target)) chassis.spark_system.start() qdel(target) @@ -256,21 +256,21 @@ if(MECH_RCD_MODE_WALL_OR_FLOOR) if(isspaceturf(target) || ischasm(target)) var/turf/space/S = target - occupant_message("Building Floor...") + occupant_message("Постройка пола...") if(do_after_cooldown(S)) S.ChangeTurf(/turf/simulated/floor/plating) playsound(S, usesound, 50, 1) chassis.spark_system.start() else if(isfloorturf(target)) var/turf/simulated/floor/F = target - occupant_message("Building Wall...") + occupant_message("Постройка стены...") if(do_after_cooldown(F)) F.ChangeTurf(/turf/simulated/wall) playsound(F, usesound, 50, 1) chassis.spark_system.start() if(MECH_RCD_MODE_AIRLOCK) if(isfloorturf(target)) - occupant_message("Building Airlock...") + occupant_message("Постройка шлюза...") if(do_after_cooldown(target)) chassis.spark_system.start() var/obj/machinery/door/airlock/T = new /obj/machinery/door/airlock(target) @@ -286,11 +286,11 @@ mode = text2num(href_list["mode"]) switch(mode) if(MECH_RCD_MODE_DECONSTRUCT) - occupant_message("Switched RCD to Deconstruct.") + occupant_message("Режим RCD переключён на деконструкцию.") if(MECH_RCD_MODE_WALL_OR_FLOOR) - occupant_message("Switched RCD to Construct.") + occupant_message("Режим RCD переключён на постройку.") if(MECH_RCD_MODE_AIRLOCK) - occupant_message("Switched RCD to Construct Airlock.") + occupant_message("Режим RCD переключён на постройку шлюзов.") /obj/item/mecha_parts/mecha_equipment/rcd/get_equip_info() return "[..()] \[D|C|A\]" @@ -298,7 +298,7 @@ /obj/item/mecha_parts/mecha_equipment/mimercd name = "mounted MRCD" - desc = "An exosuit-mounted Mime Rapid Construction Device. (Can be attached to: Reticence)" + desc = "Устройство быстрого строительства Мима для экзокостюмов. Можно установить на Reticence" icon_state = "mecha_rcd" origin_tech = "materials=4;bluespace=3;magnets=4;powerstorage=4;engineering=4" equip_cooldown = 10 @@ -320,7 +320,7 @@ return if(isfloorturf(target)) - occupant_message("Building Wall...") + occupant_message("Постройка стены...") if(do_after_cooldown(target)) new /obj/structure/barricade/mime/mrcd(target) chassis.spark_system.start() @@ -329,7 +329,7 @@ /obj/item/mecha_parts/mecha_equipment/cable_layer name = "cable layer" - desc = "Equipment for engineering exosuits. Lays cable along the exosuit's path." + desc = "Кабельная катушка для инженерных экзокостюмов. Прокладывает кабель вдоль пути экзокостюма." icon_state = "mecha_wire" var/obj/structure/cable/last_piece var/obj/item/stack/cable_coil/cable @@ -367,12 +367,12 @@ cable.amount = 0 cable.amount += to_load target.use(to_load) - occupant_message("[to_load] meters of cable successfully loaded.") + occupant_message("[to_load] метр[declension_ru(to_load, "", "а", "ов")] кабеля успешно загружено.") send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info()) else - occupant_message("Reel is full.") + occupant_message("Катушка полностью заполнена.") else - occupant_message("Unable to load [target] - no cable found.") + occupant_message("Невозможно загрузить [target.declent_ru(ACCUSATIVE)] - кабель не найден.") /obj/item/mecha_parts/mecha_equipment/cable_layer/Topic(href,href_list) @@ -385,14 +385,14 @@ return if(href_list["cut"]) if(cable && cable.amount) - var/m = round(input(chassis.occupant,"Please specify the length of cable to cut","Cut cable",min(cable.amount,30)) as num, 1) + var/m = round(input(chassis.occupant,"Пожалуйста, укажите длину кабеля для резки","Отрезать кабель",min(cable.amount,30)) as num, 1) m = min(m, cable.amount) if(m) use_cable(m) var/obj/item/stack/cable_coil/CC = new (get_turf(chassis)) CC.amount = m else - occupant_message("There's no more cable on the reel.") + occupant_message("На катушке больше нет кабеля.") /obj/item/mecha_parts/mecha_equipment/cable_layer/get_equip_info() var/output = ..() @@ -402,11 +402,11 @@ /obj/item/mecha_parts/mecha_equipment/cable_layer/proc/use_cable(amount) if(!cable || cable.amount<1) set_ready_state(1) - occupant_message("Cable depleted, [src] deactivated.") + occupant_message("Кабель исчерпан, [declent_ru(NOMINATIVE)] деактивируется.") log_message("Cable depleted, [src] deactivated.") return FALSE if(cable.amount < amount) - occupant_message("No enough cable to finish the task.") + occupant_message("Недостаточно кабеля для завершения задачи.") return FALSE cable.use(amount) update_equip_info() @@ -459,7 +459,7 @@ /obj/item/mecha_parts/mecha_equipment/mech_crusher name = "exosuit crusher" - desc = "A mech mounted crusher. For crushing bigger things." + desc = "Кинетический крашер для экзокостюмов. Идеален для разрушения больших объектов." icon_state = "mecha_crusher" equip_cooldown = 1.2 SECONDS energy_drain = 3000 diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 5e02b662dfa31..7c45ddab4e6cf 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -82,7 +82,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/disabler equip_cooldown = 0.8 SECONDS name = "\improper CH-DS \"Peacemaker\" disabler" - desc = "A weapon for combat exosuits. Shoots basic disablers." + desc = "Оружие для боевых экзокостюмов. Стреляет базовым дизейблером." icon_state = "mecha_disabler" energy_drain = 30 projectile = /obj/item/projectile/beam/disabler @@ -101,7 +101,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion equip_cooldown = 4 SECONDS name = "mkIV Ion Heavy Scatter Cannon" - desc = "An ion shotgun, that when fired gives the mecha a second of EMP shielding with the excess energy from the discharge." + desc = "Ионный дробовик для боевых экзокостюмов. При выстреле предоставляет меху секунду ЭМИ-защиты с избыточной энергией от разряда." icon_state = "mecha_ion" origin_tech = "materials=4;combat=5;magnets=4" energy_drain = 215 // This is per shot + 1x cost, so ~1500 per shotgun shot @@ -118,7 +118,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/tesla equip_cooldown = 3.5 SECONDS name = "\improper P-X Tesla Cannon" - desc = "A weapon for combat exosuits. Fires bolts of electricity similar to the experimental tesla engine." + desc = "Орудие для боевых экзокостюмов. Стреляет энергетическими шарами, по принципу экспериментального тесла-двигателя." icon_state = "mecha_teslacannon" origin_tech = "materials=4;engineering=4;combat=6;magnets=6" energy_drain = 500 @@ -129,7 +129,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/xray equip_cooldown = 3.5 SECONDS name = "\improper S-1 X-Ray Projector" - desc = "A weapon for combat exosuits. Fires beams of X-Rays that pass through solid matter." + desc = "Оружие для боевых экзокостюмов. Стреляет лучами рентгеновских лучей, которые проникают даже через самые твердые материалы." icon_state = "mecha_xray" origin_tech = "materials=3;combat=5;magnets=2;syndicate=2" energy_drain = 80 @@ -145,7 +145,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/immolator equip_cooldown = 3.5 SECONDS name = "\improper ZFI Immolation Beam Gun" - desc = "A weapon for combat exosuits. Fires beams of extreme heat that set targets on fire." + desc = "Орудие для боевых экзокостюмов. Стреляет высокотемпературными лучами, поджигающими цель." icon_state = "mecha_immolator" origin_tech = "materials=4;engineering=4;combat=6;magnets=6" energy_drain = 80 @@ -238,7 +238,7 @@ if(thingy) walk(thingy,0) for(var/obj/mecha/combat/reticence/R in oview(6, chassis)) - R.occupant_message("\The [R] has protected you from [chassis]'s HONK at the cost of some power.") + R.occupant_message("[capitalize(R.declent_ru(NOMINATIVE))] защищает вас от ХОНКа [chassis.declent_ru(GENITIVE)] ценой части энергии.") R.use_power(R.get_charge() / 4) chassis.use_power(energy_drain) @@ -305,7 +305,6 @@ return FALSE /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot - equip_cooldown = 2 SECONDS name = "\improper LBX AC 10 \"Scattershot\"" icon_state = "mecha_scatter" origin_tech = "combat=4" @@ -316,6 +315,12 @@ projectiles_per_shot = 4 variance = 25 harmful = TRUE + equip_cooldown = 2 SECONDS + +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot/syndie //Version used for Dark Gygax + name = "\improper LBX AC 20-r \"Scattershot .45\"" + origin_tech = "combat=4;syndicate=2" //Crew is not going to get it normally anyways + projectile = /obj/item/projectile/bullet/midbullet /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg equip_cooldown = 1 SECONDS @@ -382,7 +387,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang//Because I am a heartless bastard -Sieve equip_cooldown = 9 SECONDS name = "\improper SOB-3 Clusterbang Launcher" - desc = "A weapon for combat exosuits. Launches primed clusterbangs. You monster." + desc = "Оружие для боевых экзокостюмов. Запускает заранее подготовленные кластерные бомбы. Ты монстр." origin_tech = "combat=4;materials=4" projectiles = 3 projectile = /obj/item/grenade/clusterbuster @@ -397,7 +402,7 @@ /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." + desc = "Инструмент для массовой уборки. Запускает заранее подготовленные гранаты с очистительной пеной. Высокая опасность поскользнуться!" icon_state = "mecha_grenadelnchr" origin_tech = "combat=4;engineering=4" projectile = /obj/item/grenade/chem_grenade/cleaner @@ -517,7 +522,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma equip_cooldown = 1 SECONDS name = "\improper 217-D Heavy Plasma Cutter" - desc = "A device that shoots resonant plasma bursts at extreme velocity. The blasts are capable of crushing rock and demolishing solid obstacles." + desc = "Устройство для экзокостюмов. Стреляет резонирующими плазменными импульсами с экстремальной скоростью. Взрывы способны разрушать камень и сносить твердые преграды." icon_state = "mecha_plasmacutter" item_state = "plasmacutter" lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi' diff --git a/code/game/mecha/janitor/nkarrdem.dm b/code/game/mecha/janitor/nkarrdem.dm index 7018c59794034..932a5f4bbb741 100644 --- a/code/game/mecha/janitor/nkarrdem.dm +++ b/code/game/mecha/janitor/nkarrdem.dm @@ -1,5 +1,5 @@ /obj/mecha/nkarrdem - desc = "A heavy duty sanitation exosuit; optimized for the removal of mass amounts of dirt, grime, and grease." + desc = "Тяжёлый санитарный экзокостюм. Оптимизирован для удаления больших объемов грязи, налета и жира." name = "Nkarrdem" icon_state = "nkarrdem" initial_icon = "nkarrdem" @@ -22,17 +22,17 @@ /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." + . += "Nkarrdem — это мех старого поколения для ядерной, химической, биологической защиты, разработанный совместно компаниями Interdyne и Shellguard для быстрой деконтаминации в период частого применения биологического оружия. \ + Однако он пострадал от ряда мер по снижению затрат, что подвергает оператора опасным условиям. Лишние единицы затем продаются для уборки.." . += "" - . += "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." + . += "Название «Nkarrdem» происходит из легенды скреллов и означает «Бирюзовые поля». Бирюзовые поля — это поля водорослей, где короли древности отправлялись на свой вечный покой." /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.") + occupant_message("[capitalize(H.glasses.declent_ru(NOMINATIVE))] мешают вам использовать встроенный уборочный HUD [declent_ru(GENITIVE)].") else var/datum/atom_hud/data/janitor/jani_hud = GLOB.huds[DATA_HUD_JANITOR] jani_hud.add_hud_to(H) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index efcbd0ff3bfa8..bb5e4efbc2f38 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -10,7 +10,7 @@ */ /obj/machinery/mecha_part_fabricator name = "exosuit fabricator" - desc = "Nothing is being built." + desc = "На данный момент ничего не печатает." icon = 'icons/obj/robotics.dmi' icon_state = "fab-idle" density = TRUE @@ -122,7 +122,7 @@ if(!I.tool_start_check(src, user, 0)) return output_dir = turn(output_dir, -90) - to_chat(user, "You change [src] to output to the [dir2text(output_dir)].") + to_chat(user, "Вы поворачиваете выход [declent_ru(GENITIVE)] на [dir2text(output_dir)].") /obj/machinery/mecha_part_fabricator/RefreshParts() var/coef_mats = 0 @@ -200,24 +200,24 @@ var/datum/research/files = get_files() if(!files) - atom_say("Error - No research network linked.") + atom_say("Ошибка - исследовательская сеть не подключена.") return if(!files.known_designs[D.id] || !(D.build_type & allowed_design_types)) return if(being_built) - atom_say("Error: Something is already being built!") + atom_say("Ошибка: Что-то уже печатается!") return if(!can_afford_design(D)) - atom_say("Error: Insufficient materials to build [D.name]!") + atom_say("Ошибка: Недостаточно материалов для печати [D.name]!") return if(stat & NOPOWER) - atom_say("Error: Insufficient power!") + atom_say("Ошибка: Недостаточно энергии!") return var/turf_to_print_on = get_step(src, output_dir) if(iswallturf(turf_to_print_on)) - atom_say("Error: Output blocked by a wall!") + atom_say("Ошибка: Выход заблокирован стеной!") return // Subtract the materials from the holder @@ -261,7 +261,7 @@ var/list/lockbox_access for(var/access in L.req_access) lockbox_access += "[get_access_desc(access)] " - L.desc = "A locked box. It is locked to [lockbox_access]access." + L.desc = "Запертая коробка. Закрыта на [lockbox_access]доступ" // Clean up being_built = null @@ -270,7 +270,7 @@ desc = initial(desc) change_power_mode(IDLE_POWER_USE) cut_overlays() - atom_say("[A] is complete.") + atom_say("Печать [A.declent_ru(GENITIVE)] завершена.") // Keep the queue processing going if it's on process_queue() @@ -303,10 +303,10 @@ */ /obj/machinery/mecha_part_fabricator/proc/can_insert_materials(mob/user) if(panel_open) - to_chat(user, "[src] cannot be loaded with new materials while opened!") + to_chat(user, "В [declent_ru(ACCUSATIVE)] не могут быть загружены новые материалы, пока панель открыта!") return FALSE if(being_built) - to_chat(user, "[src] is currently building a part! Please wait until completion.") + to_chat(user, "[capitalize(declent_ru(NOMINATIVE))] в данный момент печатает деталь! Пожалуйста, дождитесь завершения.") return FALSE return TRUE @@ -327,7 +327,7 @@ if(..()) return if(!allowed(user) && !isobserver(user)) - to_chat(user, "Access denied.") + to_chat(user, "Доступ запрещён.") return ui_interact(user) @@ -442,8 +442,8 @@ if("unlink") if(!network_manager_uid) return - var/choice = tgui_alert(usr, "Are you SURE you want to unlink this fabricator?\nYou wont be able to re-link without the network manager password", "Unlink", list("Yes", "No")) - if(choice == "Yes") + var/choice = tgui_alert(usr, "Вы УВЕРЕНЫ, что хотите отсоединить этот фабрикатор от исследовательской сети? Вы не сможете повторно соединить его без пароля к сети.", "Unlink", list("Да", "Нет")) + if(choice == "Да") unlink() return TRUE @@ -454,23 +454,23 @@ return var/obj/machinery/computer/rnd_network_controller/C = locateUID(params["target_controller"]) if(istype(C, /obj/machinery/computer/rnd_network_controller)) - var/user_pass = tgui_input_text(usr, "Please enter network password", "Password Entry") + var/user_pass = tgui_input_text(usr, "Пожалуйста, введите пароль сети.", "Введите пароль.") // Check the password if(user_pass == C.network_password) C.mechfabs += UID() network_manager_uid = C.UID() - to_chat(usr, "Successfully linked to [C.network_name].") + to_chat(usr, "Успешно подключено к [C.network_name].") else - to_chat(usr, "ERROR: Password incorrect.") + to_chat(usr, "ОШИБКА: Неправильный пароль.") else - to_chat(usr, "ERROR: Controller not found. Please file an issue report.") + to_chat(usr, "ОШИБКА: Контроллер не найден. Пожалуйста, отправьте отчет о проблеме.") return TRUE var/datum/research/files = get_files() if(!files) - to_chat(usr, "Error - No research network linked.") + to_chat(usr, "Ошибка: нет соединения с исследовательской сетью") return . = TRUE @@ -531,7 +531,7 @@ var/datum/material/M = materials.materials[id] if(!M || !M.amount) return - var/num_sheets = tgui_input_number(usr, "How many sheets do you want to withdraw?", "Withdrawing [M.name]", max_value = round(M.amount / 2000)) + var/num_sheets = tgui_input_number(usr, "Сколько листов вы хотите выгрузить?", "Выгрузка [M.name]", max_value = round(M.amount / 2000)) if(isnull(num_sheets) || num_sheets <= 0) return materials.retrieve_sheets(num_sheets, id) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 9ab8e2b090510..4065b6acef8e3 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -16,7 +16,6 @@ armor = list(melee = 20, bullet = 10, laser = 0, energy = 0, bomb = 0, rad = 0, fire = 100, acid = 75) bubble_icon = "machine" var/list/facing_modifiers = list(MECHA_FRONT_ARMOUR = 1.5, MECHA_SIDE_ARMOUR = 1, MECHA_BACK_ARMOUR = 0.5) - var/ruin_mecha = FALSE //if the mecha starts on a ruin, don't automatically give it a tracking beacon to prevent metagaming. var/initial_icon = null //Mech type for resetting icon. Only used for reskinning kits (see custom items) var/can_move = 0 // time of next allowed movement /// Time it takes to enter the mech diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index 18938ca205484..f7243fa8a8ffe 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -144,7 +144,7 @@ /obj/structure/mecha_wreckage/reticence name = "\improper Reticence wreckage" - icon_state = "reticence-broken" + icon_state = "mime-broken" color = "#87878715" desc = "..." @@ -157,10 +157,6 @@ /obj/item/mecha_parts/part/ripley_left_leg, /obj/item/mecha_parts/part/ripley_right_leg) -/obj/structure/mecha_wreckage/ripley/mkii - name = "\improper Ripley MK-II wreckage" - icon_state = "ripleymkii-broken" - /obj/structure/mecha_wreckage/ripley/firefighter name = "\improper Firefighter wreckage" icon_state = "firefighter-broken" diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm index e8995cfd47cb4..776b09dc9f1e2 100644 --- a/code/game/mecha/medical/odysseus.dm +++ b/code/game/mecha/medical/odysseus.dm @@ -1,5 +1,5 @@ /obj/mecha/medical/odysseus - desc = "These exosuits are developed and produced by DeForest Medical Corporation, for rescue operations." + desc = "Медицинский экзокостюм, разработанный корпорацией DeForest Medical для спасательных операций." name = "Odysseus" icon_state = "odysseus" initial_icon = "odysseus" @@ -17,7 +17,7 @@ . = ..() if(. && ishuman(H)) if(istype(H.glasses, /obj/item/clothing/glasses/hud)) - occupant_message("[H.glasses] prevent you from using the built-in medical hud.") + occupant_message("[capitalize(H.glasses.declent_ru(NOMINATIVE))] мешают вам использовать встроенный медицинский HUD.") else var/datum/atom_hud/data/human/medical/advanced/A = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED] A.add_hud_to(H) @@ -47,9 +47,9 @@ /obj/mecha/medical/odysseus/examine_more(mob/user) . = ..() - . += "The Odysseus is a relatively fast, lightweight, and easy-to-maintain exosuit developed by DeForest Medical Corporation. \ - Initially designed for patient rescue and care within hostile environments, it has seen semi-widespread use throughout the sector, usually by larger corporations and military groups who value its ability to get in and out of even the most rugged disaster zones." + . += "Одиссей — это относительно быстрый, легкий и простой в обслуживании экзокостюм, разработанный корпорацией DeForest Medical. \ + Первоначально созданный для спасения и ухода за пациентами в сложных условиях. Он получил высокое распространение в секторе, обычно среди крупных корпораций и военных групп, которые ценят его способность входить и выходить даже из самых трудных зон бедствия." . += "" - . += "DeForest has seen modest success from the Odysseus, with only minor complaints arising from its sluggish pace and lack of armor or defensive capabilities. \ - Despite these flaws, it has found a home amid Nanotrasen medical teams, where Paramedics find solid uses for it and its varied equipment loadout. \ - As with all station-side mechs, Nanotrasen has purchased the license to produce the Odysseus in their facilities." + . += "DeForest Medical добилась скромного успеха с экзокостюмом Одиссей, получив лишь незначительные жалобы на его медлительность и недостаток брони или оборонительных возможностей. \ + Несмотря на эти недостатки, он нашёл применение в медицинских командах Nanotrasen, где парамедики находят полезное применение ему и и его разнообразным комплектам оборудования. \ + Как в случаях со всеми станционными мехами, Nanotrasen приобрела лицензию на производство Одиссея на своих предприятиях." diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index e73662442d671..5719894911de4 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -1,5 +1,5 @@ /obj/mecha/working/ripley - desc = "Autonomous Power Loader Unit. This newer model is refitted with powerful armour against the dangers of the EVA mining process." + desc = "Автономная тяговая механизированная единица «Рипли». Эта новая модель оснащена мощной защитой от опасностей, связанных с процессом добычи полезных ископаемых в открытом космосе." name = "APLU \"Ripley\"" icon_state = "ripley" initial_icon = "ripley" @@ -83,27 +83,27 @@ // Goliath hides if(hides) if(hides == HIDES_COVERED_FULL) - desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - its pilot must be an experienced monster hunter." + desc = "Автономная тяговая механизированная единица «Рипли». На него установлен устрашающий панцирь, полностью состоящий из пластин шкуры голиафа — его пилот, должно быть, опытный охотник на монстров." else - desc = "Autonomous Power Loader Unit. Its armour is enhanced with some goliath hide plates." + desc = "Автономная тяговая механизированная единица «Рипли». Его броня усилена пластинами из кожи голиафа." return // Metal plates if(plates) if(plates == PLATES_COVERED_FULL) - desc = "Autonomous Power Loader Unit. Its armor is completely lined with metal plating." + desc = "Автономная тяговая механизированная единица «Рипли». Его броня полностью покрыта металлическими пластинами." else - desc = "Autonomous Power Loader Unit. Its armor is reinforced with some metal plating." + desc = "Автономная тяговая механизированная единица «Рипли». Его броня усилена металлическими пластинами." return // Drake hides if(drake_hides) if(drake_hides == DRAKE_HIDES_COVERED_FULL) - desc = "Autonomous Power Loader Unit. Its every corner is covered in ancient hide, creating a powerful shield. The pilot of this exosuit must be prepared for battles on the level of legend." + desc = "Автономная тяговая механизированная единица «Рипли». Каждый уголок экзокостюма покрыт древней шкурой, создавая мощный щит. Пилот этого экзокостюма должен быть готов к сражениям на уровне легенд." if(drake_hides == DRAKE_HIDES_COVERED_MODERATE) - desc = "Autonomous Power Loader Unit. Its armor is adorned with dragon hide plates, instilling fear in its enemies and guarding its pilot." + desc = "Автономная тяговая механизированная единица «Рипли». Его броня украшена пластинами из драконьей кожи, внушая страх врагам и защищая пилота." if(drake_hides == DRAKE_HIDES_COVERED_SLIGHT) - desc = "Autonomous Power Loader Unit. The armor of this exosuit only touches the mythical: a few plates of dragon hide adorn its plating like rare warrior trophies." + desc = "Автономная тяговая механизированная единица «Рипли». Броня этого экзокостюма лишь напоминает легенду: несколько пластин из драконьей кожи украшают его обшивку, словно редкие трофеи воина." return /obj/mecha/working/ripley/update_overlays() @@ -133,16 +133,16 @@ /obj/mecha/working/ripley/examine_more(mob/user) . = ..() - . += "The Ripley is a robust, venerable utility exosuit originally produced by Hephaestus Industries. \ - It now sees widespread use in and around the Orion sector, being one of the most pervasive mechs ever produced. \ - Shortly after initial production, Hephaestus licensed production rights for the Ripley to other corporations, earning royalties as the exosuit grew more popular." + . += "«Рипли» — это прочный и надёжный экзокостюм, первоначально произведенный Hephaestus Industries. \ + Сейчас он широко используется в секторе Ориона и за его пределами, являясь одним из самых распространённых экзокостюмов, когда-либо созданных. \ + Вскоре после начала производства Hephaestus передала права на выпуск «Рипли» другим корпорациям, получая отчисления по мере роста популярности экзокостюма." . += "" - . += "Depending on the configuration, the Ripley can be used for many purposes, including mining, construction, and even goods transport. \ - To this day, it remains one of the most valuable mechs ever produced, and Hephaestus enjoys a substantial profit from sales of this aging but rugged design. \ - As with all station-side mechs, Nanotrasen has purchased the license to make the Ripley in their facilities." + . += "В зависимости от конфигурации «Рипли» можно использовать для многих целей, включая добычу полезных ископаемых, строительство и даже транспортировку грузов. \ + По сей день он остается одним из самых популярных мехов, когда-либо созданных, и Hephaestus получает значительную прибыль от продаж этой устаревшей, но прочной конструкции. \ + Как в случаях со всеми станционными мехами, Nanotrasen приобрела лицензию на производство «Рипли» на своих предприятиях." /obj/mecha/working/ripley/firefighter - desc = "A standard APLU chassis that was refitted with additional thermal protection and a cistern." + desc = "Автономная тяговая механизированная единица «Огнеборец». Основан на базовом шасси «Рипли», обладает усовершенствованной термальной защитой и цистерной" name = "APLU \"Firefighter\"" icon_state = "firefighter" initial_icon = "firefighter" @@ -157,15 +157,15 @@ /obj/mecha/working/ripley/firefighter/examine_more(mob/user) ..() . = list() - . += "Based on the venerable Ripley chassis, designed initially by Hephaestus Industries, the Firefighter is a retrofit created by Nanotrasen as their mining operations expanded, and a robust, fireproof exosuit was needed. \ - Adapted to fit heat-resistant shielding, the Firefighter became a popular mech for mining teams in dangerous environments." + . += "Основанный на шасси «Рипли», первоначально разработанном Hephaestus Industries, «Огнеборец» представляет собой модификацию, созданную Nanotrasen по мере расширения горнодобывающих предприятий и необходимости в прочном, огнестойком экзокостюме. \ + Оборудованный термостойкой защитой «Огнеборец» стал популярным экзокостюмом среди горнодобывающих компаний, работающих в опасных условиях." . += "" - . += "Since Nanotrasen's expansion into Epsilon Eridani and their mining operations on Lavaland, the Firefighter has grown more popular among seasoned miners looking for a safer, armored way to mine in even the hottest of biomes. \ - Additionally, it has seen some use among atmospherics crews and is admired for its ability to control even the toughest of plasmafires while protecting its pilot." + . += "С момента экспансии Nanotrasen на Эпсилон Эридана и их горнодобывающих операций на Лаваленде, «Огнеборец» стал более популярным среди опытных шахтеров, ищущих более безопасный и надёжный способ добычи полезных ископаемых даже в самых жарких условиях. \ + Кроме того, он нашел некоторое применение среди атмосферных техников, которые ценят его способность контролировать даже самые сильные плазменные пожары, одновременно защищая своего пилота." /obj/mecha/working/ripley/deathripley name = "DEATH-RIPLEY" - desc = "OH SHIT IT'S THE DEATHSQUAD WE'RE ALL GONNA DIE!" + desc = "ОХ БЛЯДЬ, ЭТО ОТРЯД СМЕРТИ, НАМ ВСЕМ ПИЗДЕЦ!" icon_state = "deathripley" initial_icon = "deathripley" step_in = 3 @@ -188,22 +188,48 @@ /obj/mecha/working/ripley/deathripley/examine_more(mob/user) ..() . = list() - . += "A functioning, well-made collectable for the popular Nanotrasen-Funded holovid show, 'Deathsquad'. \ - A retrofitted and repainted Ripley chassis, the Death Ripley was created and used by the leader of the Deathsquad, Master Sergeant Killjoy, during the climactic battle with the Spider Queen “Xerxes” at the end of Season 4. \ - The mech bears the signature mark of the team's engineer, Corporal Ironhead, who assisted Killjoy in its construction." + . += "Функциональный, искусно выполненный коллекционный реквизит для популярного головид-шоу «Отряд смерти», финансируемого Nanotrasen. \ + Модернизированное и перекрашенное шасси «Рипли», «Рипли Смерти» был создан и использован лидером Отряда Смерти, мастер-сержантом Киллджоем, во время решающей битвы с Паучьей Королевой «Ксеркс» в конце 4-го сезона. \ + На мехе стоит подпись инженера команды, капрала Айронхеда, который помогал Киллджою в его постройке." . += "" - . += "Replicas such as this are sought-after collectibles among the biggest fans of Deathsquad. \ - An altercation even occurred where an individual dressed in a poorly-made Killjoy costume attempted to kill a collector to gain a Death Ripley, who was later sent to a mental institution after screaming, “THE DEATHSQUAD IS REAL." + . += "Подобные копии являются предметом коллекционирования среди самых преданных поклонников «Отряда Смерти». \ + Даже произошла ссора, когда человек, одетый в плохо сшитый костюм Киллджоя, попытался убить коллекционера, чтобы получить «Рипли Смерти», которого позже отправили в психиатрическую больницу после крика: «ОТРЯД СМЕРТИ РЕАЛЕН!»" /obj/mecha/working/ripley/mining - desc = "An old, dusty mining ripley." name = "APLU \"Miner\"" - obj_integrity = 75 //Low starting health + +/obj/mecha/working/ripley/mining/proc/prepare_equipment() + SHOULD_CALL_PARENT(FALSE) + + // Diamond drill as a treat + var/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill/D = new + D.attach(src) + + // Add ore box to cargo + cargo.Add(new /obj/structure/ore_box(src)) + + // Attach hydraulic clamp + var/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/HC = new + HC.attach(src) + + var/obj/item/mecha_parts/mecha_equipment/mining_scanner/scanner = new + scanner.attach(src) /obj/mecha/working/ripley/mining/Initialize(mapload) + . = ..() + prepare_equipment() + +/obj/mecha/working/ripley/mining/old + desc = "Старый, пыльный шахтёрский «Рипли»." + name = "APLU \"Miner\"" + obj_integrity = 75 //Low starting health + +/obj/mecha/working/ripley/mining/old/add_cell() . = ..() if(cell) cell.charge = FLOOR(cell.charge * 0.25, 1) //Starts at very low charge + +/obj/mecha/working/ripley/mining/old/prepare_equipment() //Attach drill if(prob(70)) //Maybe add a drill if(prob(15)) //Possible diamond drill... Feeling lucky? @@ -239,7 +265,7 @@ if(href_list["drop_from_cargo"]) var/obj/O = locate(href_list["drop_from_cargo"]) if(O && (O in cargo)) - occupant_message("You unload [O].") + occupant_message("Вы выгрузили [O.declent_ru(ACCUSATIVE)].") O.loc = get_turf(src) cargo -= O var/turf/T = get_turf(O) @@ -284,5 +310,5 @@ /obj/mecha/working/ripley/emag_act(mob/user) if(!emagged) emagged = TRUE - desc += "
The mech's equipment slots spark dangerously!" + desc += "
Оборудование меха опасно искрится!" return ..() diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 5b8c600933419..38a79e45b2f62 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -71,7 +71,7 @@ else animate_levitate(src, -1, rand(30,120)) - if(weightless_image.icon_state) + if(weightless_image && weightless_image.icon_state) icon_state = weightless_image.icon_state overlays -= weightless_image @@ -264,7 +264,7 @@ density = FALSE layer = TURF_LAYER icon = 'icons/effects/blood.dmi' - icon_state = "gibbl5" + icon_state = "mgibbl5" random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6") no_clear = TRUE mergeable_decal = FALSE diff --git a/code/game/objects/effects/decals/Cleanable/tracks.dm b/code/game/objects/effects/decals/Cleanable/tracks.dm index bf232ca56aa25..d7417d8452aaa 100644 --- a/code/game/objects/effects/decals/Cleanable/tracks.dm +++ b/code/game/objects/effects/decals/Cleanable/tracks.dm @@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(fluidtrack_cache) //BLOODY FOOTPRINTS /obj/effect/decal/cleanable/blood/footprints icon = 'icons/effects/fluidtracks.dmi' - icon_state = "nothingwhatsoever" + icon_state = null desc = "You REALLY shouldn't follow these.." gender = PLURAL random_icon_states = null diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 47e3693f95ff9..cf914e6fb03f7 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -87,10 +87,10 @@ /obj/effect/decal/cleanable/Initialize(mapload) . = ..() + prepare_huds() if(should_merge_decal(loc)) return INITIALIZE_HINT_QDEL var/datum/atom_hud/data/janitor/jani_hud = GLOB.huds[DATA_HUD_JANITOR] - prepare_huds() jani_hud.add_to_hud(src) jani_hud_set_sign() if(random_icon_states && length(src.random_icon_states) > 0) diff --git a/code/game/objects/effects/decals/turf_decal.dm b/code/game/objects/effects/decals/turf_decal.dm index 69cc446158799..8d6315aad78ac 100644 --- a/code/game/objects/effects/decals/turf_decal.dm +++ b/code/game/objects/effects/decals/turf_decal.dm @@ -9,4 +9,5 @@ var/turf/T = loc if(!istype(T)) //you know this will happen somehow CRASH("Turf decal initialized in an object/nullspace") - T.AddComponent(/datum/component/decal, icon, icon_state, dir, CLEAN_GOD, color, null, null, alpha) + + T.AddElement(/datum/element/decal, icon, icon_state, dir, layer, alpha, color, FALSE, null) diff --git a/code/game/objects/effects/decals/turfdecals/weather_decals.dm b/code/game/objects/effects/decals/turfdecals/weather_decals.dm index f179487944af7..4cedd34ca5cbe 100644 --- a/code/game/objects/effects/decals/turfdecals/weather_decals.dm +++ b/code/game/objects/effects/decals/turfdecals/weather_decals.dm @@ -2,10 +2,6 @@ name = "sandy floor" icon_state = "sandyfloor" -/obj/effect/turf_decal/weather/snow - name = "snowy floor" - icon_state = "snowyfloor" - /obj/effect/turf_decal/weather/snow/corner name = "snow corner piece" icon = 'icons/turf/snow.dmi' diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm index 32637ebc05f44..3aafeb4e4ff58 100644 --- a/code/game/objects/effects/forcefields.dm +++ b/code/game/objects/effects/forcefields.dm @@ -60,7 +60,7 @@ max_integrity = 80 /obj/effect/forcefield/mime/advanced - icon_state = "empty" + icon_state = null name = "invisible blockade" desc = "You might be here a while." lifetime = 60 SECONDS diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 9f5471fb2ce48..4d540b743b447 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -7,7 +7,8 @@ opacity = FALSE density = FALSE icon = 'icons/obj/lighting.dmi' - icon_state = "glowshroom" //replaced in New + icon_state = "glowshroomf" + base_icon_state = "glowshroom" //replaced in New layer = ABOVE_NORMAL_TURF_LAYER max_integrity = 30 var/floor = 0 @@ -20,13 +21,15 @@ /obj/structure/glowshroom/glowcap name = "glowcap" desc = "Mycena Ruthenia, a species of mushroom that, while it does glow in the dark, is not actually bioluminescent." - icon_state = "glowcap" + icon_state = "glowcapf" + base_icon_state = "glowcap" myseed = /obj/item/seeds/glowshroom/glowcap /obj/structure/glowshroom/shadowshroom name = "shadowshroom" desc = "Mycena Umbra, a species of mushroom that emits shadow instead of light." - icon_state = "shadowshroom" + icon_state = "shadowshroomf" + base_icon_state = "shadowshroom" myseed = /obj/item/seeds/glowshroom/shadowshroom /obj/structure/glowshroom/shadowshroom/extinguish_light(force = FALSE) @@ -54,7 +57,6 @@ var/datum/plant_gene/trait/glow/G = myseed.get_gene(/datum/plant_gene/trait/glow) set_light(G.glow_range(myseed), G.glow_power(myseed), G.glow_color) setDir(CalcDir()) - var/base_icon_state = initial(icon_state) if(!floor) switch(dir) //offset to make it be on the wall rather than on the floor if(NORTH) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 374a2fb1114d6..bed724a332491 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -242,7 +242,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp /obj/effect/landmark/spawner/roundstart_observer/Initialize(mapload) spawner_list = GLOB.roundstart_observer_start return ..() - + /obj/effect/landmark/Destroy() GLOB.landmarks_list -= src ..() @@ -659,24 +659,3 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp /obj/effect/landmark/mob_spawner/abandoned_minebot mobtype = /mob/living/simple_animal/hostile/asteroid/abandoned_minebot - -// Damage tiles -/obj/effect/landmark/damageturf - icon_state = "damaged" - -/obj/effect/landmark/damageturf/Initialize(mapload) - . = ..() - var/turf/simulated/T = get_turf(src) - if(istype(T)) - T.break_tile() - -/obj/effect/landmark/burnturf - icon_state = "burned" - -/obj/effect/landmark/burnturf/Initialize(mapload) - . = ..() - var/turf/simulated/T = get_turf(src) - T.burn_tile() - -/obj/effect/landmark/free_golem_spawn - name = "Free Golem Spawn Point" diff --git a/code/game/objects/effects/meteors.dm b/code/game/objects/effects/meteors.dm index 075ba79412e4d..0c516e6015266 100644 --- a/code/game/objects/effects/meteors.dm +++ b/code/game/objects/effects/meteors.dm @@ -13,8 +13,6 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(/obj/effect/meteor/medium = 3, /obj/ GLOBAL_LIST_INIT(meteors_gore, list(/obj/effect/meteor/meaty = 5, /obj/effect/meteor/meaty/xeno = 1)) //for meaty ore event -GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops - /////////////////////////////// //Meteor spawning global procs @@ -334,30 +332,6 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops if(!isspaceturf(T)) new /obj/effect/decal/cleanable/blood/xeno(T) -//Meteor Ops -/obj/effect/meteor/goreops - name = "MeteorOps" - icon = 'icons/mob/animal.dmi' - icon_state = "syndicaterangedpsace" - hits = 10 - hitpwr = EXPLODE_DEVASTATE - meteorsound = 'sound/effects/blobattack.ogg' - meteordrop = list(/obj/item/food/meat) - var/meteorgibs = /obj/effect/gibspawner/generic - -/obj/effect/meteor/goreops/make_debris() - ..() - new meteorgibs(get_turf(src)) - - -/obj/effect/meteor/goreops/ram_turf(turf/T) - if(!isspaceturf(T)) - new /obj/effect/decal/cleanable/blood(T) - -/obj/effect/meteor/goreops/Bump(atom/A) - A.ex_act(hitpwr) - get_hit() - ////////////////////////// //Spookoween meteors ///////////////////////// diff --git a/code/game/objects/effects/misc_effects.dm b/code/game/objects/effects/misc_effects.dm index bc12b3c7851c4..332ba00ba4313 100644 --- a/code/game/objects/effects/misc_effects.dm +++ b/code/game/objects/effects/misc_effects.dm @@ -45,11 +45,6 @@ var/damage = 0.0 var/range = 10.0 -/obj/effect/begin - name = "begin" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "begin" - /obj/effect/projection name = "Projection" desc = "This looks like a projection of something." @@ -99,7 +94,7 @@ //Makes a tile fully lit no matter what /obj/effect/fullbright icon = 'icons/effects/alphacolors.dmi' - icon_state = "white" + icon_state = null // null iconstate is white by default plane = LIGHTING_PLANE layer = LIGHTING_LAYER blend_mode = BLEND_ADD diff --git a/code/game/objects/effects/snowcloud.dm b/code/game/objects/effects/snowcloud.dm index 796015521b25c..7446474ea0afd 100644 --- a/code/game/objects/effects/snowcloud.dm +++ b/code/game/objects/effects/snowcloud.dm @@ -65,7 +65,7 @@ /obj/effect/snow desc = "Perfect for making snow angels, or throwing at other people!" icon = 'icons/effects/effects.dmi' - icon_state = "snow" + icon_state = "snow1" layer = ABOVE_ICYOVERLAY_LAYER /obj/effect/snow/New() diff --git a/code/game/objects/effects/spawners/decorative_spawners.dm b/code/game/objects/effects/spawners/decorative_spawners.dm deleted file mode 100644 index c01caca049a58..0000000000000 --- a/code/game/objects/effects/spawners/decorative_spawners.dm +++ /dev/null @@ -1,114 +0,0 @@ -/obj/effect/spawner/random_spawners - name = "random spawners" - icon = 'icons/effects/spawner_icons.dmi' - icon_state = "questionmark" - var/list/result = list( - /datum/nothing = 1, - /obj/effect/decal/cleanable/blood/splatter = 1, - /obj/effect/decal/cleanable/blood/oil = 1, - /obj/effect/decal/cleanable/fungus = 1) - var/spawn_inside = null - -// This needs to use New() instead of Initialize() because the thing it creates might need to be initialized too -// AA 2022-08-11: The above comment doesnt even make sense. If extra atoms are loaded during SSatoms.Initialize(), they still get initialised! -/obj/effect/spawner/random_spawners/New() - . = ..() - var/turf/T = get_turf(src) - if(!T) - stack_trace("Spawner placed in nullspace!") - return - randspawn(T) - -/obj/effect/spawner/random_spawners/proc/randspawn(turf/T) - var/thing_to_place = pickweight(result) - if(ispath(thing_to_place, /datum/nothing)) - // Nothing. - qdel(src) // See line 13, this needs moving to /Initialize() so we can use the qdel hint already - return - else if(ispath(thing_to_place, /turf)) - T.ChangeTurf(thing_to_place) - else - if(ispath(spawn_inside, /obj)) - var/obj/O = new thing_to_place(T) - var/obj/E = new spawn_inside(T) - O.forceMove(E) - else - new thing_to_place(T) - qdel(src) - -/obj/effect/spawner/random_spawners/blood_maybe - name = "blood maybe" - icon_state = "blood" - result = list( - /datum/nothing = 20, - /obj/effect/decal/cleanable/blood/splatter = 1) - -/obj/effect/spawner/random_spawners/blood_often - name = "blood often" - icon_state = "blood" - result = list( - /datum/nothing = 5, - /obj/effect/decal/cleanable/blood/splatter = 1) - -/obj/effect/spawner/random_spawners/oil_maybe - name = "oil maybe" - icon_state = "oil" - result = list( - /datum/nothing = 20, - /obj/effect/decal/cleanable/blood/oil = 1) - -/obj/effect/spawner/random_spawners/oil_often - name = "oil often" - icon_state = "oil" - result = list( - /datum/nothing = 5, - /obj/effect/decal/cleanable/blood/oil = 1) - -/obj/effect/spawner/random_spawners/cobweb_left_frequent - name = "cobweb left frequent" - icon_state = "cobwebl" - result = list( - /datum/nothing = 1, - /obj/effect/decal/cleanable/cobweb = 1) - -/obj/effect/spawner/random_spawners/cobweb_right_frequent - name = "cobweb right frequent" - icon_state = "cobwebr" - result = list( - /datum/nothing = 1, - /obj/effect/decal/cleanable/cobweb2 = 1) - -/obj/effect/spawner/random_spawners/cobweb_left_rare - name = "cobweb left rare" - icon_state = "cobwebl" - result = list( - /datum/nothing = 10, - /obj/effect/decal/cleanable/cobweb = 1) - -/obj/effect/spawner/random_spawners/cobweb_right_rare - name = "cobweb right rare" - icon_state = "cobwebr" - result = list( - /datum/nothing = 10, - /obj/effect/decal/cleanable/cobweb2 = 1) - -/obj/effect/spawner/random_spawners/dirt_frequent - name = "dirt frequent" - icon_state = "dirt" - result = list( - /datum/nothing = 1, - /obj/effect/decal/cleanable/dirt = 1) - -/obj/effect/spawner/random_spawners/dirt_often - name = "dirt often" - icon_state = "dirt" - result = list( - /datum/nothing = 5, - /obj/effect/decal/cleanable/dirt = 1) - -/obj/effect/spawner/random_spawners/dirt_maybe - name = "dirt maybe" - icon_state = "dirt" - result = list( - /datum/nothing = 7, - /obj/effect/decal/cleanable/dirt = 1) diff --git a/code/game/objects/effects/spawners/random/decal_spawners.dm b/code/game/objects/effects/spawners/random/decal_spawners.dm new file mode 100644 index 0000000000000..e04e75efd7de2 --- /dev/null +++ b/code/game/objects/effects/spawners/random/decal_spawners.dm @@ -0,0 +1,93 @@ +/obj/effect/spawner/random/fungus + name = "fungus 100% chance" + icon = 'icons/effects/random_spawners.dmi' + icon_state = "fungus" + color = "#D5820B" + loot = list(/obj/effect/decal/cleanable/fungus) + +/obj/effect/spawner/random/fungus/maybe + name = "fungus 15% chance" + spawn_loot_chance = 15 + +/obj/effect/spawner/random/fungus/frequent + name = "fungus 50% chance" + spawn_loot_chance = 50 + +/obj/effect/spawner/random/fungus/probably + name = "fungus 85% chance" + spawn_loot_chance = 85 + +/obj/effect/spawner/random/blood + name = "blood 100% chance" + icon = 'icons/effects/random_spawners.dmi' + icon_state = "blood" + loot = list(/obj/effect/decal/cleanable/blood/splatter) + +/obj/effect/spawner/random/blood/maybe + name = "blood 4% chance" + spawn_loot_chance = 4 + +/obj/effect/spawner/random/blood/often + name = "blood 16% chance" + spawn_loot_chance = 16 + +/obj/effect/spawner/random/oil + name = "oil 100% chance" + icon = 'icons/effects/random_spawners.dmi' + icon_state = "oil" + loot = list(/obj/effect/decal/cleanable/blood/oil) + +/obj/effect/spawner/random/oil/maybe + name = "oil 4% chance" + spawn_loot_chance = 4 + +/obj/effect/spawner/random/oil/often + name = "oil 16% chance" + spawn_loot_chance = 16 + +/obj/effect/spawner/random/cobweb + icon = 'icons/effects/random_spawners.dmi' + +/obj/effect/spawner/random/cobweb/left + name = "cobweb left 100% chance" + icon_state = "cobwebl" + loot = list(/obj/effect/decal/cleanable/cobweb) + +/obj/effect/spawner/random/cobweb/left/frequent + name = "cobweb left 50% chance" + spawn_loot_chance = 50 + +/obj/effect/spawner/random/cobweb/left/rare + name = "cobweb left 9% chance" + spawn_loot_chance = 9 + +/obj/effect/spawner/random/cobweb/right + name = "cobweb right 100% chance" + icon_state = "cobwebr" + loot = list(/obj/effect/decal/cleanable/cobweb2) + +/obj/effect/spawner/random/cobweb/right/frequent + name = "cobweb right 50% chance" + spawn_loot_chance = 50 + +/obj/effect/spawner/random/cobweb/right/rare + name = "cobweb right 9% chance" + spawn_loot_chance = 9 + +/obj/effect/spawner/random/dirt + name = "dirt 100% chance" + icon = 'icons/effects/random_spawners.dmi' + icon_state = "dirt" + loot = list(/obj/effect/decal/cleanable/dirt) + +/obj/effect/spawner/random/dirt/frequent + name = "dirt 50% chance" + spawn_loot_chance = 50 + +/obj/effect/spawner/random/dirt/often + name = "dirt 16% chance" + spawn_loot_chance = 16 + +/obj/effect/spawner/random/dirt/maybe + name = "dirt 12% chance" + spawn_loot_chance = 12 diff --git a/code/game/objects/effects/spawners/random/pool/pool_spawner.dm b/code/game/objects/effects/spawners/random/pool/pool_spawner.dm new file mode 100644 index 0000000000000..2cfcaaff9bd2a --- /dev/null +++ b/code/game/objects/effects/spawners/random/pool/pool_spawner.dm @@ -0,0 +1,104 @@ +/// A random spawner managed by a [/datum/spawn_pool]. +/obj/effect/spawner/random/pool + icon = 'icons/effects/random_spawners.dmi' + icon_state = "loot" + + /// How much this spawner will subtract from the available budget if it + /// spawns. A value of `INFINITY` (i.e., not setting the value on a subtype) + /// does not attempt to subtract from the budget. This is useful for + /// spawners which themselves spawn other spawners. + var/point_value = INFINITY + /// Whether non-spawner items should be removed from the shared loot pool + /// after spawning. + var/unique_picks = FALSE + /// Guaranteed spawners will always proc, and always proc first. + var/guaranteed = FALSE + /// The ID of the spawn pool. Must match the pool's [/datum/spawn_pool/var/id]. + var/spawn_pool_id + +/obj/effect/spawner/random/pool/Initialize(mapload) + // short-circuit atom init machinery since we won't be around long + if(initialized) + stack_trace("Warning: [src]([type]) initialized multiple times!") + initialized = TRUE + + if(!spawn_pool_id) + stack_trace("No spawn pool ID provided to [src]([type])") + + if(GLOB.spawn_pool_manager.finalized) + // We've already gotten through SSlate_mapping, so someone probably spawned this manually. + // Skip all the shit and just spawn it. + spawn_loot() + qdel(src) + return + + var/datum/spawn_pool/pool = GLOB.spawn_pool_manager.get(spawn_pool_id) + if(!pool) + stack_trace("Could not find spawn pool with ID [spawn_pool_id]") + + if(unique_picks && !(type in pool.unique_spawners)) + pool.unique_spawners[type] = loot.Copy() + + if(guaranteed) + pool.guaranteed_spawners |= src + else + pool.known_spawners |= src + +/obj/effect/spawner/random/pool/generate_loot_list() + var/datum/spawn_pool/pool = GLOB.spawn_pool_manager.get(spawn_pool_id) + if(!pool) + stack_trace("Could not find spawn pool with ID [spawn_pool_id]") + + if(unique_picks) + var/list/unique_loot = pool.unique_spawners[type] + return unique_loot.Copy() + + return ..() + +/obj/effect/spawner/random/pool/check_safe(type_path_to_make) + // TODO: Spawners with `spawn_all_loot` set will subtract the + // point value for each item spawned. This needs to change so + // that the budget is only checked once initially, and then + // all of the loot is spawned after. + if(!..()) + return FALSE + + var/is_safe = FALSE + var/deduct_points = TRUE + var/datum/spawn_pool/pool = GLOB.spawn_pool_manager.get(spawn_pool_id) + if(!pool) + stack_trace("Could not find spawn pool with ID [spawn_pool_id]") + + if(ispath(type_path_to_make, /obj/effect/spawner/random/pool)) + return TRUE + + // If we're past SSlate_mapping, we're safe and don't have a pool + // to deduct points from + if(GLOB.spawn_pool_manager.finalized) + is_safe = TRUE + deduct_points = FALSE + + // If we don't have a sane point value, don't deduct points + if(point_value == INFINITY) + deduct_points = FALSE + + // If we deduct points, we need to check affordability + if(deduct_points) + if(pool.can_afford(point_value)) + is_safe = TRUE + else + is_safe = TRUE + + // Early breakout if we're not safe + if(!is_safe) + return FALSE + + if(deduct_points) + pool.consume(point_value) + + if(pool && unique_picks) + // We may have multiple instances of a given type so just remove the first instance we find + var/list/unique_spawners = pool.unique_spawners[type] + unique_spawners.Remove(type_path_to_make) + + return TRUE diff --git a/code/game/objects/effects/spawners/random/pool/spawn_pool.dm b/code/game/objects/effects/spawners/random/pool/spawn_pool.dm new file mode 100644 index 0000000000000..8588a1b1dcbe9 --- /dev/null +++ b/code/game/objects/effects/spawners/random/pool/spawn_pool.dm @@ -0,0 +1,59 @@ +/// Keeps track of the available points for a given pool, as well as any +/// spawners that need to keep track globally of the number of any specific item +/// that they spawn. +/datum/spawn_pool + /// The ID of the spawn pool. All spawners registered to this pool must use this ID. + var/id + /// The number of points left for the spawner to use. Starts at its initial value. + var/available_points = 0 + /// A list of all spawners registered to this pool. + var/list/known_spawners = list() + /// A key-value list of spawners with TRUE `unique_picks` to a shared copy of their + /// loot pool. When items from one of these spawners are spawned, it is removed + /// from the shared loot pool so it never spawns again. + var/list/unique_spawners = list() + /// A list of spawners whose `guaranteed` is `TRUE`. These spawners will + /// always spawn, and always before anything else, + var/list/guaranteed_spawners = list() + +/datum/spawn_pool/proc/can_afford(points) + if(available_points >= points) + return TRUE + + return FALSE + +/datum/spawn_pool/proc/consume(points) + available_points -= points + +/datum/spawn_pool/proc/process_guaranteed_spawners() + while(length(guaranteed_spawners)) + var/obj/effect/spawner/random/pool/spawner = guaranteed_spawners[length(guaranteed_spawners)] + guaranteed_spawners.len-- + spawner.spawn_loot() + qdel(spawner) + + QDEL_LIST_CONTENTS(guaranteed_spawners) + +/datum/spawn_pool/proc/process_spawners() + process_guaranteed_spawners() + + shuffle_inplace(known_spawners) + while(length(known_spawners)) + if(available_points <= 0) + break + + var/obj/effect/spawner/random/pool/spawner = known_spawners[length(known_spawners)] + known_spawners.len-- + if(spawner.point_value != INFINITY && available_points < spawner.point_value) + qdel(spawner) + continue + + spawner.spawn_loot() + if(length(guaranteed_spawners)) + WARNING("non-guaranteed spawner [spawner.type] spawned a guaranteed spawner, this should be avoided") + process_guaranteed_spawners() + + qdel(spawner) + + + QDEL_LIST_CONTENTS(known_spawners) diff --git a/code/game/objects/effects/spawners/random/pool/spawn_pool_manager.dm b/code/game/objects/effects/spawners/random/pool/spawn_pool_manager.dm new file mode 100644 index 0000000000000..855eea2187a47 --- /dev/null +++ b/code/game/objects/effects/spawners/random/pool/spawn_pool_manager.dm @@ -0,0 +1,27 @@ +GLOBAL_DATUM_INIT(spawn_pool_manager, /datum/spawn_pool_manager, new) + +/// The singleton which keeps track of all spawn pools. +/// All known [/datum/spawn_pool] subtypes are registered +/// to it and are processed in SSlate_mapping. +/datum/spawn_pool_manager + var/list/spawn_pools = list() + var/finalized = FALSE + +/datum/spawn_pool_manager/New() + for(var/spawn_pool_type in subtypesof(/datum/spawn_pool)) + var/datum/spawn_pool/pool = new spawn_pool_type + spawn_pools[pool.id] = pool + +/datum/spawn_pool_manager/proc/get(id) + return spawn_pools[id] + +/datum/spawn_pool_manager/proc/process_pools() + for(var/pool_id in spawn_pools) + var/datum/spawn_pool/pool = spawn_pools[pool_id] + pool.process_spawners() + + finalized = TRUE + +/datum/spawn_pool_manager/Destroy() + QDEL_LIST_CONTENTS(spawn_pools) + return ..() diff --git a/code/game/objects/effects/spawners/random/random_spawner.dm b/code/game/objects/effects/spawners/random/random_spawner.dm index 1120de174df5f..4d7487f65e624 100644 --- a/code/game/objects/effects/spawners/random/random_spawner.dm +++ b/code/game/objects/effects/spawners/random/random_spawner.dm @@ -51,6 +51,18 @@ spawn_loot() return INITIALIZE_HINT_QDEL +/obj/effect/spawner/random/proc/generate_loot_list() + if(loot_type_path) + loot += typesof(loot_type_path) + + if(loot_subtype_path) + loot += subtypesof(loot_subtype_path) + + return loot + +/obj/effect/spawner/random/proc/check_safe(type_path_to_make) + return TRUE + ///If the spawner has any loot defined, randomly picks some and spawns it. Does not cleanup the spawner. /obj/effect/spawner/random/proc/spawn_loot(lootcount_override) if(!prob(spawn_loot_chance)) @@ -66,21 +78,22 @@ spawn_loot_count = INFINITY spawn_loot_double = FALSE - if(loot_type_path) - loot += typesof(loot_type_path) - - if(loot_subtype_path) - loot += subtypesof(loot_subtype_path) + var/list/loot_list = generate_loot_list() + var/safe_failure_count = 0 - if(length(loot)) + if(length(loot_list)) 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)) + while((spawn_loot_count-loot_spawned) && length(loot_list) && safe_failure_count <= 10) loot_spawned++ + var/lootspawn = pick_weight_recursive(loot_list) + + if(!check_safe(lootspawn)) + safe_failure_count++ + continue - var/lootspawn = pick_weight_recursive(loot) if(!spawn_loot_double) - loot.Remove(lootspawn) + loot_list.Remove(lootspawn) if(lootspawn) var/turf/spawn_loc = loc if(spawn_scatter_radius > 0 && length(spawn_locations)) @@ -91,6 +104,13 @@ continue var/atom/movable/spawned_loot = make_item(spawn_loc, lootspawn) + + // If we make something that then makes something else and gets itself + // qdel'd, we'll have a null result here. This doesn't necessarily mean + // that nothing's been spawned, so it's not necessarily a failure. + if(!spawned_loot) + continue + spawned_loot.setDir(dir) if(!spawn_loot_split && !spawn_random_offset) diff --git a/code/game/objects/effects/spawners/random/wall_decal_spawners.dm b/code/game/objects/effects/spawners/random/wall_decal_spawners.dm deleted file mode 100644 index 20e586a82aad2..0000000000000 --- a/code/game/objects/effects/spawners/random/wall_decal_spawners.dm +++ /dev/null @@ -1,13 +0,0 @@ -/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/turf_spawners.dm b/code/game/objects/effects/spawners/turf_spawners.dm deleted file mode 100644 index eeaf554b506aa..0000000000000 --- a/code/game/objects/effects/spawners/turf_spawners.dm +++ /dev/null @@ -1,30 +0,0 @@ -/obj/effect/spawner/random_spawners/proc/rustify(turf/T) - var/turf/simulated/wall/W = T - if(istype(W) && !W.rusted) - W.rust() - -/obj/effect/spawner/random_spawners/wall_rusted_probably - name = "rusted wall probably" - icon_state = "rust" - -/obj/effect/spawner/random_spawners/wall_rusted_probably/randspawn(turf/T) - if(prob(75)) - rustify(T) - qdel(src) - -/obj/effect/spawner/random_spawners/wall_rusted_maybe - name = "rusted wall maybe" - icon_state = "rust" - -/obj/effect/spawner/random_spawners/wall_rusted_maybe/randspawn(turf/T) - if(prob(25)) - rustify(T) - qdel(src) - -/obj/effect/spawner/random_spawners/wall_rusted_always - name = "rusted wall always" - icon_state = "rust" - -/obj/effect/spawner/random_spawners/wall_rusted_always/randspawn(turf/T) - rustify(T) - qdel(src) diff --git a/code/game/objects/effects/spawners/windowspawner.dm b/code/game/objects/effects/spawners/windowspawner.dm index 72de05b92fc72..40a830c1529ca 100644 --- a/code/game/objects/effects/spawners/windowspawner.dm +++ b/code/game/objects/effects/spawners/windowspawner.dm @@ -116,6 +116,12 @@ window_to_spawn_full = /obj/structure/window/full/shuttle/survival_pod useGrille = TRUE +/obj/effect/spawner/window/shuttle/survival_pod/tinted + name = "tinted pod window spawner" + icon_state = "podwindow_spawner" + window_to_spawn_full = /obj/structure/window/full/shuttle/survival_pod/tinted + useGrille = TRUE + /obj/effect/spawner/window/plastitanium name = "plastitanium window spawner" icon_state = "plastitaniumwindow_spawner" diff --git a/code/game/objects/effects/temporary_visuals/cult_visuals.dm b/code/game/objects/effects/temporary_visuals/cult_visuals.dm index 84396d30bd3bf..1b1aab03831ad 100644 --- a/code/game/objects/effects/temporary_visuals/cult_visuals.dm +++ b/code/game/objects/effects/temporary_visuals/cult_visuals.dm @@ -1,6 +1,7 @@ //temporary visual effects(/obj/effect/temp_visual) used by cult stuff /obj/effect/temp_visual/cult icon = 'icons/effects/cult_effects.dmi' + icon_state = null randomdir = FALSE duration = 10 diff --git a/code/game/objects/effects/temporary_visuals/misc_visuals.dm b/code/game/objects/effects/temporary_visuals/misc_visuals.dm index f06a632c2957b..83f2223e5c06a 100644 --- a/code/game/objects/effects/temporary_visuals/misc_visuals.dm +++ b/code/game/objects/effects/temporary_visuals/misc_visuals.dm @@ -1,5 +1,6 @@ /obj/effect/temp_visual/dir_setting/bloodsplatter icon = 'icons/effects/blood.dmi' + icon_state = null duration = 5 randomdir = FALSE layer = MOB_LAYER - 0.1 @@ -304,7 +305,7 @@ duration = 5 /obj/effect/temp_visual/dir_setting/firing_effect - icon = 'icons/effects/effects.dmi' + icon = 'icons/effects/projectile.dmi' icon_state = "firing_effect" duration = 2 @@ -326,10 +327,6 @@ icon_state = "firing_effect_energy" duration = 3 -/obj/effect/temp_visual/dir_setting/firing_effect/magic - icon_state = "shieldsparkles" - duration = 3 - /obj/effect/temp_visual/impact_effect icon_state = "impact_bullet" duration = 5 @@ -525,7 +522,7 @@ 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" + icon_state = "beam_splash_w" layer = ABOVE_ALL_MOB_LAYER pixel_y = -16 duration = 50 diff --git a/code/game/objects/effects/temporary_visuals/projectile/projectile_effects.dm b/code/game/objects/effects/temporary_visuals/projectile/projectile_effects.dm index 4b523581587b8..d4df8b15167cc 100644 --- a/code/game/objects/effects/temporary_visuals/projectile/projectile_effects.dm +++ b/code/game/objects/effects/temporary_visuals/projectile/projectile_effects.dm @@ -3,7 +3,7 @@ /obj/effect/projectile name = "pew" icon = 'icons/obj/projectiles.dmi' - icon_state = "nothing" + icon_state = null layer = HITSCAN_LAYER mouse_opacity = MOUSE_OPACITY_TRANSPARENT appearance_flags = LONG_GLIDE diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index e698f14123163..552a891de38ab 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -44,7 +44,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons var/stealthy_audio = FALSE /// Allows you to override the attack animation with an attack effect var/attack_effect_override - /// Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]" + /// Used in attackby() to say how something was attacked `"[x] has been [z.attack_verb] by [y] with [z]"` var/list/attack_verb /// Determines how big/small items are to fit in storage containers var/w_class = WEIGHT_CLASS_NORMAL @@ -533,9 +533,9 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons A.Grant(user) in_inventory = TRUE if(!initial) - if(equip_sound && slot == slot_bitfield_to_slot(slot_flags)) + if(equip_sound && (slot & slot_flags)) playsound(src, equip_sound, EQUIP_SOUND_VOLUME, TRUE, ignore_walls = FALSE) - else if(slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND) + else if(slot & ITEM_SLOT_BOTH_HANDS) playsound(src, pickup_sound, PICKUP_SOUND_VOLUME, ignore_walls = FALSE) /obj/item/proc/item_action_slot_check(slot, mob/user) @@ -861,29 +861,31 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons return var/mob/owner = loc var/flags = slot_flags - if(flags & SLOT_FLAG_OCLOTHING) + if(flags & ITEM_SLOT_OUTER_SUIT) owner.update_inv_wear_suit() - if(flags & SLOT_FLAG_ICLOTHING) + if(flags & ITEM_SLOT_JUMPSUIT) owner.update_inv_w_uniform() - if(flags & SLOT_FLAG_GLOVES) + if(flags & ITEM_SLOT_GLOVES) owner.update_inv_gloves() - if(flags & SLOT_FLAG_EYES) + if(flags & ITEM_SLOT_EYES) owner.update_inv_glasses() - if(flags & SLOT_FLAG_EARS) + if(flags & ITEM_SLOT_BOTH_EARS) owner.update_inv_ears() - if(flags & SLOT_FLAG_MASK) + if(flags & ITEM_SLOT_MASK) owner.update_inv_wear_mask() - if(flags & SLOT_FLAG_HEAD) + if(flags & ITEM_SLOT_NECK) + owner.update_inv_neck() + if(flags & ITEM_SLOT_HEAD) owner.update_inv_head() - if(flags & SLOT_FLAG_FEET) + if(flags & ITEM_SLOT_SHOES) owner.update_inv_shoes() - if(flags & SLOT_FLAG_ID) + if(flags & ITEM_SLOT_ID) owner.update_inv_wear_id() - if(flags & SLOT_FLAG_BELT) + if(flags & ITEM_SLOT_BELT) owner.update_inv_belt() - if(flags & SLOT_FLAG_BACK) + if(flags & ITEM_SLOT_BACK) owner.update_inv_back() - if(flags & SLOT_FLAG_PDA) + if(flags & ITEM_SLOT_PDA) owner.update_inv_wear_pda() /// Called on cyborg items that need special charging behavior. Override as needed for specific items. diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 1995f8d2e8ffc..8c197a503cc81 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -6,12 +6,15 @@ icon_state = "cutout_basic" resistance_flags = FLAMMABLE w_class = WEIGHT_CLASS_BULKY - var/list/possible_appearances = list("Assistant", "Clown", "Mime", + var/list/possible_appearances = list("Assistant", "Female", "Clown", "Mime", "Traitor", "Nuke Op", "Cultist", "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Swarmer", "Deathsquad Commando", "Ian", "Slaughter Demon", - "Laughter Demon", "Xenomorph Maid", "Security Officer", "Terror Spider") - var/pushed_over = FALSE //If the cutout is pushed over and has to be righted - var/deceptive = FALSE //If the cutout actually appears as what it portray and not a discolored version + "Laughter Demon", "Xenomorph Maid", "Security Officer", "Terror Spider", + "Changeling", "Vampire", "Abductor", "Zombie", "Soviet Marine", "Federation Marine") + /// If the cutout is pushed over and has to be righted + var/pushed_over = FALSE + /// If the cutout actually appears as what it portray and not a discolored version + var/deceptive = FALSE var/lastattacker = null /obj/item/cardboard_cutout/attack_hand(mob/living/user) @@ -100,6 +103,10 @@ name = "[pick(GLOB.first_names_male)] [pick(GLOB.last_names)]" desc = "A cardboard cutout of an assistant." icon_state = "cutout_greytide" + if("Female") + name = "[pick(GLOB.first_names_female)] [pick(GLOB.last_names)]" + desc = "A cardboard cutout of a female assistant." + icon_state = "cutout_female" if("Clown") name = pick(GLOB.clown_names) desc = "A cardboard cutout of a clown. You get the feeling that it should be in a corner." @@ -180,6 +187,30 @@ icon = 'icons/mob/terrorspider.dmi' icon_state = "terror_gray" dir = "SOUTH" + if("Soviet Marine") + name = "[pick(GLOB.first_names_soviet)] [pick(GLOB.last_names_soviet)]" + desc = "A cardboard cutout of a soviet marine." + icon_state = "cutout_soviet" + if("Federation Marine") + name = "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(GLOB.last_names)]" + desc = "A cardboard cutout of a federation marine." + icon_state = "cutout_sol" + if("Changeling") + name = "[pick(GLOB.first_names_male)] [pick(GLOB.last_names)]" + desc = "A cardboard cutout of a changeling." + icon_state = "cutout_cling" + if("Abductor") + name = "Unknown" + desc = "A cardboard cutout of an abductor." + icon_state = "cutout_abductor" + if("Zombie") + name = "[pick(GLOB.first_names_male)] [pick(GLOB.last_names)]" + desc = "A cardboard cutout of a zombie." + icon_state = "cutout_zombie" + if("Vampire") + name = "Unknown" + desc = "A cardboard cutout of a vampire." + icon_state = "cutout_vampire" return 1 diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index b398722ace5c8..cf87fa47a1813 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -11,7 +11,7 @@ icon = 'icons/obj/crayons.dmi' icon_state = "crayonred" w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_EARS attack_verb = list("attacked", "coloured") toolspeed = 1 var/colour = COLOR_RED @@ -307,7 +307,7 @@ name = "\improper Nanotrasen-brand Rapid Paint Applicator" desc = "A metallic container containing spray paint." icon_state = "spraycan_cap" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT var/capped = TRUE instant = TRUE validSurfaces = list(/turf/simulated/floor,/turf/simulated/wall) @@ -391,7 +391,7 @@ "Medical" = image('icons/mob/robots.dmi', "med-radial"), "Janitor" = image('icons/mob/robots.dmi', "jan-radial"), "Hunter" = image('icons/mob/robots.dmi', "xeno-radial"), - "Death Bot" = image('icons/mob/robots.dmi', "syndie-bloodhound-preview") + "Death Bot" = image('icons/mob/robots.dmi', "spidersyndi-preview") ) selected_disguise = show_radial_menu(user, target, disguise_options, require_near = TRUE, radius = 42) diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 8c4d1076db307..910183c4cb826 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -5,7 +5,7 @@ icon_state = "aicard" // aicard-full item_state = "electronic" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT flags = NOBLUDGEON var/flush = null origin_tech = "programming=3;materials=3" diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm index d9304ac3bd989..3a0036f02f9ce 100644 --- a/code/game/objects/items/devices/autopsy.dm +++ b/code/game/objects/items/devices/autopsy.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/surgery.dmi' icon_state = "autopsy_scanner" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL origin_tech = "magnets=1;biotech=1" var/list/datum/autopsy_data_scanner/wdata = list() diff --git a/code/game/objects/items/devices/chameleon_counter.dm b/code/game/objects/items/devices/chameleon_counter.dm index bef3d4e5681b1..8bb7f7b25b5ba 100644 --- a/code/game/objects/items/devices/chameleon_counter.dm +++ b/code/game/objects/items/devices/chameleon_counter.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/device.dmi' icon_state = "cham_counter" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT item_state = "electronic" w_class = WEIGHT_CLASS_SMALL origin_tech = "syndicate=1;magnets=3" diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index f204e8499d1ac..660f7720affc3 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/device.dmi' icon_state = "shield0" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT item_state = "electronic" throwforce = 5 throw_speed = 3 diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index b5fe142722f2f..4d5166a3ed226 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -228,7 +228,7 @@ icon_state = "camera" item_state = "electropack" //spelling, a coders worst enemy. This part gave me trouble for a while. w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT can_overcharge = FALSE var/flash_max_charges = 5 var/flash_cur_charges = 5 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 1b4348b8deb75..81776dc836cda 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -6,7 +6,7 @@ item_state = "flashlight" w_class = WEIGHT_CLASS_SMALL flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT materials = list(MAT_METAL = 200, MAT_GLASS = 100) actions_types = list(/datum/action/item_action/toggle_light) var/on = FALSE @@ -93,7 +93,7 @@ icon_state = "penlight" item_state = "" w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_EARS flags = CONDUCT brightness_on = 2 var/colour = "blue" // Ink color diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index cab15b142131c..2db44252dc320 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -12,7 +12,7 @@ icon_state = "geiger_off" item_state = "multitool" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT flags = NOBLUDGEON materials = list(MAT_METAL = 210, MAT_GLASS = 150) diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index b7a45a27a06a8..3658d32a68764 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -6,7 +6,7 @@ item_state = "pen" var/pointer_icon_state flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT materials = list(MAT_METAL=500, MAT_GLASS=500) w_class = WEIGHT_CLASS_SMALL //Increased to 2, because diodes are w_class 2. Conservation of matter. origin_tech = "combat=1;magnets=2" diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 8790bbde67c1c..832f87faf3d17 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -40,7 +40,7 @@ belt_icon = "light_replacer" w_class = WEIGHT_CLASS_SMALL flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "magnets=3;engineering=4" force = 8 var/max_uses = 20 diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 683f6462f3d2a..fe601c9f7d72f 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -5,7 +5,7 @@ icon_state = "pai" item_state = "electronic" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "programming=2" var/request_cooldown = 5 // five seconds var/last_request diff --git a/code/game/objects/items/devices/painter/painter.dm b/code/game/objects/items/devices/painter/painter.dm index fd1b2c86f8000..5d3ad7cfcf476 100644 --- a/code/game/objects/items/devices/painter/painter.dm +++ b/code/game/objects/items/devices/painter/painter.dm @@ -5,7 +5,7 @@ usesound = 'sound/effects/spray2.ogg' flags = CONDUCT | NOBLUDGEON w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT materials = list(MAT_METAL = 5000, MAT_GLASS = 2000) /// Associative list of painter types, with the value being the datum. (For use in the radial menu) var/static/list/painter_type_list = list( diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index fd80d2149fc81..7affcb8c1bab1 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -6,7 +6,7 @@ item_state = "signaler" origin_tech = "bluespace=1" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throw_speed = 2 throw_range = 9 w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 963c81c35ec60..309d1ee12eec5 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -5,7 +5,7 @@ icon_state = "electropack0" item_state = "electropack" flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_HUGE materials = list(MAT_METAL = 10000, MAT_GLASS = 2500) /// The integrated signaler diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 6c3f728f8cef9..cd0946c341135 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -11,7 +11,7 @@ materials = list(MAT_METAL = 200) canhear_range = 0 // can't hear headsets from very far away - slot_flags = SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_BOTH_EARS var/translate_binary = FALSE var/translate_hive = FALSE var/obj/item/encryptionkey/keyslot1 = null diff --git a/code/game/objects/items/devices/radio/radio_objects.dm b/code/game/objects/items/devices/radio/radio_objects.dm index a12c35c1a2de3..3b01d9989c71e 100644 --- a/code/game/objects/items/devices/radio/radio_objects.dm +++ b/code/game/objects/items/devices/radio/radio_objects.dm @@ -64,7 +64,7 @@ GLOBAL_LIST_EMPTY(deadsay_radio_systems) var/static/list/blacklisted_areas = list(/area/adminconstruction, /area/tdome, /area/ruin/space/bubblegum_arena) flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throw_speed = 2 throw_range = 9 w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index a778c418085c2..ea68cc331d2db 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -18,7 +18,7 @@ SLIME SCANNER icon = 'icons/obj/device.dmi' icon_state = "t-ray0" var/on = FALSE - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL item_state = "electronic" materials = list(MAT_METAL = 300) @@ -109,7 +109,7 @@ SLIME SCANNER item_state = "healthanalyzer" belt_icon = "health_analyzer" flags = CONDUCT | NOBLUDGEON - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL throwforce = 3 throw_speed = 3 @@ -373,7 +373,7 @@ SLIME SCANNER icon_state = "robotanalyzer" item_state = "analyzer" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 3 w_class = WEIGHT_CLASS_SMALL throw_speed = 5 @@ -520,7 +520,7 @@ SLIME SCANNER icon = 'icons/obj/device.dmi' icon_state = "atmos" item_state = "analyzer" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL flags = CONDUCT throwforce = 0 @@ -719,7 +719,7 @@ SLIME SCANNER item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 5 throw_speed = 4 throw_range = 20 @@ -797,7 +797,7 @@ SLIME SCANNER icon_state = "adv_spectrometer_s" item_state = "analyzer" origin_tech = "biotech=2" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL flags = CONDUCT throwforce = 0 @@ -854,7 +854,7 @@ SLIME SCANNER icon = 'icons/obj/device.dmi' icon_state = "bodyanalyzer_0" item_state = "healthanalyser" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL throwforce = 3 throw_speed = 5 diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm index 21f0aa46e3db2..47915e5b96367 100644 --- a/code/game/objects/items/devices/sensor_device.dm +++ b/code/game/objects/items/devices/sensor_device.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/device.dmi' icon_state = "scanner" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "programming=3;materials=3;magnets=3" var/datum/ui_module/crew_monitor/crew_monitor diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 1ca7e7ce9513d..fc8efb213ebda 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -5,7 +5,7 @@ icon_state = "taperecorder_empty" item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT materials = list(MAT_METAL = 180, MAT_GLASS = 90) force = 2 throwforce = 0 diff --git a/code/game/objects/items/dyeing.dm b/code/game/objects/items/dyeing.dm index 998642e96bedf..bd39d8fb8c300 100644 --- a/code/game/objects/items/dyeing.dm +++ b/code/game/objects/items/dyeing.dm @@ -2,7 +2,7 @@ * Updates an item's appearance to mimic the appearance of another item in the dye_registry's dictionary * what types of items (beanie, jumpsuit, shoes, etc) src is dyed into depends on the dye_key unless an * overidden dye_key is specified. For example if our dye_key is DYE_REGISTRY_UNDER and we specify to dye to - * DYE_RED, our item's appearance would then mimic /obj/item/clothing/under/color/red; see [dye_registry.dm] for this dictionary + * DYE_RED, our item's appearance would then mimic /obj/item/clothing/under/color/red; see [code/_globalvars/lists/dye_registry.dm] for this dictionary * * once everything is updated, the target type path that we dyed the item into is returned * diff --git a/code/game/objects/items/mountable_frames/frames.dm b/code/game/objects/items/mountable_frames/frames.dm index 6da3982e04d16..30e4af872cc92 100644 --- a/code/game/objects/items/mountable_frames/frames.dm +++ b/code/game/objects/items/mountable_frames/frames.dm @@ -9,6 +9,8 @@ var/metal_sheets_refunded = 2 ///amount of glass sheets returned upon the frame being wrenched var/glass_sheets_refunded = 0 + ///amount of brass sheets returned upon the frame being wrenched + var/brass_sheets_refunded = 0 ///The requirements for this frame to be placed, uses bit flags var/mount_requirements = 0 @@ -18,6 +20,8 @@ new /obj/item/stack/sheet/metal(user_turf, metal_sheets_refunded) if(glass_sheets_refunded) new /obj/item/stack/sheet/glass(user_turf, glass_sheets_refunded) + if(brass_sheets_refunded) + new /obj/item/stack/tile/brass(user_turf, brass_sheets_refunded) qdel(src) /obj/item/mounted/frame/try_build(turf/on_wall, mob/user) diff --git a/code/game/objects/items/mountable_frames/light_frames.dm b/code/game/objects/items/mountable_frames/light_frames.dm index ab59c8c295215..6f6002122b7e6 100644 --- a/code/game/objects/items/mountable_frames/light_frames.dm +++ b/code/game/objects/items/mountable_frames/light_frames.dm @@ -24,6 +24,12 @@ newlight = new /obj/machinery/light_construct(constrloc) if("floor") newlight = new /obj/machinery/light_construct/floor(on_wall) + if("clockwork_bulb") + newlight = new /obj/machinery/light_construct/clockwork/small(constrloc) + if("clockwork_tube") + newlight = new /obj/machinery/light_construct/clockwork(constrloc) + if("clockwork_floor") + newlight = new /obj/machinery/light_construct/clockwork/floor(on_wall) else newlight = new /obj/machinery/light_construct/small(constrloc) newlight.dir = constrdir @@ -52,3 +58,31 @@ metal_sheets_refunded = 3 buildon_types = list(/turf/simulated/floor) allow_floor_mounting = TRUE + +/obj/item/mounted/frame/light_fixture/clockwork + name = "brass light fixture frame" + desc = "Used for building brass lights." + icon_state = "clockwork_tube-construct-item" + fixture_type = "clockwork_tube" + metal_sheets_refunded = 0 + brass_sheets_refunded = 2 + +/obj/item/mounted/frame/light_fixture/clockwork/small + name = "brass small light fixture frame" + desc = "Used for building small brass lights." + icon = 'icons/obj/lighting.dmi' + icon_state = "clockwork_bulb-construct-item" + fixture_type = "clockwork_bulb" + metal_sheets_refunded = 0 + brass_sheets_refunded = 1 + +/obj/item/mounted/frame/light_fixture/clockwork/floor + name = "brass floor light fixture frame" + desc = "Used for building brass floor lights." + icon = 'icons/obj/lighting.dmi' + icon_state = "clockwork_floor-construct-item" + fixture_type = "clockwork_floor" + metal_sheets_refunded = 0 + brass_sheets_refunded = 3 + buildon_types = list(/turf/simulated/floor) + allow_floor_mounting = TRUE diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 1938d86a1cd4e..ff7db9b09eca2 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -2,9 +2,8 @@ name = "robot parts" icon = 'icons/obj/robot_parts.dmi' item_state = "buildpipe" - icon_state = "blank" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT var/list/part = null var/sabotaged = FALSE //Emagging limbs can have repercussions when installed as prosthetics. var/model_info = "Unbranded" diff --git a/code/game/objects/items/salvage.dm b/code/game/objects/items/salvage.dm index a4903a6cb2ac3..47a35d5c854a9 100644 --- a/code/game/objects/items/salvage.dm +++ b/code/game/objects/items/salvage.dm @@ -87,7 +87,7 @@ /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." + 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." // SS220 EDIT - Zvezhan -> Neo-Russkiya icon_state = "ussp_manual" hitsound = 'sound/items/handling/paper_pickup.ogg' pickup_sound = 'sound/items/handling/paper_pickup.ogg' diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index a5543401d7272..61960c940942c 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -96,8 +96,6 @@ GLOBAL_LIST_INIT(rod_recipes, list ( name = "heat resistant rod" desc = "Treated, specialized iron rods. When exposed to the vacuum of space their coating breaks off, but they can hold up against the extreme heat of molten liquids." singular_name = "heat resistant rod" - icon_state = "rods" - item_state = "rods" color = "#5286b9ff" flags = CONDUCT w_class = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index e1eb271145546..b29eca92e65ba 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -76,7 +76,7 @@ GLOBAL_LIST_INIT(metal_recipes, list( null, new /datum/stack_recipe("computer frame", /obj/structure/computerframe, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("machine frame", /obj/machinery/constructable_frame/machine_frame, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("machine frame", /obj/structure/machine_frame, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), 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), @@ -612,6 +612,9 @@ GLOBAL_LIST_INIT(brass_recipes, list ( new /datum/stack_recipe/window("fulltile brass window", /obj/structure/window/reinforced/clockwork/fulltile, 2, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE), new /datum/stack_recipe("brass chair", /obj/structure/chair/brass, 1, time = 0 SECONDS, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("brass table frame", /obj/structure/table_frame/brass, 1, time = 0.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("brass light fixture frame", /obj/item/mounted/frame/light_fixture/clockwork, 2, time = 0 SECONDS, one_per_turf = FALSE, on_floor = FALSE), + new /datum/stack_recipe("small brass light fixture frame", /obj/item/mounted/frame/light_fixture/clockwork/small, 1, time = 0 SECONDS, one_per_turf = FALSE, on_floor = FALSE), + new /datum/stack_recipe("brass floor light fixture frame", /obj/item/mounted/frame/light_fixture/clockwork/floor, 3, time = 0 SECONDS, one_per_turf = FALSE, on_floor = FALSE), )) /obj/item/stack/tile/brass diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index b9e03124fdf1a..a24d5121619bc 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -120,8 +120,8 @@ /** Checks whether this stack can merge itself into another stack. * * Arguments: - * - [check][/obj/item/stack]: The stack to check for mergeability. - * - [inhand][boolean]: Whether or not the stack to check should act like it's in a mob's hand. + * - check: The [/obj/item/stack] to check for mergeability. + * - inhand: `TRUE` if the stack should check should act like it's in a mob's hand, `FALSE` otherwise. */ /obj/item/stack/proc/can_merge(obj/item/stack/check, inhand = FALSE) // We don't only use istype here, since that will match subtypes, and stack things that shouldn't stack diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 8becf16684d66..70795a2d89ac0 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -7,7 +7,7 @@ belt_icon = "crowbar" usesound = 'sound/items/crowbar.ogg' flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 5 throwforce = 7 w_class = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index b9a79fbcfddad..9cedc192c75b3 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -6,7 +6,7 @@ icon_state = "screwdriver_map" belt_icon = "screwdriver" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 5 w_class = WEIGHT_CLASS_TINY throwforce = 5 diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm index 40edd403aafff..0a645a62b7b3e 100644 --- a/code/game/objects/items/tools/welder.dm +++ b/code/game/objects/items/tools/welder.dm @@ -8,7 +8,7 @@ item_state = "welder" belt_icon = "welder" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 3 throwforce = 5 throw_speed = 3 @@ -27,7 +27,7 @@ pickup_sound = 'sound/items/handling/weldingtool_pickup.ogg' var/maximum_fuel = 20 /// Set to FALSE if it doesn't need fuel, but serves equally well as a cost modifier. - var/requires_fuel = TRUE + var/requires_fuel = TRUE /// If TRUE, fuel will regenerate over time. var/refills_over_time = FALSE /// Sound played when turned on. @@ -154,8 +154,12 @@ remove_fuel(0.5) /obj/item/weldingtool/attack(mob/living/target, mob/living/user) - if(!cigarette_lighter_act(user, target)) - return ..() + if(cigarette_lighter_act(user, target)) + return + if(tool_enabled && target.IgniteMob()) + message_admins("[key_name_admin(user)] set [key_name_admin(target)] on fire") + log_game("[key_name(user)] set [key_name(target)] on fire") + return ..() /obj/item/weldingtool/cigarette_lighter_act(mob/living/user, mob/living/target, obj/item/direct_attackby_item) var/obj/item/clothing/mask/cigarette/cig = ..() diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index cd68290806c20..ff1ee43e3ffa5 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -5,7 +5,7 @@ icon_state = "cutters" belt_icon = "wirecutters_red" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 6 throw_speed = 3 throw_range = 7 diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index fc90779a97a4e..c63fb0bb23033 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -5,7 +5,7 @@ icon_state = "wrench" belt_icon = "wrench" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 5 throwforce = 7 usesound = 'sound/items/ratchet.ogg' diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 1d23ae613ad3e..1cdbff31a3421 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -325,7 +325,7 @@ icon_state = "katana" item_state = "katana" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 //Look, you can strap it to your back. You can strap it to your waist too. force = 5 throwforce = 5 @@ -494,18 +494,6 @@ item_state = "egg3" // It's the green egg in items_left/righthand item_color = "green" - -//This should really be somewhere else but I don't know where. w/e - -/obj/item/inflatable_duck - name = "inflatable duck" - desc = "No bother to sink or swim when you can just float!" - icon_state = "inflatable" - item_state = "inflatable" - icon = 'icons/obj/clothing/belts.dmi' - slot_flags = SLOT_FLAG_BELT - flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 - /* * Fake meteor */ @@ -1171,7 +1159,7 @@ righthand_file = 'icons/mob/inhands/guns_righthand.dmi' hitsound = "swing_hit" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT materials = list(MAT_METAL=2000) w_class = WEIGHT_CLASS_NORMAL throwforce = 5 diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 73bbf852c76c5..42635506edb81 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -74,7 +74,7 @@ name = "Kentucky Fried Vox" icon_state = "fried_vox_empty" item_state = "fried_vox_empty" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD dog_fashion = /datum/dog_fashion/head/fried_vox_empty sprite_sheets = list( "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi', diff --git a/code/game/objects/items/weapons/agent_id.dm b/code/game/objects/items/weapons/agent_id.dm new file mode 100644 index 0000000000000..c3c48a09e02ca --- /dev/null +++ b/code/game/objects/items/weapons/agent_id.dm @@ -0,0 +1,300 @@ +/obj/item/card/id/syndicate + name = "agent card" + origin_tech = "syndicate=1" + untrackable = TRUE + /// List of access types the agent ID should start off with + var/list/initial_access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_EXTERNAL_AIRLOCKS) + /// Editing is prohibited if registered_human reference is missing + var/mob/living/carbon/human/registered_human + // Static list of all occupations available when changing the occupation on an agent ID + var/static/list/possible_jobs + /// The HUD icon that should be displayed on a mob that is wearing the agent ID + var/hud_icon + + COOLDOWN_DECLARE(new_photo_cooldown) + +/obj/item/card/id/syndicate/Initialize(mapload) + . = ..() + access = initial_access.Copy() + if(!length(possible_jobs)) + possible_jobs = sortTim(GLOB.joblist, GLOBAL_PROC_REF(cmp_text_asc)) + +/obj/item/card/id/syndicate/Destroy() + registered_human = null + return ..() + +/obj/item/card/id/syndicate/researcher + initial_access = list(ACCESS_SYNDICATE) + assignment = "Syndicate Researcher" + icon_state = "syndie" + untrackable = TRUE + +/obj/item/card/id/syndicate/vox + name = "agent card" + initial_access = list(ACCESS_MAINT_TUNNELS, ACCESS_VOX, ACCESS_EXTERNAL_AIRLOCKS) + +/obj/item/card/id/syndicate/ghost_bar + name = "ghost bar identification card" + assignment = "Ghost Bar Occupant" + initial_access = list() // This is for show, they don't need actual accesses + icon_state = "assistant" + +/obj/item/card/id/syndicate/command + initial_access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_SYNDICATE_COMMAND, ACCESS_EXTERNAL_AIRLOCKS) + icon_state = "commander" + +/obj/item/card/id/syndicate_command + name = "syndicate ID card" + desc = "An ID straight from the Syndicate." + registered_name = "Syndicate" + icon_state = "syndie" + assignment = "Syndicate Overlord" + untrackable = TRUE + access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_SYNDICATE_COMMAND, ACCESS_EXTERNAL_AIRLOCKS) + +/obj/item/card/id/syndicate/afterattack(atom/target, mob/user, proximity_flag, click_parameters) + if(!proximity_flag) + return + if(istype(target, /obj/item/card/id)) + var/obj/item/card/id/I = target + if(isliving(user) && user?.mind?.special_role) + to_chat(usr, "The card's microscanners activate as you pass it over [I], copying its access.") + access |= I.access //Don't copy access if user isn't an antag -- to prevent metagaming + +/obj/item/card/id/syndicate/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + if(..()) + return + if(!registered_human || !Adjacent(registered_human)) + return + . = TRUE + switch(action) + if("delete_info") + delete_info(ui) + if("clear_access") + clear_access() + if("change_ai_tracking") + change_ai_tracking() + if("change_name") + change_name(params["option"], params["name"]) + if("change_photo") + change_photo() + if("change_appearance") + change_appearance(params["new_appearance"]) + if("change_sex") + change_sex(params["sex"]) + if("change_age") + change_age(params["age"]) + if("change_occupation") + change_occupation(params["option"]) + if("change_money_account") + change_money_account(params["option"], params["new_account"]) + if("change_blood_type") + change_blood_type(params["option"], params["new_type"]) + if("change_dna_hash") + change_dna_hash(params["option"], params["new_dna"]) + if("change_fingerprints") + change_fingerprints(params["option"], params["new_fingerprints"]) + RebuildHTML() + +/obj/item/card/id/syndicate/ui_data(mob/user) + var/list/data = list() + data["registered_name"] = registered_name + data["sex"] = sex + data["age"] = age + data["assignment"] = assignment + data["job_icon"] = hud_icon + data["associated_account_number"] = associated_account_number + data["blood_type"] = blood_type + data["dna_hash"] = dna_hash + data["fingerprint_hash"] = fingerprint_hash + data["photo"] = photo + data["ai_tracking"] = untrackable + data["photo_cooldown"] = COOLDOWN_FINISHED(src, new_photo_cooldown) + return data + +/obj/item/card/id/syndicate/ui_static_data(mob/user) + var/list/data = list() + var/list/idcard_skins = list() + for(var/idcard_skin in get_all_card_skins()) + idcard_skins.Add(idcard_skin) + data["appearances"] = idcard_skins + data["id_icon"] = icon + return data + +/obj/item/card/id/syndicate/ui_interact(mob/user, datum/tgui/ui = null) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "AgentCard", name) + ui.open() + +/obj/item/card/id/syndicate/attack_self(mob/user) + if(!ishuman(user)) + return + if(!registered_human) + registered_human = user + if(registered_human != user) + flash_card(user) + return + switch(tgui_alert(user, "Would you like to display [src] or edit it?", "Choose", list("Edit", "Show"))) + if("Show") + flash_card(user) + if("Edit") + ui_interact(user) + +/obj/item/card/id/syndicate/proc/delete_info(datum/tgui/ui) + name = initial(name) + registered_name = initial(registered_name) + icon_state = initial(icon_state) + sex = initial(sex) + age = initial(age) + assignment = initial(assignment) + rank = initial(rank) + associated_account_number = initial(associated_account_number) + blood_type = initial(blood_type) + dna_hash = initial(dna_hash) + fingerprint_hash = initial(fingerprint_hash) + photo = null + registered_human.sec_hud_set_ID() + registered_human = null + ui.close() + +/obj/item/card/id/syndicate/proc/clear_access() + access = initial_access.Copy() // Initial() doesn't work on lists + to_chat(registered_human, "Card access reset.") + +/obj/item/card/id/syndicate/proc/change_ai_tracking() + untrackable = !untrackable + +/obj/item/card/id/syndicate/proc/change_name(option, name) + var/new_name + if(option == "Primary") + new_name = ishuman(registered_human) ? registered_human.real_name : registered_human.name + else if(option == "Secondary") + new_name = tgui_input_list(registered_human, "Whose name do you want to copy?", "Agent ID - Name", GLOB.crew_list) + if(isnull(new_name)) + return + else + new_name = sanitize(name) + + registered_name = reject_bad_name(new_name, TRUE) + UpdateName() + to_chat(registered_human, "ID name has been changed to [new_name].") + +/obj/item/card/id/syndicate/proc/change_photo() + if(!COOLDOWN_FINISHED(src, new_photo_cooldown)) + return + var/job_clothes = null + if(assignment) + job_clothes = assignment + var/icon/newphoto = get_id_photo(registered_human, job_clothes) + if(!newphoto) + return + photo = newphoto + COOLDOWN_START(src, new_photo_cooldown, 10 SECONDS) // This proc is expensive, we don't want people spamming it. + +/obj/item/card/id/syndicate/proc/change_appearance(new_appearance) + if(!new_appearance) + return + if(new_appearance in icon_states(icon)) + icon_state = new_appearance + +/obj/item/card/id/syndicate/proc/change_sex(new_sex) + if(!Adjacent(registered_human) || isnull(new_sex)) + return + + sex = sanitize(new_sex) + +/obj/item/card/id/syndicate/proc/change_age(new_age) + age = clamp(new_age, AGE_MIN, AGE_MAX) + +/obj/item/card/id/syndicate/proc/change_occupation(option) + var/new_job + var/new_rank + if(option == "Primary") + new_job = assignment + new_rank = tgui_input_list(registered_human, "What SecHUD icon would you like to be shown on this card?", "Agent Card Occupation", GLOB.joblist + "Prisoner" + "Centcom" + "Solgov" + "Soviet" + "Unknown") + else + var/department = tgui_input_list(registered_human, "Do you want a custom occupation?", "Agent Card Occupation", list("Existing job", "Custom")) + if(department != "Custom") + new_job = tgui_input_list(registered_human, "What job would you like to put on this card?", "Agent Card Occupation", possible_jobs) + new_rank = new_job + else + new_job = sanitize(tgui_input_text(registered_human, "Choose a custom job title:", "Agent Card Occupation", "Assistant", MAX_MESSAGE_LEN)) + new_rank = tgui_input_list(registered_human, "What SecHUD icon would you like to be shown on this card?", "Agent Card Occupation", GLOB.joblist + "Prisoner" + "Centcom" + "Solgov" + "Soviet" + "Unknown") + + if(!Adjacent(registered_human) || isnull(new_job)) + return + assignment = new_job + rank = new_rank + hud_icon = ckey(get_job_name()) + UpdateName() + registered_human.sec_hud_set_ID() + +/obj/item/card/id/syndicate/proc/change_money_account(option, new_account) + if(option == "Primary") + new_account = registered_human.mind.initial_account?.account_number + if(!new_account) + to_chat(registered_human, "You don't have an account.") + return + else if(option == "Secondary") + new_account = rand(1000, 9999) * 1000 + rand(1000, 9999) + else + new_account = text2num(new_account) + if(!isnum(new_account)) + to_chat(registered_human, "ID account number can only contain numbers.") + return + + associated_account_number = clamp(new_account, 1000000, 9999999) + to_chat(registered_human, "ID account number has been changed to [new_account].") + +/obj/item/card/id/syndicate/proc/change_blood_type(option, new_type) + var/list/possible_blood_types = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-", "Slime Jelly", "None") + if(option == "Primary") + blood_type = registered_human.dna.blood_type + else if(new_type) + if(!(blood_type in possible_blood_types)) + return + blood_type = new_type + to_chat(registered_human, "ID blood type has been changed to [blood_type].") + +/obj/item/card/id/syndicate/proc/change_dna_hash(option, new_dna) + if(option == "Primary") + dna_hash = registered_human.dna.unique_enzymes + else if(option == "Secondary") + dna_hash = md5(num2text(rand(0, 999))) + else + if(new_dna) + dna_hash = sanitize(new_dna, 33) // Max length of 32 characters + +/obj/item/card/id/syndicate/proc/change_fingerprints(option, new_fingerprints) + if(option == "Primary") + fingerprint_hash = md5(registered_human.dna.uni_identity) + else if(option == "Secondary") + fingerprint_hash = md5(num2text(rand(0, 999))) + else + var/fingerprints_param = new_fingerprints + if(fingerprints_param) + fingerprint_hash = sanitize(fingerprints_param, 33) + +/// like /obj/item/card/id/syndicate, but you can only swipe access, not change your identity, its also trackable +/obj/item/card/id/syndi_scan_only + name = "Syndicate Operative's ID card (Operative)" + rank = "Operative" + assignment = "Operative" + registered_name = "Syndicate Operative" + access = list(ACCESS_SYNDICATE) + +/obj/item/card/id/syndi_scan_only/examine(mob/user) + . = ..() + if(isAntag(user)) + . += "Similar to an agent ID, this ID card can be used to copy accesses, but it lacks the customization and anti-tracking capabilities of an agent ID." + +/obj/item/card/id/syndi_scan_only/afterattack(obj/item/O, mob/user, proximity) + if(!proximity) + return + if(istype(O, /obj/item/card/id)) + var/obj/item/card/id/I = O + if(isliving(user) && user.mind) + if(user.mind.special_role) + to_chat(user, "The card's microscanners activate as you pass it over [I], copying its access.") + access |= I.access // Don't copy access if user isn't an antag -- to prevent metagaming diff --git a/code/game/objects/items/weapons/batons.dm b/code/game/objects/items/weapons/batons.dm index f5e5ecb8ae300..9430adcb21c61 100644 --- a/code/game/objects/items/weapons/batons.dm +++ b/code/game/objects/items/weapons/batons.dm @@ -1,7 +1,7 @@ /** * # Police Baton * - * Knocks down the hit mob when not on harm intent and when [/obj/item/melee/classic_baton/on] is TRUE + * Knocks down the hit mob when not on harm intent and when [/obj/item/melee/classic_baton/var/on] is `TRUE`. * * A non-lethal attack has a cooldown to avoid spamming */ @@ -11,7 +11,7 @@ icon = 'icons/obj/weapons/baton.dmi' icon_state = "baton" item_state = "classic_baton" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 12 //9 hit crit w_class = WEIGHT_CLASS_NORMAL // Settings @@ -155,7 +155,7 @@ desc = "A compact yet robust personal defense weapon. Can be concealed when folded." icon_state = "telebaton_0" // For telling what it is when mapping item_state = null - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL on = FALSE /// Force when concealed @@ -196,7 +196,7 @@ else to_chat(user, "You collapse [src].") item_state = null //no sprite for concealment even when in hand - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL force = force_off //not so robust now attack_verb = attack_verb_off diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_stealth.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_stealth.dm index 611e084421335..9669932558a26 100644 --- a/code/game/objects/items/weapons/bio_chips/bio_chip_stealth.dm +++ b/code/game/objects/items/weapons/bio_chips/bio_chip_stealth.dm @@ -52,17 +52,17 @@ // Spawn the actual box var/obj/structure/closet/cardboard/agent/box = new(get_turf(owner), owner) - box.implant_user_UID = owner.UID() // Slightly shorter time since we needed 0.3s to to do the spawn animation. INVOKE_ASYNC(box, TYPE_PROC_REF(/obj/structure/closet/cardboard/agent, go_invisible), 1.7 SECONDS) - box.create_fake_box() owner.forceMove(box) + owner.overlay_fullscreen("agent_box", /atom/movable/screen/fullscreen/center/agent_box) RegisterSignal(box, COMSIG_PARENT_QDELETING, PROC_REF(start_cooldown)) /datum/action/item_action/agent_box/proc/start_cooldown(datum/source) SIGNAL_HANDLER on_cooldown = TRUE addtimer(CALLBACK(src, PROC_REF(end_cooldown)), 10 SECONDS) + owner.clear_fullscreen("agent_box") UpdateButtons() /datum/action/item_action/agent_box/proc/end_cooldown() @@ -109,20 +109,6 @@ max_integrity = 1 move_speed_multiplier = 0.5 // You can move at run speed while in this box. material_drop = null - /// UID of the person who summoned this box with an implant. - var/implant_user_UID - // This has to be a separate object and not just an image because the image will inherit the box's 0 alpha while it is stealthed. - /// A holder effect which follows the src box so we can display an image to the person inside the box. - var/obj/effect/fake_box - /// The box image attached to the `fake_box` object. - var/image/box_img - -/obj/structure/closet/cardboard/agent/Destroy() - var/mob/living/implant_user = locateUID(implant_user_UID) - implant_user?.client?.images -= box_img - QDEL_NULL(fake_box) - QDEL_NULL(box_img) - return ..() /obj/structure/closet/cardboard/agent/open() . = ..() @@ -134,27 +120,6 @@ /obj/structure/closet/cardboard/agent/update_icon_state() return -/obj/structure/closet/cardboard/agent/proc/create_fake_box() - if(fake_box) - return - fake_box = new(get_turf(src)) - fake_box.mouse_opacity = MOUSE_OPACITY_TRANSPARENT // This object should be completely invisible. - box_img = image(icon, fake_box, icon_state, ABOVE_MOB_LAYER) - box_img.alpha = 128 - RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(move_fake_box)) - var/mob/living/implant_user = locateUID(implant_user_UID) - implant_user.client?.images += box_img - -/obj/structure/closet/cardboard/agent/proc/move_fake_box(datum/source, oldloc, move_dir) - SIGNAL_HANDLER - - // For non-standard movement such as teleports. - if(!move_dir) - fake_box.loc = get_turf(src) - return - // For basic 8-directional movement. - fake_box.loc = get_step(fake_box, move_dir) - /obj/structure/closet/cardboard/agent/proc/go_invisible(invis_time = 2 SECONDS) animate(src, alpha = 0, time = invis_time) sleep(invis_time) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 1769bd7ff6ad2..6bf01556f5134 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -94,7 +94,7 @@ var/total_mining_points = 0 var/list/access = list() var/registered_name = "Unknown" // The name registered_name on the card - slot_flags = SLOT_FLAG_ID + slot_flags = ITEM_SLOT_ID armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 100) resistance_flags = FIRE_PROOF | ACID_PROOF var/untrackable // Can not be tracked by AI's @@ -152,15 +152,15 @@ popup.open() /obj/item/card/id/attack_self(mob/user as mob) - user.visible_message("[user] shows you: [bicon(src)] [src.name]. The assignment on the card: [src.assignment]",\ - "You flash your ID card: [bicon(src)] [src.name]. The assignment on the card: [src.assignment]") + user.visible_message("[user] shows you: [bicon(src)] [name]. The assignment on the card: [assignment]",\ + "You flash your ID card: [bicon(src)] [name]. The assignment on the card: [assignment]") if(mining_points) to_chat(user, "There's [mining_points] Mining Points loaded onto this card. This card has earned [total_mining_points] Mining Points this Shift!") - src.add_fingerprint(user) + add_fingerprint(user) return /obj/item/card/id/proc/UpdateName() - name = "[src.registered_name]'s ID Card ([src.assignment])" + name = "[registered_name]'s ID Card ([assignment])" /obj/item/card/id/proc/SetOwnerInfo(mob/living/carbon/human/H) if(!H || !H.dna) @@ -327,6 +327,13 @@ RebuildHTML() ..() +/obj/item/card/id/proc/flash_card(mob/user) + user.visible_message("[user] shows you: [bicon(src)] [name]. The assignment on the card: [assignment]",\ + "You flash your ID card: [bicon(src)] [name]. The assignment on the card: [assignment]") + if(mining_points) + to_chat(user, "There's [mining_points] Mining Points loaded onto this card. This card has earned [total_mining_points] Mining Points this Shift!") + add_fingerprint(user) + /obj/item/card/id/silver name = "identification card" desc = "A silver card which shows honour and dedication." @@ -339,327 +346,6 @@ icon_state = "gold" item_state = "gold_id" -/obj/item/card/id/syndicate - name = "agent card" - var/list/initial_access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_EXTERNAL_AIRLOCKS) - origin_tech = "syndicate=1" - var/registered_user = null - untrackable = TRUE - -/obj/item/card/id/syndicate/researcher - initial_access = list(ACCESS_SYNDICATE) - assignment = "Syndicate Researcher" - icon_state = "syndie" - untrackable = TRUE - -/obj/item/card/id/syndicate/New() - access = initial_access.Copy() - ..() - -/obj/item/card/id/syndicate/vox - name = "agent card" - initial_access = list(ACCESS_MAINT_TUNNELS, ACCESS_VOX, ACCESS_EXTERNAL_AIRLOCKS) - -/obj/item/card/id/syndicate/ghost_bar - name = "ghost bar identification card" - assignment = "Ghost Bar Occupant" - initial_access = list() // This is for show, they don't need actual accesses - icon_state = "assistant" - -/obj/item/card/id/syndicate/command - initial_access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_SYNDICATE_COMMAND, ACCESS_EXTERNAL_AIRLOCKS) - icon_state = "commander" - -/obj/item/card/id/syndicate/afterattack(obj/item/O as obj, mob/user as mob, proximity) - if(!proximity) - return - if(istype(O, /obj/item/card/id)) - var/obj/item/card/id/I = O - if(isliving(user) && user.mind) - if(user.mind.special_role) - to_chat(usr, "The card's microscanners activate as you pass it over \the [I], copying its access.") - src.access |= I.access //Don't copy access if user isn't an antag -- to prevent metagaming - -/obj/item/card/id/syndicate/attack_self(mob/user as mob) - if(!src.registered_name) - var/t = reject_bad_name(tgui_input_text(user, "What name would you like to use on this card?", "Agent Card name", ishuman(user) ? user.real_name : user.name), TRUE) - if(!t) - to_chat(user, "Invalid name.") - return - src.registered_name = t - - var/u = tgui_input_text(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than maintenance.", "Agent Card Job Assignment", "Agent", MAX_MESSAGE_LEN) - if(!u) - to_chat(user, "Invalid assignment.") - src.registered_name = "" - return - src.assignment = u - src.name = "[src.registered_name]'s ID Card ([src.assignment])" - to_chat(user, "You successfully forge the ID card.") - registered_user = user.mind.current - else if(!registered_user || registered_user == user.mind.current) - if(!registered_user) - registered_user = user.mind.current - - switch(tgui_alert(user, "Would you like to display [src] or edit it?", "Choose", list("Show", "Edit"))) - if("Show") - return ..() - if("Edit") - switch(tgui_input_list(user, "What would you like to edit on [src]?", "Agent ID", list("Name", "Photo", "Appearance", "Sex", "Age", "Occupation", "Money Account", "Blood Type", "DNA Hash", "Fingerprint Hash", "Reset Access", "Delete Card Information"))) - if("Name") - var/new_name = reject_bad_name(tgui_input_text(user, "What name would you like to put on this card?", "Agent Card Name", ishuman(user) ? user.real_name : user.name), TRUE) - if(!Adjacent(user) || !new_name) - return - src.registered_name = new_name - UpdateName() - to_chat(user, "Name changed to [new_name].") - RebuildHTML() - - if("Photo") - if(!Adjacent(user)) - return - var/job_clothes = null - if(assignment) - job_clothes = assignment - var/icon/newphoto = get_id_photo(user, job_clothes) - if(!newphoto) - return - photo = newphoto - to_chat(user, "Photo changed. Select another occupation and take a new photo if you wish to appear with different clothes.") - RebuildHTML() - - if("Appearance") - var/static/list/appearances = list( - "data", - "id", - "gold", - "silver", - "centcom", - "security", - "detective", - "warden", - "internalaffairsagent", - "medical", - "coroner", - "virologist", - "chemist", - "paramedic", - "psychiatrist", - "research", - "roboticist", - "quartermaster", - "cargo", - "shaftminer", - "engineering", - "atmostech", - "captain", - "HoP", - "HoS", - "CMO", - "RD", - "CE", - "assistant", - "clown", - "mime", - "botanist", - "librarian", - "chaplain", - "bartender", - "chef", - "janitor", - "explorer", - "rainbow", - "prisoner", - "syndie", - "deathsquad", - "commander", - "ERT_leader", - "ERT_security", - "ERT_engineering", - "ERT_medical", - "ERT_janitorial", - "ERT_paranormal", - ) - var/choice = tgui_input_list(user, "Select the appearance for this card.", "Agent Card Appearance", appearances) - if(!Adjacent(user) || !choice) - return - icon_state = choice - switch(choice) - if("silver") - desc = "A silver card which shows honour and dedication." - if("gold") - desc = "A golden card which shows power and might." - if("clown") - desc = "Even looking at the card strikes you with deep fear." - if("mime") - desc = "..." - if("prisoner") - desc = "You are a number, you are not a free man." - if("centcom") - desc = "An ID straight from Central Command." - else - desc = "A card used to provide ID and determine access across the station." - to_chat(usr, "Appearance changed to [choice].") - - if("Sex") - var/new_sex = tgui_input_text(user,"What sex would you like to put on this card?", "Agent Card Sex", ishuman(user) ? capitalize(user.gender) : "Male") - if(!Adjacent(user) || !new_sex) - return - sex = new_sex - to_chat(user, "Sex changed to [new_sex].") - RebuildHTML() - - if("Age") - var/default = "21" - if(ishuman(user)) - var/mob/living/carbon/human/H = user - default = H.age - var/new_age = tgui_input_number(user, "What age would you like to be written on this card?", "Agent Card Age", default, 300, 17) - if(!Adjacent(user) || isnull(new_age)) - return - age = new_age - to_chat(user, "Age changed to [new_age].") - RebuildHTML() - - if("Occupation") - var/static/list/departments = list( - "Assistant" = null, - "Engineering" = GLOB.engineering_positions, - "Medical" = GLOB.medical_positions, - "Science" = GLOB.science_positions, - "Security" = GLOB.security_positions, - "Service" = GLOB.service_positions, - "Supply" = GLOB.supply_positions, - "Command" = GLOB.command_positions, - "Custom" = null, - ) - - var/department = tgui_input_list(user, "What job would you like to put on this card?\nChoose a department or a custom job title.\nChanging occupation will not grant or remove any access levels.", "Agent Card Occupation", departments) - var/new_job = "Assistant" - - if(department == "Custom") - new_job = tgui_input_text(user, "Choose a custom job title:", "Agent Card Occupation", "Assistant") - else if(department != "Assistant" && !isnull(departments[department])) - new_job = tgui_input_list(user, "What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.", "Agent Card Occupation", departments[department]) - - if(!Adjacent(user) || !new_job) - return - assignment = new_job - to_chat(user, "Occupation changed to [new_job].") - UpdateName() - RebuildHTML() - - if("Money Account") - var/new_account = tgui_input_number(user, "What money account would you like to link to this card?", "Agent Card Account", 12345, max_value = 9999999) - if(!Adjacent(user) || isnull(new_account)) - return - associated_account_number = new_account - to_chat(user, "Linked money account changed to [new_account].") - - if("Blood Type") - var/default = "\[UNSET\]" - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if(H.dna) - default = H.dna.blood_type - - var/new_blood_type = tgui_input_text(user, "What blood type would you like to be written on this card?", "Agent Card Blood Type", default) - if(!Adjacent(user) || !new_blood_type) - return - blood_type = new_blood_type - to_chat(user, "Blood type changed to [new_blood_type].") - RebuildHTML() - - if("DNA Hash") - var/default = "\[UNSET\]" - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if(H.dna) - default = H.dna.unique_enzymes - - var/new_dna_hash = tgui_input_text(user, "What DNA hash would you like to be written on this card?", "Agent Card DNA Hash", default) - if(!Adjacent(user) || !new_dna_hash) - return - dna_hash = new_dna_hash - to_chat(user, "DNA hash changed to [new_dna_hash].") - RebuildHTML() - - if("Fingerprint Hash") - var/default = "\[UNSET\]" - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if(H.dna) - default = md5(H.dna.uni_identity) - - var/new_fingerprint_hash = tgui_input_text(user, "What fingerprint hash would you like to be written on this card?", "Agent Card Fingerprint Hash", default) - if(!Adjacent(user) || !new_fingerprint_hash) - return - fingerprint_hash = new_fingerprint_hash - to_chat(user, "Fingerprint hash changed to [new_fingerprint_hash].") - RebuildHTML() - - if("Reset Access") - var/response = tgui_alert(user, "Are you sure you want to reset access saved on the card?", "Reset Access", list("No", "Yes")) - if(response == "Yes") - access = initial_access.Copy() // Initial() doesn't work on lists - to_chat(user, "Card access reset.") - - if("Delete Card Information") - var/response = tgui_alert(user, "Are you sure you want to delete all information saved on the card?", "Delete Card Information", list("No", "Yes")) - if(response == "Yes") - name = initial(name) - registered_name = initial(registered_name) - icon_state = initial(icon_state) - sex = initial(sex) - age = initial(age) - assignment = initial(assignment) - associated_account_number = initial(associated_account_number) - blood_type = initial(blood_type) - dna_hash = initial(dna_hash) - fingerprint_hash = initial(fingerprint_hash) - photo = null - registered_user = null - to_chat(user, "All information has been deleted from \the [src].") - RebuildHTML() - else - ..() - -/obj/item/card/id/syndicate/Destroy() - registered_user = null - return ..() - -/obj/item/card/id/syndicate_command - name = "syndicate ID card" - desc = "An ID straight from the Syndicate." - registered_name = "Syndicate" - icon_state = "syndie" - assignment = "Syndicate Overlord" - untrackable = TRUE - access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_SYNDICATE_COMMAND, ACCESS_EXTERNAL_AIRLOCKS) - -// like /obj/item/card/id/syndicate, but you can only swipe access, not change your identity, its also trackable -/obj/item/card/id/syndi_scan_only - name = "Syndicate Operative's ID card (Operative)" - rank = "Operative" - assignment = "Operative" - registered_name = "Syndicate Operative" - access = list(ACCESS_SYNDICATE) - -/obj/item/card/id/syndi_scan_only/examine(mob/user) - . = ..() - if(isAntag(user)) - . += "Similar to an agent ID, this ID card can be used to copy accesses, but it lacks the customization and anti-tracking capabilities of an agent ID." - -/obj/item/card/id/syndi_scan_only/afterattack(obj/item/O, mob/user, proximity) - if(!proximity) - return - if(istype(O, /obj/item/card/id)) - var/obj/item/card/id/I = O - if(isliving(user) && user.mind) - if(user.mind.special_role) - to_chat(user, "The card's microscanners activate as you pass it over [I], copying its access.") - access |= I.access // Don't copy access if user isn't an antag -- to prevent metagaming - /obj/item/card/id/captains_spare name = "captain's spare ID" desc = "The spare ID of the captain. Keep this secured." 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 ae13004093635..32ef36bb8a6a4 100644 --- a/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm +++ b/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm @@ -11,7 +11,7 @@ throw_speed = 1 throw_range = 5 w_class = WEIGHT_CLASS_NORMAL - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK materials = list(MAT_METAL = 5000) resistance_flags = FIRE_PROOF origin_tech = "combat=1;plasmatech=2;engineering=2" diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index fbd824c38fe4b..93688150b2d19 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -7,7 +7,7 @@ icon_state = "chronobackpack" item_state = "backpack" w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK slowdown = 1 actions_types = list(/datum/action/item_action/equip_unequip_TED_Gun) var/obj/item/gun/energy/chrono_gun/PA = null @@ -36,7 +36,7 @@ user.put_in_hands(PA) /obj/item/chrono_eraser/item_action_slot_check(slot, mob/user) - if(slot == SLOT_HUD_BACK) + if(slot == ITEM_SLOT_BACK) return 1 @@ -143,6 +143,7 @@ projectile_type = /obj/item/projectile/energy/chrono_beam muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash/energy muzzle_flash_color = null + icon = 'icons/obj/projectiles.dmi' icon_state = "chronobolt" e_cost = 0 diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index c6e7465bf7cdb..35efab9e071a7 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -22,7 +22,7 @@ LIGHTERS ARE IN LIGHTERS.DM icon_state = "cigoff" item_state = "cigoff" throw_speed = 0.5 - slot_flags = SLOT_FLAG_MASK + slot_flags = ITEM_SLOT_MASK w_class = WEIGHT_CLASS_TINY body_parts_covered = null attack_verb = null @@ -99,7 +99,7 @@ LIGHTERS ARE IN LIGHTERS.DM var/mob/living/carbon/M = target if(istype(M) && user.zone_selected == "mouth" && !M.wear_mask && user.a_intent == INTENT_HELP) user.unEquip(src, TRUE) - M.equip_to_slot_if_possible(src, SLOT_HUD_WEAR_MASK) + M.equip_to_slot_if_possible(src, ITEM_SLOT_MASK) if(target != user) user.visible_message( "[user] slips \a [name] into the mouth of [M].", @@ -488,7 +488,7 @@ LIGHTERS ARE IN LIGHTERS.DM /obj/item/clothing/mask/holo_cigar/equipped(mob/user, slot, initial) . = ..() - if(enabled && slot == SLOT_HUD_WEAR_MASK) + if(enabled && slot == ITEM_SLOT_MASK) if(!HAS_TRAIT_FROM(user, TRAIT_BADASS, HOLO_CIGAR)) ADD_TRAIT(user, TRAIT_BADASS, HOLO_CIGAR) to_chat(user, "You feel more badass while smoking [src].") diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 392ff0f398a86..7a818cc6f47b2 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -72,7 +72,7 @@ icon_state = "clown_recorder" item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT materials = list(MAT_METAL = 180, MAT_GLASS = 90) force = 2 throwforce = 0 diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index d18ff165110b3..b0165f2c5c821 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/defib.dmi' icon_state = "defibunit" item_state = "defibunit" - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK force = 5 throwforce = 6 w_class = WEIGHT_CLASS_BULKY @@ -163,12 +163,12 @@ /obj/item/defibrillator/equipped(mob/user, slot) ..() - if(slot != SLOT_HUD_BACK) + if(slot != ITEM_SLOT_BACK) remove_paddles(user) update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/item_action_slot_check(slot, mob/user) - if(slot == SLOT_HUD_BACK) + if(slot == ITEM_SLOT_BACK) return TRUE /obj/item/defibrillator/proc/remove_paddles(mob/user) // from your hands @@ -206,7 +206,7 @@ item_state = "defibcompact" sprite_sheets = null //Because Vox had the belt defibrillator sprites in back.dm w_class = WEIGHT_CLASS_NORMAL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 origin_tech = "biotech=5" @@ -216,7 +216,7 @@ update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/compact/item_action_slot_check(slot, mob/user) - if(slot == SLOT_HUD_BELT) + if(slot == ITEM_SLOT_BELT) return TRUE /obj/item/defibrillator/compact/combat @@ -285,8 +285,8 @@ name = "defibrillator paddles" desc = "A pair of plastic-gripped paddles with flat metal surfaces that are used to deliver powerful electric shocks." icon = 'icons/obj/defib.dmi' - icon_state = "defibpaddles" - item_state = "defibpaddles" + icon_state = "defibpaddles0" + item_state = "defibpaddles0" force = 0 throwforce = 6 w_class = WEIGHT_CLASS_BULKY diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 4b67c9867856e..9f468b673fd1f 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -114,12 +114,15 @@ /obj/item/grenade/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) var/obj/item/projectile/P = hitby if(damage && attack_type == PROJECTILE_ATTACK && P.damage_type != STAMINA && prob(15)) - owner.visible_message("[attack_text] hits [owner]'s [src], setting it off! What a shot!") + owner.visible_message("[hitby] hits [owner]'s [name], setting it off! What a shot!") var/turf/T = get_turf(src) log_game("A projectile ([hitby]) detonated a grenade held by [key_name(owner)] at [COORD(T)]") add_attack_logs(P.firer, owner, "A projectile ([hitby]) detonated a grenade held", ATKLOG_FEW) prime() - return 1 //It hit the grenade, not them + if(!QDELETED(src)) // some grenades don't detonate but we want them destroyed, otherwise you can just hold empty grenades as shields. + qdel(src) + return TRUE + return ..() /obj/item/grenade/chem_grenade/attackby(obj/item/I, mob/user, params) if(istype(I,/obj/item/hand_labeler)) diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index 475a9e02aeec8..462a9b722356a 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -10,7 +10,7 @@ throw_speed = 3 throw_range = 7 flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT active = FALSE det_time = 5 SECONDS display_timer = FALSE diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 212088822e733..b51fb00bfd49e 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -8,9 +8,10 @@ throw_speed = 3 throw_range = 20 flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT resistance_flags = FLAMMABLE max_integrity = 40 + flags_2 = RANDOM_BLOCKER_2 /// Has the pin been pulled? var/active = FALSE /// Time between the pin being pulled and detonation. diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm index 49908095d142d..b6943f1028276 100644 --- a/code/game/objects/items/weapons/grenades/smokebomb.dm +++ b/code/game/objects/items/weapons/grenades/smokebomb.dm @@ -6,7 +6,7 @@ det_time = 2 SECONDS modifiable_timer = FALSE item_state = "smoke" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT var/datum/effect_system/smoke_spread/bad/smoke /obj/item/grenade/smokebomb/Initialize(mapload) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 4d3826f3f3e1d..cc6288bb74c52 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -42,7 +42,7 @@ icon_state = "handcuff" belt_icon = "handcuffs" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 5 w_class = WEIGHT_CLASS_SMALL throw_speed = 2 diff --git a/code/game/objects/items/weapons/highlander_swords.dm b/code/game/objects/items/weapons/highlander_swords.dm index b0e6e5b91e0c7..b9dcdfabbc6dc 100644 --- a/code/game/objects/items/weapons/highlander_swords.dm +++ b/code/game/objects/items/weapons/highlander_swords.dm @@ -28,7 +28,7 @@ if(!ishuman(user) || !user.mind) return var/mob/living/carbon/human/H = user - if(slot == SLOT_HUD_RIGHT_HAND || slot == SLOT_HUD_LEFT_HAND) + if(slot & ITEM_SLOT_BOTH_HANDS) if(H.mind.martial_art != style) style.teach(H, TRUE) to_chat(H, "THERE CAN ONLY BE ONE!") diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index f51d1493347a9..12333965c90ac 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -134,7 +134,7 @@ item_state = "godstaff-red" w_class = WEIGHT_CLASS_HUGE force = 5 - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK /obj/item/nullrod/staff/Initialize(mapload) . = ..() @@ -154,7 +154,7 @@ item_state = "claymore" desc = "A weapon fit for a crusade!" w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK|SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT sharp = TRUE hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -174,7 +174,7 @@ icon_state = "cultblade" item_state = "darkbalde" desc = "Spread the glory of the dark gods!" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT hitsound = 'sound/hallucinations/growl1.ogg' /obj/item/nullrod/claymore/chainsaw_sword @@ -183,7 +183,7 @@ icon_state = "chainswordon" item_state = "chainswordon" desc = "Suffer not a heretic to live." - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT attack_verb = list("sawed", "torn", "cut", "chopped", "diced") hitsound = 'sound/weapons/chainsaw.ogg' @@ -193,14 +193,14 @@ icon_state = "swordon" item_state = "swordon" desc = "The blade glows with the power of faith. Or possibly a battery." - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT /obj/item/nullrod/claymore/katana name = "hanzo steel" desc = "Capable of cutting clean through a holy claymore." icon_state = "katana" item_state = "katana" - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK /obj/item/nullrod/claymore/multiverse name = "extradimensional blade" @@ -208,7 +208,7 @@ icon = 'icons/obj/weapons/magical_weapons.dmi' icon_state = "multiverse" item_state = "multiverse" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT /obj/item/nullrod/claymore/saber name = "light energy blade" @@ -217,7 +217,7 @@ icon_state = "swordblue" item_state = "swordblue" desc = "If you strike me down, I shall become more robust than you can possibly imagine." - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT /obj/item/nullrod/claymore/saber/red name = "dark energy blade" @@ -238,7 +238,7 @@ righthand_file = 'icons/mob/inhands/weapons_righthand.dmi' icon_state = "sord" item_state = "sord" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 4.13 throwforce = 1 hitsound = 'sound/weapons/bladeslice.ogg' @@ -252,7 +252,7 @@ desc = "Ask not for whom the bell tolls..." w_class = WEIGHT_CLASS_BULKY armour_penetration_flat = 30 - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK sharp = TRUE attack_verb = list("chopped", "sliced", "cut", "reaped") hitsound = 'sound/weapons/rapierhit.ogg' @@ -390,7 +390,7 @@ icon_state = "hammeron" item_state = "hammeron" desc = "This war hammer cost the chaplain fourty thousand space dollars." - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_HUGE attack_verb = list("smashed", "bashed", "hammered", "crunched") @@ -425,7 +425,7 @@ icon = 'icons/obj/clothing/hats.dmi' icon_state = "fedora" item_state = "fedora" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD force = 0 throw_speed = 4 throw_range = 7 @@ -493,7 +493,7 @@ item_state = "bostaff0" w_class = WEIGHT_CLASS_BULKY force = 13 - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK sharp = FALSE hitsound = "swing_hit" attack_verb = list("smashed", "slammed", "whacked", "thwacked") @@ -628,7 +628,7 @@ /obj/item/nullrod/rosary/bread/equipped(mob/user, slot, initial = FALSE) . = ..() - if(ishuman(user) && (slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND)) + if(ishuman(user) && (slot & ITEM_SLOT_BOTH_HANDS)) START_PROCESSING(SSobj, src) else STOP_PROCESSING(SSobj, src) @@ -672,7 +672,7 @@ item_state = "godstaff-red" w_class = WEIGHT_CLASS_HUGE force = 5 - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK var/team_color = "red" var/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/robes = null //the robes linked with this staff diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index b12c2c8a82e4e..4c295e6bf2b31 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -10,7 +10,7 @@ w_class = WEIGHT_CLASS_TINY throwforce = 4 flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT attack_verb = null resistance_flags = FIRE_PROOF var/lit = FALSE @@ -18,7 +18,7 @@ var/next_on_message /// Cooldown until the next turned off message/sound can be activated var/next_off_message - /// Our lighter color suffix. => [base_icon_state]-[lightercolor] => lighter-r + /// Our lighter color suffix. => `[base_icon_state]-[lightercolor]` => `lighter-r` var/lighter_color var/is_a_zippo = FALSE 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 9aeedf0b9d832..8391118d92bc1 100644 --- a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm +++ b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm @@ -406,7 +406,7 @@ inhand_y_dimension = 64 icon_state = "cleaving_saw" icon_state_on = "cleaving_saw_open" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT is_a_cleaving_saw = TRUE var/attack_verb_off = list("attacked", "sawed", "sliced", "torn", "ripped", "diced", "cut") attack_verb_on = list("cleaved", "swiped", "slashed", "chopped") diff --git a/code/game/objects/items/weapons/melee/melee_misc.dm b/code/game/objects/items/weapons/melee/melee_misc.dm index 99c3652f28e33..c051715815d76 100644 --- a/code/game/objects/items/weapons/melee/melee_misc.dm +++ b/code/game/objects/items/weapons/melee/melee_misc.dm @@ -10,7 +10,7 @@ icon_state = "chain" item_state = "chain" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 10 throwforce = 7 w_class = WEIGHT_CLASS_NORMAL @@ -335,11 +335,13 @@ var/static/list/options = list("Lightning" = image(icon = 'icons/effects/spellblade.dmi', icon_state = "chain_lightning"),/// todo add icons for these "Fire" = image(icon = 'icons/effects/spellblade.dmi', icon_state = "fire"), "Bluespace" = image(icon = 'icons/effects/spellblade.dmi', icon_state = "blink"), - "Forcewall" = image(icon = 'icons/effects/spellblade.dmi', icon_state = "shield"),) + "Forcewall" = image(icon = 'icons/effects/spellblade.dmi', icon_state = "shield"), + "Temporal Slash" = image(icon = 'icons/effects/spellblade.dmi', icon_state = "spacetime"),) var/static/list/options_to_type = list("Lightning" = /datum/enchantment/lightning, "Fire" = /datum/enchantment/fire, "Bluespace" = /datum/enchantment/bluespace, - "Forcewall" = /datum/enchantment/forcewall,) + "Forcewall" = /datum/enchantment/forcewall, + "Temporal Slash" = /datum/enchantment/time_slash,) var/choice = show_radial_menu(user, src, options) if(!choice) @@ -349,6 +351,7 @@ /obj/item/melee/spellblade/proc/add_enchantment(new_enchant, mob/living/user, intentional = TRUE) var/datum/enchantment/E = new new_enchant enchant = E + E.on_apply_to_blade(src) E.on_gain(src, user) E.power *= power if(intentional) @@ -378,6 +381,8 @@ var/cooldown = -1 /// If the spellblade has traits, has it applied them? var/applied_traits = FALSE + /// A modifier that can be appled to the cooldown after the enchantment has been initialized. Used by the forcewall spellblade + var/cooldown_multiplier = 1 /datum/enchantment/proc/on_hit(mob/living/target, mob/living/user, proximity, obj/item/melee/spellblade/S) if(world.time < cooldown) @@ -388,7 +393,7 @@ return FALSE if(!ranged && !proximity) return FALSE - cooldown = world.time + initial(cooldown) + cooldown = world.time + (initial(cooldown) * cooldown_multiplier) return TRUE /datum/enchantment/proc/on_gain(obj/item/melee/spellblade, mob/living/user) @@ -397,9 +402,12 @@ /datum/enchantment/proc/toggle_traits(obj/item/I, mob/living/user) return +/datum/enchantment/proc/on_apply_to_blade(obj/item/melee/spellblade) + return + /datum/enchantment/lightning name = "lightning" - desc = "this blade conducts arcane energy to arc between its victims. It also makes the user immune to shocks." + desc = "this blade conducts arcane energy to arc between its victims. It also makes the user immune to shocks" // the damage of the first lighting arc. power = 20 cooldown = 3 SECONDS @@ -473,6 +481,11 @@ name = "forcewall" desc = "this blade will partially shield you against attacks and stuns for a short duration after striking a foe" cooldown = 4 SECONDS + // multiplier for how much the cooldown is reduced by. A miner spellblade can only buff every 4 seconds, making it more vunerable, the wizard one is much more consistant. + power = 2 + +/datum/enchantment/forcewall/on_apply_to_blade(obj/item/melee/spellblade) + cooldown_multiplier /= power /datum/enchantment/forcewall/on_hit(mob/living/target, mob/living/user, proximity, obj/item/melee/spellblade/S) . = ..() @@ -482,7 +495,7 @@ /datum/enchantment/bluespace name = "bluespace" - desc = "this the fabric of space, transporting its wielder over medium distances to strike foes" + desc = "this blade will cut through the fabric of space, transporting its wielder over medium distances to strike foes" cooldown = 2.5 SECONDS ranged = TRUE // the number of deciseconds of stun applied by the teleport strike @@ -511,6 +524,51 @@ S.melee_attack_chain(user, target) target.Weaken(power) +/datum/enchantment/time_slash + name = "temporal" + desc = "this blade will slice faster but weaker, and will curse the target, slashing them a few seconds after they have not been swinged at for each hit" + power = 15 // This should come out to 40 damage per hit. However, delayed. + +/datum/enchantment/time_slash/on_apply_to_blade(obj/item/melee/spellblade) + spellblade.force /= 2 + +/datum/enchantment/time_slash/on_hit(mob/living/target, mob/living/user, proximity, obj/item/melee/spellblade/S) + user.changeNext_move(CLICK_CD_MELEE * 0.5) + . = ..() + if(!.) + return + target.apply_status_effect(STATUS_EFFECT_TEMPORAL_SLASH, power) + +/obj/effect/temp_visual/temporal_slash + name = "temporal slash" + desc = "A cut through spacetime" + icon = 'icons/obj/projectiles.dmi' + icon_state = "arcane_barrage" + layer = FLY_LAYER + plane = GRAVITY_PULSE_PLANE + appearance_flags = PIXEL_SCALE|LONG_GLIDE + duration = 0.5 SECONDS + mouse_opacity = MOUSE_OPACITY_TRANSPARENT // Let us not have this visual block clicks + /// Who we are orbiting + var/target + /// A funky color matrix to recolor the slash to + var/list/funky_color_matrix = list(0.4,0,0,0, 0,1.1,0,0, 0,0,1.65,0, -0.3,0.15,0,1, 0,0,0,0) + +/obj/effect/temp_visual/temporal_slash/Initialize(mapload, new_target) + . = ..() + target = new_target + INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, orbit), target, 0, FALSE, 0, 0, FALSE, TRUE) + var/matrix/M = matrix() + M.Scale(1, 2) + M.Turn(rand(0, 360)) + transform = M + addtimer(CALLBACK(src, PROC_REF(animate_slash)), 0.25 SECONDS) + +/obj/effect/temp_visual/temporal_slash/proc/animate_slash() + plane = -1 + color = funky_color_matrix + animate(src, alpha = 0, time = duration, easing = EASE_OUT) + /obj/item/melee/spellblade/random power = 0.5 @@ -519,6 +577,7 @@ var/list/options = list(/datum/enchantment/lightning, /datum/enchantment/fire, /datum/enchantment/forcewall, - /datum/enchantment/bluespace,) + /datum/enchantment/bluespace, + /datum/enchantment/time_slash,) var/datum/enchantment/E = pick(options) add_enchantment(E, intentional = FALSE) diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index a25c78af6c835..de8e2279f08a0 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -91,15 +91,3 @@ materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS = MINERAL_MATERIAL_AMOUNT) icon_prefix = "plasma" welded_type = /obj/item/stack/sheet/plasmaglass - -/obj/item/shard/scrap - name = "sharpened scrap" - desc = "Some discarded scrap metal. It has sharp, jagged edges." - icon_state = "scrap" - materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT) - welded_type = /obj/item/stack/sheet/metal - force = 9 - throwforce = 15 //owie - -/obj/item/shard/scrap/set_initial_icon_state() - return diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 604b90b7c54cf..f5c0ccbcb1f08 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -21,7 +21,7 @@ name = "riot shield" desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder." icon_state = "riot" - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK force = 10 throwforce = 5 throw_speed = 2 @@ -163,7 +163,7 @@ throwforce = 5 throw_speed = 2 w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK to_chat(user, "You extend \the [src].") icon_state = "teleriot[HAS_TRAIT(src, TRAIT_ITEM_ACTIVE)]" playsound(loc, 'sound/weapons/batonextend.ogg', 50, TRUE) diff --git a/code/game/objects/items/weapons/staff.dm b/code/game/objects/items/weapons/staff.dm index 8da6c38f2d79e..f64fdee6ca744 100644 --- a/code/game/objects/items/weapons/staff.dm +++ b/code/game/objects/items/weapons/staff.dm @@ -73,15 +73,3 @@ ..() item_state = "horsebroom[HAS_TRAIT(src, TRAIT_WIELDED) ? 1 : 0]" -/obj/item/staff/stick - name = "stick" - desc = "A great tool to drag someone else's drinks across the bar." - icon_state = "stick" - lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' - righthand_file = 'icons/mob/inhands/items_righthand.dmi' - item_state = "stick" - force = 3.0 - throwforce = 5.0 - throw_speed = 1 - throw_range = 5 - w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index e49cb9b630621..812e1f4ca132a 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -11,7 +11,7 @@ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi' righthand_file = 'icons/mob/inhands/clothing_righthand.dmi' w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK //ERROOOOO + slot_flags = ITEM_SLOT_BACK //ERROOOOO max_w_class = WEIGHT_CLASS_NORMAL max_combined_w_class = 21 storage_slots = 21 @@ -525,6 +525,8 @@ desc = "A large duffelbag, containing three types of extended drum magazines." /obj/item/storage/backpack/duffel/syndie/shotgunXLmags/populate_contents() + new /obj/item/ammo_box/magazine/m12g/XtrLrg(src) + new /obj/item/ammo_box/magazine/m12g/XtrLrg(src) new /obj/item/ammo_box/magazine/m12g/XtrLrg(src) new /obj/item/ammo_box/magazine/m12g/XtrLrg/buckshot(src) new /obj/item/ammo_box/magazine/m12g/XtrLrg/dragon(src) @@ -564,15 +566,6 @@ new /obj/item/gun/projectile/automatic/c20r(src) new /obj/item/suppressor/specialoffer(src) -/obj/item/storage/backpack/duffel/syndie/bulldogbundle - desc = "A large duffel bag containing a Bulldog, some drums, and a pair of thermal imaging glasses." - -/obj/item/storage/backpack/duffel/syndie/bulldogbundle/populate_contents() - new /obj/item/gun/projectile/automatic/shotgun/bulldog(src) - new /obj/item/ammo_box/magazine/m12g(src) - new /obj/item/ammo_box/magazine/m12g(src) - new /obj/item/clothing/glasses/chameleon/thermal(src) - /obj/item/storage/backpack/duffel/syndie/med/medicalbundle desc = "A large duffel bag containing a tactical medkit, a medical beam gun and a pair of syndicate magboots." diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index baf7961d11406..db90aaaa36714 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -24,7 +24,7 @@ allow_quick_empty = TRUE display_contents_with_number = 1 // should work fine now use_to_pickup = 1 - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT //////////////////////////////////////// // MARK: Trash bag @@ -117,7 +117,7 @@ icon = 'icons/obj/trash.dmi' icon_state = "plasticbag" item_state = "plasticbag" - slot_flags = SLOT_FLAG_HEAD|SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_HEAD|ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_BULKY max_w_class = WEIGHT_CLASS_SMALL @@ -127,14 +127,14 @@ cant_hold = list(/obj/item/disk/nuclear) /obj/item/storage/bag/plasticbag/mob_can_equip(mob/M, slot, disable_warning = FALSE) - if(slot == SLOT_HUD_HEAD && length(contents)) + if(slot == ITEM_SLOT_HEAD && length(contents)) to_chat(M, "You need to empty the bag first!") return FALSE return ..() /obj/item/storage/bag/plasticbag/equipped(mob/user, slot) - if(slot==SLOT_HUD_HEAD) + if(slot==ITEM_SLOT_HEAD) storage_slots = 0 START_PROCESSING(SSobj, src) return @@ -143,7 +143,7 @@ if(is_equipped()) if(ishuman(loc)) var/mob/living/carbon/human/H = loc - if(H.get_item_by_slot(SLOT_HUD_HEAD) == src) + if(H.get_item_by_slot(ITEM_SLOT_HEAD) == src) if(H.internal) return H.AdjustLoseBreath(2 SECONDS) @@ -161,7 +161,7 @@ icon = 'icons/obj/mining.dmi' icon_state = "satchel" origin_tech = "engineering=2" - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_POCKET + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_POCKETS w_class = WEIGHT_CLASS_NORMAL storage_slots = 10 max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class @@ -473,7 +473,7 @@ icon = 'icons/obj/mining.dmi' icon_state = "satchel" origin_tech = "engineering=2" - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_POCKET + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_POCKETS w_class = WEIGHT_CLASS_NORMAL storage_slots = 15 max_combined_w_class = 60 diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 9f8d789aa1340..b3e867e3232c4 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -6,7 +6,7 @@ item_state = "utility" lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi' - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 | BLOCKS_LIGHT_2 attack_verb = list("whipped", "lashed", "disciplined") max_integrity = 300 @@ -569,6 +569,7 @@ name = "trainer's belt" desc = "For the mining master, holds your lazarus capsules." icon_state = "lazarusbelt_0" + base_icon_state = "lazarusbelt" item_state = "lazbelt" w_class = WEIGHT_CLASS_BULKY max_w_class = WEIGHT_CLASS_TINY @@ -582,7 +583,7 @@ update_icon() /obj/item/storage/belt/lazarus/update_icon_state() - icon_state = "lazarusbelt_[length(contents)]" + icon_state = "[base_icon_state]_[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/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 4ecea20ac627c..86fcbcffa0934 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -68,10 +68,7 @@ /obj/item/storage/bible/proc/bless(mob/living/carbon/M) if(ishuman(M)) var/mob/living/carbon/human/H = M - var/heal_amt = 10 - for(var/obj/item/organ/external/affecting in H.bodyparts) - if(affecting.heal_damage(heal_amt, heal_amt)) - H.UpdateDamageIcon() + H.heal_overall_damage(10, 10) return /obj/item/storage/bible/attack(mob/living/M, mob/living/user) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index faaf28381eb8c..4bde30ff2a273 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1266,6 +1266,15 @@ new /obj/item/clothing/under/plasmaman/coke(src) new /obj/item/clothing/head/helmet/space/plasmaman/coke(src) +/obj/item/storage/box/tacticool_envirosuit + name = "tactical suit box" + desc = "A box with a special envirosuit usually supplied by black markets." + icon_state = "plasma_box" + +/obj/item/storage/box/tacticool_envirosuit/populate_contents() + new /obj/item/clothing/under/plasmaman/tacticool(src) + new /obj/item/clothing/head/helmet/space/plasmaman/tacticool(src) + #undef NODESIGN #undef NANOTRASEN #undef SYNDI diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 77db50a1f2b55..1dad0fb1fb655 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -112,7 +112,7 @@ item_state = "candlebox5" storage_slots = 5 throwforce = 2 - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT /obj/item/storage/fancy/candle_box/Initialize(mapload) . = ..() @@ -189,7 +189,7 @@ storage_slots = 10 w_class = WEIGHT_CLASS_TINY max_w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT drop_sound = 'sound/items/handling/matchbox_drop.ogg' pickup_sound = 'sound/items/handling/matchbox_pickup.ogg' can_hold = list(/obj/item/match) @@ -228,7 +228,7 @@ belt_icon = "patch_pack" w_class = WEIGHT_CLASS_SMALL throwforce = 2 - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT storage_slots = 6 max_combined_w_class = 6 can_hold = list(/obj/item/clothing/mask/cigarette, @@ -257,7 +257,7 @@ var/obj/item/I = contents[num] if(istype(I, /obj/item/clothing/mask/cigarette)) var/obj/item/clothing/mask/cigarette/C = I - M.equip_to_slot_if_possible(C, SLOT_HUD_WEAR_MASK) + M.equip_to_slot_if_possible(C, ITEM_SLOT_MASK) if(M != user) user.visible_message( "[user] takes \a [C.name] out of [src] and gives it to [M].", diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index b931ea2a76c40..cdeead6df5a37 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -15,6 +15,7 @@ /obj/item/clothing/suit/space, /obj/item/clothing/mask/cigarette, /obj/item/clothing/mask/facehugger, //Why would you do this + /obj/item/clothing/neck/cloak, /obj/item/clothing/accessory/medal, /obj/item/clothing/suit/armor/riot, /obj/item/clothing/suit/armor/reactive, @@ -33,6 +34,7 @@ new /obj/item/clothing/head/beret/captain(src) new /obj/item/clothing/head/beret/captain/white(src) new /obj/item/clothing/head/crown/fancy(src) + new /obj/item/clothing/neck/cloak/captain(src) new /obj/item/clothing/suit/armor/vest/capcarapace(src) new /obj/item/clothing/suit/armor/vest/capcarapace/jacket(src) new /obj/item/clothing/suit/armor/vest/capcarapace/jacket/tunic(src) @@ -48,6 +50,8 @@ new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/clothing/glasses/hud/health/sunglasses(src) + new /obj/item/clothing/head/helmet/space/plasmaman/captain(src) + new /obj/item/clothing/under/plasmaman/captain(src) /obj/item/storage/bag/garment/head_of_personnel name = "head of personnel's garment bag" @@ -56,6 +60,7 @@ /obj/item/storage/bag/garment/head_of_personnel/populate_contents() new /obj/item/clothing/head/hop(src) new /obj/item/clothing/head/beret/hop(src) + new /obj/item/clothing/neck/cloak/head_of_personnel(src) new /obj/item/clothing/suit/mantle/armor/hop(src) new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/suit/hopcoat(src) @@ -71,6 +76,8 @@ new /obj/item/clothing/shoes/white(src) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/glasses/hud/skills/sunglasses(src) + new /obj/item/clothing/head/helmet/space/plasmaman/hop(src) + new /obj/item/clothing/under/plasmaman/hop(src) /obj/item/storage/bag/garment/head_of_security name = "head of security's garment bag" @@ -79,6 +86,7 @@ /obj/item/storage/bag/garment/head_of_security/populate_contents() new /obj/item/clothing/head/HoS(src) new /obj/item/clothing/head/beret/hos(src) + new /obj/item/clothing/neck/cloak/head_of_security(src) new /obj/item/clothing/suit/armor/hos(src) new /obj/item/clothing/suit/armor/hos/alt(src) new /obj/item/clothing/suit/mantle/armor(src) @@ -88,6 +96,8 @@ new /obj/item/clothing/under/rank/security/head_of_security/skirt(src) new /obj/item/clothing/under/rank/security/head_of_security/skirt/corporate(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) + new /obj/item/clothing/head/helmet/space/plasmaman/security/hos(src) + new /obj/item/clothing/under/plasmaman/security/hos(src) /obj/item/storage/bag/garment/research_director name = "research director's garment bag" @@ -95,6 +105,7 @@ /obj/item/storage/bag/garment/research_director/populate_contents() new /obj/item/clothing/head/beret/sci(src) + new /obj/item/clothing/neck/cloak/research_director(src) new /obj/item/clothing/under/rank/rnd/research_director(src) new /obj/item/clothing/suit/storage/labcoat/rd(src) new /obj/item/clothing/suit/mantle/labcoat(src) @@ -104,6 +115,8 @@ new /obj/item/clothing/glasses/science(src) new /obj/item/clothing/glasses/welding/superior(src) new /obj/item/clothing/glasses/hud/diagnostic/sunglasses(src) + new /obj/item/clothing/head/helmet/space/plasmaman/rd(src) + new /obj/item/clothing/under/plasmaman/rd(src) /obj/item/storage/bag/garment/chief_medical_officer @@ -114,6 +127,7 @@ new /obj/item/clothing/head/surgery/blue(src) new /obj/item/clothing/head/surgery/green(src) new /obj/item/clothing/head/surgery/purple(src) + new /obj/item/clothing/neck/cloak/chief_medical_officer(src) new /obj/item/clothing/under/rank/medical/chief_medical_officer(src) new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt(src) new /obj/item/clothing/under/rank/medical/scrubs(src) @@ -124,6 +138,8 @@ new /obj/item/clothing/shoes/white(src) new /obj/item/clothing/shoes/brown (src) new /obj/item/clothing/gloves/color/latex/nitrile(src) + new /obj/item/clothing/head/helmet/space/plasmaman/cmo(src) + new /obj/item/clothing/under/plasmaman/cmo(src) /obj/item/storage/bag/garment/chief_engineer name = "chief engineer's garment bag" @@ -133,6 +149,7 @@ new /obj/item/clothing/head/hardhat/white(src) new /obj/item/clothing/head/beret/ce(src) new /obj/item/clothing/head/beret/eng(src) + new /obj/item/clothing/neck/cloak/chief_engineer(src) new /obj/item/clothing/under/rank/engineering/chief_engineer(src) new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src) new /obj/item/clothing/suit/mantle/chief_engineer(src) @@ -141,6 +158,8 @@ new /obj/item/clothing/glasses/welding/superior(src) new /obj/item/clothing/glasses/meson/sunglasses(src) new /obj/item/clothing/gloves/color/yellow(src) + new /obj/item/clothing/head/helmet/space/plasmaman/engineering/ce(src) + new /obj/item/clothing/under/plasmaman/engineering/ce(src) /obj/item/storage/bag/garment/nanotrasen_representative name = "\improper Nanotrasen representative's garment bag" @@ -157,6 +176,8 @@ new /obj/item/clothing/glasses/hud/skills/sunglasses(src) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/gloves/color/white(src) + new /obj/item/clothing/head/helmet/space/plasmaman/white(src) + new /obj/item/clothing/under/plasmaman/enviroslacks(src) /obj/item/storage/bag/garment/magistrate name = "magistrate's garment bag" @@ -172,6 +193,8 @@ new /obj/item/clothing/shoes/centcom(src) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/gloves/color/white(src) + new /obj/item/clothing/head/helmet/space/plasmaman/white(src) + new /obj/item/clothing/under/plasmaman/enviroslacks(src) /obj/item/storage/bag/garment/blueshield name = "blueshield's garment bag" @@ -193,6 +216,8 @@ new /obj/item/clothing/glasses/hud/health/sunglasses(src) new /obj/item/clothing/glasses/hud/skills/sunglasses(src) new /obj/item/clothing/accessory/blue(src) + new /obj/item/clothing/head/helmet/space/plasmaman/blueshield(src) + new /obj/item/clothing/under/plasmaman/blueshield(src) /obj/item/storage/bag/garment/quartermaster name = "quartermaster's garment bag" @@ -207,12 +232,15 @@ new /obj/item/clothing/shoes/brown(src) new /obj/item/clothing/head/qm(src) new /obj/item/clothing/head/beret/qm(src) + new /obj/item/clothing/neck/cloak/quartermaster(src) new /obj/item/clothing/head/hardhat/orange(src) new /obj/item/clothing/suit/qmcoat(src) new /obj/item/clothing/suit/mantle/qm(src) new /obj/item/clothing/suit/storage/hazardvest/qm(src) new /obj/item/clothing/gloves/color/black(src) new /obj/item/tank/internals/emergency_oxygen/double(src) + new /obj/item/clothing/head/helmet/space/plasmaman/cargo(src) + new /obj/item/clothing/under/plasmaman/cargo(src) /obj/item/storage/bag/garment/warden name = "warden's garment bag" @@ -230,6 +258,8 @@ new /obj/item/clothing/under/rank/security/warden/skirt/corporate(src) new /obj/item/clothing/mask/gas/sechailer/warden(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) + new /obj/item/clothing/head/helmet/space/plasmaman/security/warden(src) + new /obj/item/clothing/under/plasmaman/security/warden(src) /obj/item/storage/bag/garment/detective name = "detective's garment bag" @@ -270,6 +300,8 @@ new /obj/item/clothing/gloves/ring/silver(src) new /obj/item/clothing/gloves/ring/gold(src) new /obj/item/clothing/gloves/ring/gold(src) + new /obj/item/clothing/head/helmet/space/plasmaman/chaplain(src) + new /obj/item/clothing/under/plasmaman/chaplain(src) /obj/item/storage/bag/garment/psychologist name = "psychologist's garment bag" @@ -285,6 +317,8 @@ new /obj/item/clothing/glasses/hud/health(src) new /obj/item/clothing/glasses/hud/skills(src) new /obj/item/clothing/accessory/blue(src) + new /obj/item/clothing/head/helmet/space/plasmaman(src) + new /obj/item/clothing/under/plasmaman(src) /obj/item/storage/bag/garment/paramedic name = "paramedic's garment bag" @@ -299,6 +333,8 @@ new /obj/item/clothing/gloves/color/latex(src) new /obj/item/clothing/gloves/color/latex/nitrile(src) new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/head/helmet/space/plasmaman/medical(src) + new /obj/item/clothing/under/plasmaman/medical(src) /obj/item/storage/bag/garment/explorer name = "explorer's garment bag" diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 498e169fc6ed2..5f1ffdb28ece7 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -124,12 +124,12 @@ /obj/item/bio_chip_implanter/storage, // 40TC /obj/item/encryptionkey/syndicate) // 10TC -/// 220TC +/// 200TC /obj/item/storage/box/syndie_kit/bundle/hacker name = "Hacker Bundle" desc = "A kit with everything you need to hack into and disrupt the Station, AI, its cyborgs and the Security team. HACK THE PLANET!" items = list( - /obj/item/melee/energy/sword/saber/blue, // 40TC + /obj/item/autosurgeon/organ/syndicate/oneuse/razorwire, // 20TC /obj/item/autosurgeon/organ/syndicate/oneuse/hackerman_deck, // 30TC /obj/item/door_remote/omni/access_tuner, // 30TC, HACK EVERYTHING /obj/item/encryptionkey/syndicate, // 10TC @@ -528,7 +528,7 @@ /obj/item/storage/box/syndie_kit/stechkin name = "\improper FK-69 Stechkin kit" - desc = "A box marked with Neo-Russkiyan characters. It appears to contain a 10mm pistol and two magazines." + desc = "A box marked with Neo-Russkiyan characters. It appears to contain a 10mm pistol and two magazines." // SS220 EDIT - Zvezhan -> Neo-Russkiya /obj/item/storage/box/syndie_kit/stechkin/populate_contents() new /obj/item/gun/projectile/automatic/pistol(src) @@ -570,3 +570,10 @@ /obj/item/storage/box/syndie_kit/decoy/populate_contents() for(var/i in 1 to 5) new /obj/item/grenade/firecracker/decoy(src) + +/obj/item/storage/box/syndie_kit/forgers_kit + name = "\improper Forger's kit" + +/obj/item/storage/box/syndie_kit/forgers_kit/populate_contents() + new /obj/item/stamp/chameleon(src) + new /obj/item/pen/chameleon(src) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index e8c0aed0cd82a..4fa12539ba087 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -29,7 +29,7 @@ cant_hold = list( /obj/item/screwdriver/power ) - slot_flags = SLOT_FLAG_ID + slot_flags = ITEM_SLOT_ID var/obj/item/card/id/front_id = null diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 2b0976e3af510..4358bd0f724fa 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -6,7 +6,7 @@ var/base_icon = "stunbaton" item_state = null belt_icon = "stunbaton" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 10 throwforce = 7 origin_tech = "combat=2" @@ -89,7 +89,7 @@ return cell /obj/item/melee/baton/mob_can_equip(mob/user, slot, disable_warning = TRUE) // disable the warning - if(turned_on && (slot == SLOT_HUD_BELT || slot == SLOT_HUD_SUIT_STORE)) + if(turned_on && (slot == ITEM_SLOT_BELT || slot == ITEM_SLOT_SUIT_STORE)) to_chat(user, "You can't equip [src] while it's active!") return FALSE return ..() @@ -313,7 +313,7 @@ knockdown_duration = 6 SECONDS w_class = WEIGHT_CLASS_BULKY hitcost = 2000 - slot_flags = SLOT_FLAG_BACK | SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 //Look, you can strap it to your back. You can strap it to your waist too. var/obj/item/assembly/igniter/sparkler = null @@ -334,6 +334,9 @@ desc = "A piece of scrap metal wired directly to your power cell." hitcost = 100 +/obj/item/melee/baton/loaded/borg_stun_arm/screwdriver_act(mob/living/user, obj/item/I) + return FALSE + /obj/item/melee/baton/flayerprod name = "stunprod" desc = "A mechanical mass which you can use to incapacitate someone with." diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index c635c7816a925..83eb5a4c03b71 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -103,7 +103,7 @@ /obj/item/tank/internals/plasmaman/belt icon_state = "plasmaman_tank_belt" item_state = "plasmaman_tank_belt" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 force = 5 volume = 35 @@ -131,7 +131,7 @@ desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it." icon_state = "emergency" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 w_class = WEIGHT_CLASS_SMALL force = 4 diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 0cb398e24c6e4..4b73b7f3342e7 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -2,7 +2,7 @@ name = "tank" icon = 'icons/obj/tank.dmi' flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK hitsound = 'sound/weapons/smash.ogg' w_class = WEIGHT_CLASS_NORMAL pressure_resistance = ONE_ATMOSPHERE * 5 diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 2fd912cf4501e..0c0a8c237d14b 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -6,7 +6,7 @@ icon_state = "waterbackpack" item_state = "waterbackpack" w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK slowdown = 1 actions_types = list(/datum/action/item_action/toggle_mister) max_integrity = 200 @@ -32,13 +32,13 @@ toggle_mister(user) /obj/item/watertank/item_action_slot_check(slot, mob/user) - if(slot == SLOT_HUD_BACK) + if(slot == ITEM_SLOT_BACK) return TRUE /obj/item/watertank/proc/toggle_mister(mob/user) if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user)) return - if(user.get_item_by_slot(SLOT_HUD_BACK) != src) + if(user.get_item_by_slot(ITEM_SLOT_BACK) != src) to_chat(user, "The watertank needs to be on your back to use.") return on = !on @@ -62,7 +62,7 @@ /obj/item/watertank/equipped(mob/user, slot) ..() - if(slot != SLOT_HUD_BACK) + if(slot != ITEM_SLOT_BACK) remove_noz() /obj/item/watertank/proc/remove_noz() diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index ab111432411cb..6390fe821df94 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -38,7 +38,7 @@ user.visible_message("[user] tapes [M]'s mouth shut!", "You cover [M == user ? "your own" : "[M]'s"] mouth with a piece of duct tape.[M == user ? null : " That will shut them up."]") var/obj/item/clothing/mask/muzzle/G = new /obj/item/clothing/mask/muzzle/tapegag - M.equip_to_slot(G, SLOT_HUD_WEAR_MASK) + M.equip_to_slot(G, ITEM_SLOT_MASK) G.add_fingerprint(user) /obj/item/stack/tape_roll/update_icon_state() diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 356f51d0459bc..0a011648fd3fc 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -14,7 +14,7 @@ throwforce = 15 sharp = TRUE w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK toolspeed = 0.25 attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") hitsound = 'sound/weapons/bladeslice.ogg' @@ -267,7 +267,7 @@ righthand_file = 'icons/mob/inhands/weapons_righthand.dmi' force = 10 w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK var/force_unwielded = 10 var/force_wielded = 18 throwforce = 20 @@ -579,7 +579,7 @@ icon_state = "singulohammer0" base_icon_state = "singulohammer" flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK force = 5 throwforce = 15 throw_range = 1 @@ -650,7 +650,7 @@ icon_state = "mjollnir0" base_icon_state = "mjollnir" flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK force = 5 throwforce = 30 throw_range = 7 @@ -699,7 +699,7 @@ icon_state = "knighthammer0" base_icon_state = "knighthammer" flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK force = 5 throwforce = 15 throw_range = 1 @@ -854,7 +854,7 @@ . += "It is missing a pyroclastic anomaly core." /obj/item/clothing/gloves/color/black/pyro_claws/item_action_slot_check(slot) - if(slot == SLOT_HUD_GLOVES) + if(slot == ITEM_SLOT_GLOVES) return TRUE /obj/item/clothing/gloves/color/black/pyro_claws/ui_action_click(mob/user) @@ -917,7 +917,7 @@ /obj/item/push_broom/Initialize(mapload) . = ..() - AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.25, _parryable_attack_types = ALL_ATTACK_TYPES, _parry_cooldown = (7 / 5) SECONDS, _requires_two_hands = TRUE) + AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.75, _parryable_attack_types = MELEE_ATTACK, _parry_cooldown = (7 / 3) SECONDS, _requires_two_hands = TRUE) AddComponent(/datum/component/two_handed, \ force_wielded = 12, \ force_unwielded = force, \ @@ -1058,7 +1058,7 @@ sharp = TRUE damtype = BURN w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK throwforce = 15 toolspeed = 0.25 attack_verb = list("enlightened", "enforced", "cleaved", "stabbed", "whacked") diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index b47ad6db64b7f..c0fbf6766a740 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -6,7 +6,7 @@ desc = "A banhammer." icon = 'icons/obj/toy.dmi' icon_state = "toyhammer" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_TINY throw_speed = 7 @@ -32,7 +32,7 @@ icon_state = "sord" lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons_righthand.dmi' - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 2 throwforce = 1 w_class = WEIGHT_CLASS_NORMAL @@ -54,7 +54,7 @@ item_state = "claymore" flags = CONDUCT hitsound = 'sound/weapons/bladeslice.ogg' - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 40 throwforce = 10 sharp = TRUE @@ -86,7 +86,7 @@ icon_state = "katana" item_state = "katana" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 //Look, you can strap it to your back. You can strap it to your waist too. force = 40 throwforce = 10 @@ -265,7 +265,7 @@ /obj/item/melee/baseball_bat/attack(mob/living/target, mob/living/user) if(deflectmode) - to_chat(user, "You cannot attack in deflect mode!") + to_chat(user, "You cannot attack in deflect mode!") return . = ..() if(homerun_ready) @@ -301,6 +301,10 @@ target.throw_at(throw_target, rand(1, 2), 7, user) next_throw_time = world.time + 10 SECONDS +/obj/item/melee/baseball_bat/dropped(mob/user, silent) + . = ..() + deflectmode = FALSE + /obj/item/melee/baseball_bat/ablative name = "metal baseball bat" desc = "This bat is made of highly reflective, highly armored material." diff --git a/code/game/objects/mail.dm b/code/game/objects/mail.dm index 680b69a7371c1..27ed8bbb4a943 100644 --- a/code/game/objects/mail.dm +++ b/code/game/objects/mail.dm @@ -239,7 +239,7 @@ lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL origin_tech = "magnets=1" /// The reference to the envelope that is currently stored in the mail scanner. It will be cleared upon confirming a correct delivery diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 9f86412101b68..3b6a8c876337b 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -8,7 +8,7 @@ var/climbable /// Determines if a structure adds the TRAIT_TURF_COVERED to its turf. var/creates_cover = FALSE - var/mob/living/climber + var/list/mob/living/climbers = list() var/broken = FALSE /// How long this takes to unbuckle yourself from. var/unbuckle_time = 0 SECONDS @@ -32,6 +32,7 @@ return ..() /obj/structure/Destroy() + climbers = null if(SSticker) GLOB.cameranet.updateVisibility(src) if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) @@ -58,7 +59,7 @@ if(..()) return TRUE if(C == user) - INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/structure, do_climb), user) + INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/structure, start_climb), user) return TRUE /obj/structure/proc/density_check() @@ -93,12 +94,27 @@ if(!can_touch(user) || !climbable) return FALSE - user.forceMove(get_turf(src)) - if(get_turf(user) == get_turf(src)) + return TRUE + +/obj/structure/proc/start_climb(mob/living/user) + climbers += user + RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(remove_climber)) // Just in case the climber is deleted before finishing + if(do_climb(user)) + user.forceMove(get_turf(src)) if(HAS_MIND_TRAIT(user, TRAIT_TABLE_LEAP)) user.visible_message("[user] leaps up onto [src]!") else user.visible_message("[user] climbs onto [src]!") + if(QDELETED(src)) // Table was destroyed while we were climbing it + return + climbers -= user + UnregisterSignal(user, COMSIG_PARENT_QDELETING) + +/obj/structure/proc/remove_climber(mob/living/climber) + SIGNAL_HANDLER // COMSIG_PARENT_QDELETING + + climbers -= climber + UnregisterSignal(climber, COMSIG_PARENT_QDELETING) /obj/structure/proc/structure_shaken() for(var/mob/living/M in get_turf(src)) diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 522fc7261de62..19aca13808141 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -9,7 +9,6 @@ LINEN BINS desc = "A surprisingly soft linen bedsheet." icon = 'icons/obj/bedsheet.dmi' icon_state = "sheet" - item_state = "bedsheet" lefthand_file = 'icons/mob/inhands/bedsheet_lefthand.dmi' righthand_file = 'icons/mob/inhands/bedsheet_righthand.dmi' layer = 4 @@ -19,7 +18,7 @@ LINEN BINS w_class = WEIGHT_CLASS_TINY item_color = "white" resistance_flags = FLAMMABLE - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_NECK dog_fashion = /datum/dog_fashion/head/ghost dyeing_key = DYE_REGISTRY_BEDSHEET diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 6973172c23ee8..12892b5bcffc7 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -44,7 +44,7 @@ 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. + /// 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 diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm index 087f4bc0f5d69..711d6d0a16a8e 100644 --- a/code/game/objects/structures/crates_lockers/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/walllocker.dm @@ -5,13 +5,13 @@ desc = "A wall mounted storage locker." name = "wall locker" icon = 'icons/obj/walllocker.dmi' - icon_state = "wall-locker" + icon_state = null door_anim_time = 0 enable_door_overlay = FALSE density = FALSE anchored = TRUE - icon_closed = "wall-locker" - icon_opened = "wall-lockeropen" + icon_closed = null + icon_opened = null /obj/structure/closet/walllocker/close() . = ..() diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm index 9b69c2d2b6481..53d720aa5fdb2 100644 --- a/code/game/objects/structures/fluff.dm +++ b/code/game/objects/structures/fluff.dm @@ -73,6 +73,7 @@ /obj/structure/fluff/divine name = "Miracle" icon = 'icons/obj/hand_of_god_structures.dmi' + icon_state = null anchored = TRUE density = TRUE diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index a66d1399334bd..81aa7972720c3 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -30,29 +30,6 @@ else . += "The anchoring screws are unscrewed. The rods look like they could be cut through." -/obj/structure/grille/fence - var/width = 3 - -/obj/structure/grille/fence/Initialize(mapload) - . = ..() - if(width > 1) - if(dir in list(EAST, WEST)) - bound_width = width * world.icon_size - bound_height = world.icon_size - else - bound_width = world.icon_size - bound_height = width * world.icon_size - -/obj/structure/grille/fence/east_west - //width=80 - //height=42 - icon='icons/fence-ew.dmi' - -/obj/structure/grille/fence/north_south - //width=80 - //height=42 - icon='icons/fence-ns.dmi' - /obj/structure/grille/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() update_icon(UPDATE_ICON_STATE) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index bebc1428a2542..79842217c312b 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -54,14 +54,6 @@ if(current_size >= STAGE_FOUR) deconstruct() -/obj/structure/lattice/clockwork - name = "cog lattice" - desc = "A lightweight support lattice. These hold the Justicar's station together." - icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi' - -/obj/structure/lattice/clockwork/Initialize(mapload) - . = ..() - /obj/structure/lattice/catwalk name = "catwalk" desc = "A catwalk for easier EVA maneuvering and cable placement." @@ -104,14 +96,3 @@ /obj/structure/lattice/lava/deconstruction_hints(mob/user) to_chat(user, "The supporting rods look like they could be cut., but the heat treatment will shatter off.") -/obj/structure/lattice/catwalk/clockwork - name = "clockwork catwalk" - icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi' - smoothing_flags = SMOOTH_CORNERS - smoothing_groups = null - -/obj/structure/lattice/catwalk/clockwork/Initialize(mapload) - . = ..() - if(!mapload) - new /obj/effect/temp_visual/ratvar/floor/catwalk(loc) - new /obj/effect/temp_visual/ratvar/beam/catwalk(loc) diff --git a/code/game/objects/structures/misc_structures.dm b/code/game/objects/structures/misc_structures.dm index cde1e0cb44fc7..a3d1f42cc9a56 100644 --- a/code/game/objects/structures/misc_structures.dm +++ b/code/game/objects/structures/misc_structures.dm @@ -131,12 +131,3 @@ if(last_ghost_alert + ghost_alert_delay < world.time) notify_ghosts("[src] active in [get_area(src)].", 'sound/effects/ghost2.ogg', title = alert_title, source = attack_atom, action = (attack_atom == src ? NOTIFY_JUMP : NOTIFY_ATTACK)) last_ghost_alert = world.time - -/obj/structure/boulder - name = "boulder" - desc = "A large rock." - icon = 'icons/obj/mining.dmi' - icon_state = "boulder1" - density = TRUE - opacity = TRUE - anchored = TRUE diff --git a/code/game/objects/structures/monster_spawner.dm b/code/game/objects/structures/monster_spawner.dm index 148651cb94044..2de2429d60321 100644 --- a/code/game/objects/structures/monster_spawner.dm +++ b/code/game/objects/structures/monster_spawner.dm @@ -1,7 +1,7 @@ /obj/structure/spawner name = "monster nest" icon = 'icons/mob/animal.dmi' - icon_state = "hole" + icon_state = null max_integrity = 100 move_resist = MOVE_FORCE_EXTREMELY_STRONG @@ -44,18 +44,6 @@ spawn_text = "climbs out of" faction = list("skeleton") -/obj/structure/spawner/clown - name = "Laughing Larry" - desc = "A laughing, jovial figure. Something seems stuck in his throat." - icon_state = "clownbeacon" - icon = 'icons/obj/device.dmi' - max_integrity = 200 - max_mobs = 15 - spawn_time = 150 - mob_types = list(/mob/living/simple_animal/hostile/retaliate/clown) - spawn_text = "climbs out of" - faction = list("clown") - /obj/structure/spawner/mining name = "monster den" desc = "A hole dug into the ground, harboring all kinds of monsters found within most caves or mining asteroids." diff --git a/code/game/objects/structures/plasma_geyser.dm b/code/game/objects/structures/plasma_geyser.dm index 381d4cc33064f..9642cb38def43 100644 --- a/code/game/objects/structures/plasma_geyser.dm +++ b/code/game/objects/structures/plasma_geyser.dm @@ -1,5 +1,5 @@ -/obj/structures/plasmageyser +/obj/structure/plasmageyser name = "Plasma Geyser" desc = "A mound of basalt rock, erupting with bubbling molten plasma. It constantly emits toxic fumes." anchored = TRUE @@ -8,22 +8,22 @@ resistance_flags = LAVA_PROOF | FIRE_PROOF armor = list(MELEE = 30, BULLET = 80, LASER = 90, ENERGY = 90, BOMB = 80, RAD = 100, FIRE = 100, ACID = 100) -/obj/structures/plasmageyser/Initialize(mapload) +/obj/structure/plasmageyser/Initialize(mapload) . = ..() START_PROCESSING(SSprocessing, src) // for sanity checks -/obj/structures/plasmageyser/Destroy() +/obj/structure/plasmageyser/Destroy() STOP_PROCESSING(SSprocessing, src) return ..() -/obj/structures/plasmageyser/process() +/obj/structure/plasmageyser/process() var/datum/milla_safe/plasmageyser/milla = new() milla.invoke_async(src) /datum/milla_safe/plasmageyser -/datum/milla_safe/plasmageyser/on_run(obj/structures/plasmageyser/geyser) +/datum/milla_safe/plasmageyser/on_run(obj/structure/plasmageyser/geyser) var/max_pressure = ONE_ATMOSPHERE * 3 var/toxins_modifier = 100 var/co2_modifier = 12 diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index 437fa7ddc6e44..4be0439ea3d3d 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -165,7 +165,7 @@ return TRUE return FALSE -/obj/structure/railing/do_climb(mob/living/user) +/obj/structure/railing/start_climb(mob/living/user) var/initial_mob_loc = get_turf(user) . = ..() if(.) diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 53aa311de8083..ff4636e30902a 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -342,14 +342,6 @@ desc = "A sign labelling a restroom." icon_state = "restroom" -/obj/structure/sign/medbay - name = "\improper MEDBAY" - desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here." - icon_state = "bluecross" - -/obj/structure/sign/medbay/alt - icon_state = "bluecross2" - /obj/structure/sign/directions name = "direction sign" diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 6556a100f30f3..22287c20f7bc6 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -103,15 +103,16 @@ new /obj/structure/table/wood(loc) qdel(src) -/obj/structure/table/do_climb(mob/living/user) +/obj/structure/table/start_climb(mob/living/user) . = ..() item_placed(user) /obj/structure/table/attack_hand(mob/living/user) ..() - if(climber) - climber.Weaken(4 SECONDS) - climber.visible_message("[climber.name] has been knocked off the table", "You've been knocked off the table", "You hear [climber.name] get knocked off the table") + if(length(climbers)) + for(var/mob/living/climber as anything in climbers) + climber.Weaken(4 SECONDS) + climber.visible_message("[climber.name] has been knocked off the table", "You've been knocked off the table", "You hear [climber.name] get knocked off the table") else if(Adjacent(user) && user.pulling && user.pulling.pass_flags & PASSTABLE) user.Move_Pulled(src) if(user.pulling.loc == loc) diff --git a/code/game/turfs/simulated/river.dm b/code/game/turfs/simulated/river.dm index 384f75a953fda..ef8c45d74f81a 100644 --- a/code/game/turfs/simulated/river.dm +++ b/code/game/turfs/simulated/river.dm @@ -107,7 +107,7 @@ GLOBAL_LIST_EMPTY(river_waypoint_presets) else var/turf/river_turf = cur_turf.ChangeTurf(river_turf_type, ignore_air = TRUE) if(prob(1)) - new /obj/effect/spawner/bridge(river_turf) + new /obj/effect/spawner/dynamic_bridge(river_turf) spread_turf(river_turf, spread_prob, spread_prob_loss, whitelist_area_type) for(var/WP in river_nodes) @@ -135,7 +135,7 @@ GLOBAL_LIST_EMPTY(river_waypoint_presets) if(!istype(T, start_turf.type) && T.ChangeTurf(start_turf.type, ignore_air = TRUE) && prob(probability)) spread_turf(T, probability - prob_loss, prob_loss, whitelisted_area) if(prob(1)) - new /obj/effect/spawner/bridge(T) + new /obj/effect/spawner/dynamic_bridge(T) for(var/F in diagonal_turfs) //diagonal turfs only sometimes change, but will always spread if changed var/turf/T = F @@ -144,7 +144,7 @@ GLOBAL_LIST_EMPTY(river_waypoint_presets) else if(istype(T, whitelist_turf_type) && !istype(T, start_turf.type)) T.ChangeTurf(shoreline_turf_type, ignore_air = TRUE) if(prob(1)) - new /obj/effect/spawner/bridge(T) + new /obj/effect/spawner/dynamic_bridge(T) #undef RIVER_MAX_X #undef RIVER_MAX_Y diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm index 7b07e15adf00c..9b8af3672dfff 100644 --- a/code/game/turfs/simulated/walls_indestructible.dm +++ b/code/game/turfs/simulated/walls_indestructible.dm @@ -300,3 +300,4 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen) smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SYNDICATE_WALLS) canSmoothWith = list(SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS) + diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index daf5e9724df6b..41a5820d5d72f 100644 --- a/code/game/turfs/simulated/walls_misc.dm +++ b/code/game/turfs/simulated/walls_misc.dm @@ -52,7 +52,6 @@ sheet_amount = 2 girder_type = /obj/structure/clockwork/wall_gear var/heated - var/obj/effect/clockwork/overlay/wall/realappearance smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BRASS_WALL) canSmoothWith = list(SMOOTH_GROUP_BRASS_WALL) @@ -60,12 +59,6 @@ . = ..() new /obj/effect/temp_visual/ratvar/wall(src) new /obj/effect/temp_visual/ratvar/beam(src) - realappearance = new /obj/effect/clockwork/overlay/wall(src) - realappearance.linked = src - -/turf/simulated/wall/clockwork/Destroy() - QDEL_NULL(realappearance) - return ..() /turf/simulated/wall/clockwork/bullet_act(obj/item/projectile/Proj) . = ..() diff --git a/code/goonstation/modules/power/power_transmission_laser/transmission_laser.dm b/code/goonstation/modules/power/power_transmission_laser/transmission_laser.dm new file mode 100644 index 0000000000000..87da43ef1ad6c --- /dev/null +++ b/code/goonstation/modules/power/power_transmission_laser/transmission_laser.dm @@ -0,0 +1,540 @@ +// Without these brackets division breaks. +#define MINIMUM_POWER (1 MW) +#define DEFAULT_CAPACITY (2000 GJ) +#define EYE_DAMAGE_THRESHOLD (5 MW) +#define RAD_THRESHOLD (30 MW) + +/obj/machinery/power/transmission_laser + name = "power transmission laser" + desc = "Sends power over a giant laser beam to an NT power processing facility." + + icon = 'icons/goonstation/objects/pt_laser.dmi' + icon_state = "ptl" + + max_integrity = 500 + + density = TRUE + anchored = TRUE + + pixel_x = 0 + pixel_y = -64 + + // Variables go below here + /// How far we shoot the beam. If it isn't blocked it should go to the end of the z level. + var/range = 0 + /// Amount of power we are outputting + var/output_level = 0 + /// The total capacity of the laser + var/capacity = DEFAULT_CAPACITY + /// Our current stored energy + var/charge = 0 + /// Are we trying to provide power to the laser + var/input_attempt = TRUE + /// Are we currently inputting power into the laser + var/inputting = TRUE + /// The amount of energy coming in from the inputs last tick + var/input_available = 0 + /// Have we been switched on? + var/turned_on = FALSE + /// Are we attempting to fire the laser currently? + var/firing = FALSE + /// We need to create a list of all lasers we are creating so we can delete them in the end + var/list/laser_effects = list() + /// Our max load we can set + var/max_grid_load = 0 + /// The load we place on the power grid we are connected to + var/current_grid_load = 0 + /// Signifies which unit we are using for output power. Used both in TGUI for formatting purposes and output power calculations. + var/power_format_multi = 1 + /// Signifies which unit we are using for input power. Used both in TGUI for formatting purposes and input power calculations. + var/power_format_multi_output = 1 MW + + /// Are we selling the energy or just sending it into the ether + var/selling_energy = FALSE + + /// How much energy have we sold in total (Joules) + var/total_energy = 0 + + /// How many credits we have earned in total + var/total_earnings = 0 + /// The amount of money we haven't sent yet + var/unsent_earnings = 0 + + /// Gives our power input when multiplied with power_format_multi. The multiplier signifies the units of power, and this is how many of them we are inputting. + var/input_number = 0 + /// Gives our power output when multiplied with power_format_multi_output. The multiplier signifies the units of power, and this is how many of them we are outputting. + var/output_number = 0 + /// Our set input pulling + var/input_pulling = 0 + /// Targetable areas in lavaland + var/list/targetable_areas = list( + /area/lavaland/surface/outdoors/outpost, + /area/lavaland/surface/outdoors/targetable, + /area/mine/outpost, + /area/shuttle/mining, + ) + /// Megafauna being targeted + var/mob/living/simple_animal/hostile/megafauna/target + /// Overlay that goes over the mob that gets beamed + var/image/orbital_strike + +/obj/machinery/power/transmission_laser/north + pixel_x = -64 + pixel_y = 0 + dir = NORTH + +/obj/machinery/power/transmission_laser/east + pixel_x = 0 + pixel_y = 0 + dir = EAST + +/obj/machinery/power/transmission_laser/west + pixel_x = -64 + pixel_y = 0 + dir = WEST + +/obj/item/circuitboard/machine/transmission_laser + board_name = "Power Transmission Laser" + icon_state = "command" + build_path = /obj/machinery/power/transmission_laser + origin_tech = "engineering=2;combat=3;" + req_components = list( + /obj/item/stock_parts/capacitor = 3, + /obj/item/stock_parts/micro_laser = 3, + ) + +/obj/machinery/power/transmission_laser/Initialize(mapload) + . = ..() + component_parts = list() + component_parts += new /obj/item/circuitboard/machine/transmission_laser + component_parts += new /obj/item/stock_parts/micro_laser + component_parts += new /obj/item/stock_parts/micro_laser + component_parts += new /obj/item/stock_parts/micro_laser + component_parts += new /obj/item/stock_parts/capacitor + component_parts += new /obj/item/stock_parts/capacitor + component_parts += new /obj/item/stock_parts/capacitor + range = get_dist(get_front_turf(), get_edge_target_turf(get_front_turf(), dir)) + if(!powernet) + connect_to_network() + handle_offset() + update_icon() + +/obj/machinery/power/transmission_laser/screwdriver_act(mob/living/user, obj/item/I) + if(firing) + to_chat(user,"Turn the laser off first.") + return + if(default_deconstruction_screwdriver(user, initial(icon_state), initial(icon_state), I)) + return TRUE + +/obj/machinery/power/transmission_laser/crowbar_act(mob/living/user, obj/item/I) + if(!panel_open) + return + if(default_deconstruction_crowbar(user, I)) + return TRUE + +/obj/machinery/power/transmission_laser/wrench_act(mob/living/user, obj/item/I) + if(!panel_open) + return + if(rotate()) + return TRUE + to_chat(user, "Target area blocked, please clear all objects and personnel.") + return TRUE + +/// Rotates the laser if we have the space to do so. +/obj/machinery/power/transmission_laser/proc/rotate() + var/new_dir = turn(dir, -90) + + var/x_offset = (new_dir == WEST) ? -2 : 2 + var/y_offset = (new_dir == SOUTH) ? -2 : 2 + var/datum/component/multitile/tiles = GetComponent(/datum/component/multitile) + // Make sure the area we want to rotate to has enough free tiles + for(var/turf/tile in block(x, y, z, x + x_offset, y + y_offset)) + if(tile?.density) + return FALSE + for(var/atom/thing as anything in tile.contents) + // If it's the machine or one of its multitile components fillers skip it + if(thing.UID() == UID() || (istype(thing, /obj/structure/filler/) && (thing in tiles.all_fillers))) + continue + if(thing?.density) + return FALSE + + dir = new_dir + handle_offset() + return TRUE + +/obj/machinery/power/transmission_laser/proc/handle_offset() + switch(dir) + if(NORTH) + pixel_x = -64 + pixel_y = 0 + AddComponent(/datum/component/multitile, list( + list(0, 1, 0, ), + list(1, 1, 1, ), + list(1, 1, MACH_CENTER), + )) + if(SOUTH) + pixel_x = 0 + pixel_y = -64 + AddComponent(/datum/component/multitile, list( + list(MACH_CENTER, 1, 1), + list(1, 1, 1), + list(0, 1, 0), + )) + if(WEST) + pixel_x = -64 + pixel_y = 0 + AddComponent(/datum/component/multitile, list( + list(0, 1, 1, ), + list(1, 1, 1, ), + list(0, 1, MACH_CENTER), + )) + if(EAST) + pixel_x = 0 + pixel_y = 0 + AddComponent(/datum/component/multitile, list( + list(1, 1, 0), + list(1, 1, 1), + list(MACH_CENTER, 1, 0), + )) + +/obj/machinery/power/transmission_laser/Destroy() + . = ..() + if(length(laser_effects)) + destroy_lasers() + +/obj/machinery/power/transmission_laser/proc/get_front_turf() + //this is weird as i believe byond sets the bottom left corner as the source corner like + // x-x-x + // x-x-x + // o-x-x + //which would mean finding the true front turf would require centering than taking a step in the primary direction + var/turf/center = locate(x + 1 + round(pixel_x / 32), y + 1 + round(pixel_y / 32), z) + return get_step(center, dir) + + + +/obj/machinery/power/transmission_laser/examine(mob/user) + . = ..() + . += "Laser currently has [unsent_earnings] unsent credits." + . += "Laser has generated [total_earnings] credits." + . += "Laser has sold [total_energy] Joules." + +/// Appearance changes are here +/obj/machinery/power/transmission_laser/update_overlays() + . = ..() + if((stat & BROKEN) || !charge) + . += "unpowered" + return + if(input_available > 0) + . += "green_light" + . += emissive_appearance(icon, "green_light", src) + if(turned_on) + . += "red_light" + . += emissive_appearance(icon, "red_light", src) + if(firing) + . +="firing" + . += emissive_appearance(icon, "firing", src) + + var/charge_level = return_charge() + if(charge_level == 6) + . += "charge_full" + . += emissive_appearance(icon, "charge_full", src) + else if(charge_level > 0) + . += "charge_[charge_level]" + . += emissive_appearance(icon, "charge_[charge_level]", src) + +/// Returns the charge level from [0 to 6] +/obj/machinery/power/transmission_laser/proc/return_charge() + if(!output_level) + return 0 + return min(round((charge / abs(output_level)) * 6), 6) + +/obj/machinery/power/transmission_laser/attack_hand(mob/user) + ui_interact(user) + +/obj/machinery/power/transmission_laser/attack_ghost(mob/user) + ui_interact(user) + +/obj/machinery/power/transmission_laser/ui_interact(mob/user, datum/tgui/ui) + . = ..() + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "goonstation_PTL") + ui.open() + ui.set_autoupdate(TRUE) + +/obj/machinery/power/transmission_laser/ui_data(mob/user) + . = ..() + var/list/data = list() + + data["output"] = output_level + data["total_earnings"] = total_earnings + data["unsent_earnings"] = unsent_earnings + data["total_energy"] = total_energy + data["held_power"] = charge + data["selling_energy"] = selling_energy + data["max_capacity"] = capacity + data["max_grid_load"] = max_grid_load + + data["accepting_power"] = turned_on + data["sucking_power"] = inputting + data["firing"] = firing + data["target"] = target ? target.internal_gps.gpstag : "" + + data["power_format"] = power_format_multi + data["input_number"] = input_number + data["avalible_input"] = input_available + data["output_number"] = output_number + data["output_multiplier"] = power_format_multi_output + data["input_total"] = input_number * power_format_multi + data["output_total"] = output_number * power_format_multi_output + + return data + +/obj/machinery/power/transmission_laser/ui_act(action, list/params) + . = ..() + if(.) + return + switch(action) + if("toggle_input") + turned_on = !turned_on + update_icon() + if("toggle_output") + firing = !firing + if(!firing) + destroy_lasers() + else + setup_lasers() + update_icon() + if("target") + target(usr) + + if("set_input") + input_number = clamp(params["set_input"], 0, 999) //multiplies our input by if input + if("set_output") + output_number = clamp(params["set_output"], 0, 999) + + if("inputW") + power_format_multi = 1 + if("inputKW") + power_format_multi = 1 KW + if("inputMW") + power_format_multi = 1 MW + if("inputGW") + power_format_multi = 1 GW + + if("outputW") + power_format_multi_output = 1 + if("outputKW") + power_format_multi_output = 1 KW + if("outputMW") + power_format_multi_output = 1 MW + if("outputGW") + power_format_multi_output = 1 GW + +/// Target a megafauna in the mining base or its immediate vicinity +/obj/machinery/power/transmission_laser/proc/target(mob/user) + var/list/target_list = list() + for(var/monster_id in GLOB.alive_megafauna_list) + var/mob/living/simple_animal/hostile/megafauna/monster = locateUID(monster_id) + var/area/boss_loc = get_area(monster) + for(var/area_type in targetable_areas) + if(istype(boss_loc, area_type)) + target_list[monster.internal_gps.gpstag] = monster + // Target CC to sell power + target_list["Collection Terminal"] = null + + var/choose = tgui_input_list(user, "Select target", "Target", target_list) + if(!choose) + return + target = target_list[choose] + RegisterSignal(target, COMSIG_MOB_DEATH, PROC_REF(untarget)) + if(firing && target) + orbital_strike = image(target.icon, target, "orbital_strike", FLY_LAYER, SOUTH) + target.add_overlay(orbital_strike) + +/// Stop targeting a mob once it dies +/obj/machinery/power/transmission_laser/proc/untarget() + SIGNAL_HANDLER + target.cut_overlay(orbital_strike) + UnregisterSignal(target, COMSIG_MOB_DEATH) + target = null + +/obj/machinery/power/transmission_laser/process() + max_grid_load = get_surplus() + input_available = get_surplus() + if(stat & BROKEN) + return + + var/last_disp = return_charge() + var/last_chrg = inputting + var/last_fire = firing + + if(last_disp != return_charge() || last_chrg != inputting || last_fire != firing) + update_icon() + + if(powernet && input_attempt && turned_on) + input_pulling = min(input_available, input_number * power_format_multi, capacity - charge ) + + if(inputting) + if(input_pulling > 0) + consume_direct_power(input_pulling) + charge += input_pulling + else + inputting = FALSE + else + if(input_attempt && input_pulling > 0) + inputting = TRUE + else + inputting = FALSE + + if(charge < MINIMUM_POWER) + firing = FALSE + output_level = 0 + destroy_lasers() + return + + if(!firing) + return + + output_level = min(charge, output_number * power_format_multi_output) + + if(firing) + if(!target) + sell_power(output_level * WATT_TICK_TO_JOULE) + else + if(!QDELETED(target)) // Just for safety. + target.loot = list() // disable loot drops form the target to prevent cheese + if(10 * output_level * target.damage_coeff[BURN] / (1 MW) > target.health) // If we would kill the target dust it. + target.health = 0 // We need this so can_die() won't prevent dusting + visible_message("\The [src] is reduced to dust by the beam!") + target.dust() + else + target.adjustFireLoss(10 * output_level / (1 MW)) + else + target = null + if(output_level > EYE_DAMAGE_THRESHOLD) + for(var/mob/living/carbon/someone in oview(min(output_level / EYE_DAMAGE_THRESHOLD, 8), get_front_turf()))// Flash targets that can see the exit of the emitter + var/turf/front = get_front_turf() + var/turf/step = get_step(get_front_turf(), dir) + var/d_x = someone.x - front.x + var/d_y = someone.y - front.y + if(someone.dir == dir || (((dir == NORTH || dir == SOUTH) && (SIGN(d_y) != SIGN(step.y - front.y)))) || ((dir == WEST || dir == EAST) && (SIGN(d_x) != SIGN(step.x - front.x))))// Make sure they are in front of it + continue + var/look_angle + var/angle_to_bore = arctan(-d_x, -d_y) + switch(someone.dir) + if(NORTH) + look_angle = 90 + if(SOUTH) + look_angle = -90 + if(EAST) + look_angle = 0 + if(WEST) + look_angle = 180 + // Takes the cosine of the difference in angle between where the mob is looking and the location of the bore in relation to the mob. + var/flashmod = max(cos(look_angle - angle_to_bore), 0) + someone.flash_eyes(min(round(output_level/ EYE_DAMAGE_THRESHOLD), 3) * flashmod, TRUE, TRUE) + if(output_level > RAD_THRESHOLD) // Starts causing weak, quickly dissipating radiation pulses around the bore when power is high enough + radiation_pulse(get_front_turf(), (output_level / RAD_THRESHOLD) * 50, RAD_DISTANCE_COEFFICIENT) + + + charge -= output_level + +//// Selling defines are here +// Minimum amount of money per cycle +#define MINIMUM_BAR 0 +// Maximum amount of money per cycle - minimum amount of money per cycle +#define PROCESS_CAP (6 - MINIMUM_BAR) + +// Higher number means approaching the limit slower +#define A1_CURVE 20 + +#define HIGH_CUT_RATIO 0.75 +#define MEDIUM_CUT_RATIO 0.25 + +/obj/machinery/power/transmission_laser/proc/sell_power(joules) + var/mega_joules = joules / (1 MW) + SSticker.score.score_gigajoules_exported += joules / (1 GW) + + var/generated_cash = (2 * mega_joules * PROCESS_CAP) / ((2 * mega_joules) + (PROCESS_CAP * A1_CURVE)) + if(mega_joules) // so we can't divide by 0 + generated_cash += (4 * mega_joules * MINIMUM_BAR) / (4 * mega_joules + MINIMUM_BAR) + if(generated_cash < 0) + return + + total_energy += joules + total_earnings += generated_cash + unsent_earnings += generated_cash + + var/datum/money_account/engineering_bank_account = GLOB.station_money_database.get_account_by_department(DEPARTMENT_ENGINEERING) + var/datum/money_account/cargo_bank_account = GLOB.station_money_database.get_account_by_department(DEPARTMENT_SUPPLY) + + if(unsent_earnings > 200) + var/medium_cut = round(unsent_earnings * MEDIUM_CUT_RATIO) + var/high_cut = round(unsent_earnings * HIGH_CUT_RATIO) + + GLOB.station_money_database.credit_account(cargo_bank_account, medium_cut, "Transmission Laser Payout", "Central Command Supply Master", supress_log = FALSE) + unsent_earnings -= medium_cut + + GLOB.station_money_database.credit_account(engineering_bank_account, high_cut, "Transmission Laser Payout", "Central Command Supply Master", supress_log = FALSE) + unsent_earnings -= high_cut + +#undef A1_CURVE +#undef PROCESS_CAP +#undef MINIMUM_BAR +#undef HIGH_CUT_RATIO +#undef MEDIUM_CUT_RATIO + +// Beam related procs + +/obj/machinery/power/transmission_laser/proc/setup_lasers() + if(target) + orbital_strike = image(target.icon, target, "orbital_strike", FLY_LAYER, SOUTH) + target.add_overlay(orbital_strike) + var/turf/last_step = get_step(get_front_turf(), dir) + for(var/num in 1 to range) + if(!(locate(/obj/effect/transmission_beam) in last_step)) + var/obj/effect/transmission_beam/new_beam = new(last_step, src) + new_beam.host = src + new_beam.dir = dir + laser_effects += new_beam + + last_step = get_step(last_step, dir) + +/obj/machinery/power/transmission_laser/proc/destroy_lasers() + if(target) + target.cut_overlay(orbital_strike) + for(var/obj/effect/transmission_beam/listed_beam as anything in laser_effects) + laser_effects -= listed_beam + qdel(listed_beam) + +// Beam +/obj/effect/transmission_beam + name = "Shimmering beam" + icon = 'icons/goonstation/effects/pt_beam.dmi' + icon_state = "ptl_beam" + anchored = TRUE + + /// Used to deal with atoms stepping on us while firing + var/obj/machinery/power/transmission_laser/host + +/obj/effect/transmission_beam/Initialize(mapload, obj/machinery/power/transmission_laser/creator) + . = ..() + update_appearance() + +/obj/effect/transmission_beam/Destroy(force) + . = ..() + +/obj/effect/transmission_beam/update_overlays() + . = ..() + . += emissive_appearance(icon, "ptl_beam", src) + +/// Explosions aren't supposed to make holes in a beam. +/obj/effect/transmission_beam/ex_act(severity) + return + +#undef MINIMUM_POWER +#undef DEFAULT_CAPACITY +#undef EYE_DAMAGE_THRESHOLD +#undef RAD_THRESHOLD diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 49227530e4a4b..8a035563f526a 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1178,8 +1178,8 @@ M.loc = prison_cell if(ishuman(M)) var/mob/living/carbon/human/prisoner = M - prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), SLOT_HUD_JUMPSUIT) - prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), SLOT_HUD_SHOES) + prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), ITEM_SLOT_JUMPSUIT) + prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), ITEM_SLOT_SHOES) to_chat(M, "You have been sent to the prison station!") log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") @@ -1399,8 +1399,8 @@ if(ishuman(M)) var/mob/living/carbon/human/observer = M - observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit(observer), SLOT_HUD_JUMPSUIT) - observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(observer), SLOT_HUD_SHOES) + observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit(observer), ITEM_SLOT_JUMPSUIT) + observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(observer), ITEM_SLOT_SHOES) if(isliving(M)) var/mob/living/L = M L.Paralyse(10 SECONDS) @@ -1812,9 +1812,9 @@ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return - H.equip_to_slot_or_del( new /obj/item/food/cookie(H), SLOT_HUD_LEFT_HAND ) + H.equip_to_slot_or_del( new /obj/item/food/cookie(H), ITEM_SLOT_LEFT_HAND ) if(!(istype(H.l_hand,/obj/item/food/cookie))) - H.equip_to_slot_or_del( new /obj/item/food/cookie(H), SLOT_HUD_RIGHT_HAND ) + H.equip_to_slot_or_del( new /obj/item/food/cookie(H), ITEM_SLOT_RIGHT_HAND ) if(!(istype(H.r_hand,/obj/item/food/cookie))) log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].") message_admins("[key_name_admin(H)] has [H.p_their()] hands full, so [H.p_they()] did not receive [H.p_their()] cookie, spawned by [key_name_admin(src.owner)].") @@ -2153,7 +2153,7 @@ evilcookie.bitesize = 100 evilcookie.flags = NODROP | DROPDEL H.drop_l_hand() - H.equip_to_slot_or_del(evilcookie, SLOT_HUD_LEFT_HAND) + H.equip_to_slot_or_del(evilcookie, ITEM_SLOT_LEFT_HAND) logmsg = "a mutagen cookie." if("Hellwater Cookie") var/obj/item/food/cookie/evilcookie = new /obj/item/food/cookie @@ -2162,7 +2162,7 @@ evilcookie.bitesize = 100 evilcookie.flags = NODROP | DROPDEL H.drop_l_hand() - H.equip_to_slot_or_del(evilcookie, SLOT_HUD_LEFT_HAND) + H.equip_to_slot_or_del(evilcookie, ITEM_SLOT_LEFT_HAND) logmsg = "a hellwater cookie." if("Hunter") ADD_TRAIT(H, TRAIT_BADDNA, "smiting") @@ -2211,7 +2211,7 @@ if(H.head) H.unEquip(H.head, TRUE) var/obj/item/clothing/head/sombrero/shamebrero/S = new(H.loc) - H.equip_to_slot_or_del(S, SLOT_HUD_HEAD) + H.equip_to_slot_or_del(S, ITEM_SLOT_HEAD) logmsg = "shamebrero" if("Nugget") H.Weaken(12 SECONDS, TRUE) @@ -2969,8 +2969,8 @@ W.plane = initial(W.plane) //teleport person to cell H.loc = pick(GLOB.prisonwarp) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(H), SLOT_HUD_JUMPSUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), SLOT_HUD_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(H), ITEM_SLOT_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), ITEM_SLOT_SHOES) else //teleport security person H.loc = pick(GLOB.prisonsecuritywarp) @@ -3572,7 +3572,7 @@ dust_if_respawnable(C) hunter_mob.equipOutfit(O, FALSE) var/obj/item/pinpointer/advpinpointer/N = new /obj/item/pinpointer/advpinpointer(hunter_mob) - hunter_mob.equip_to_slot_or_del(N, SLOT_HUD_IN_BACKPACK) + hunter_mob.equip_to_slot_or_del(N, ITEM_SLOT_IN_BACKPACK) N.mode = 3 //MODE_ADV, not defined here N.setting = 2 //SETTING_OBJECT, not defined here N.target = H diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index ca1415d99c615..35a3bc4f8d43c 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -477,7 +477,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) id.registered_name = H.real_name id.assignment = "Captain" id.name = "[id.registered_name]'s ID Card ([id.assignment])" - H.equip_to_slot_or_del(id, SLOT_HUD_WEAR_ID) + H.equip_to_slot_or_del(id, ITEM_SLOT_ID) H.update_inv_wear_id() else alert("Invalid mob") @@ -740,7 +740,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) if(!F.active) F.active = TRUE F.state = 2 - F.power = 250 + F.energy = 125 F.anchored = TRUE F.warming_up = 3 F.start_fields() diff --git a/code/modules/admin/verbs/infiltratorteam_syndicate.dm b/code/modules/admin/verbs/infiltratorteam_syndicate.dm index e0d12efd6d22c..7abd5b1b20bbf 100644 --- a/code/modules/admin/verbs/infiltratorteam_syndicate.dm +++ b/code/modules/admin/verbs/infiltratorteam_syndicate.dm @@ -141,16 +141,16 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0) /mob/living/carbon/human/proc/equip_syndicate_infiltrator(syndicate_leader_selected = 0, num_tc, flag_mgmt) // Storage items - equip_to_slot_or_del(new /obj/item/storage/backpack(src), SLOT_HUD_BACK) - equip_to_slot_or_del(new /obj/item/storage/box/survival(src), SLOT_HUD_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/clothing/under/chameleon(src), SLOT_HUD_JUMPSUIT) + equip_to_slot_or_del(new /obj/item/storage/backpack(src), ITEM_SLOT_BACK) + equip_to_slot_or_del(new /obj/item/storage/box/survival(src), ITEM_SLOT_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/clothing/under/chameleon(src), ITEM_SLOT_JUMPSUIT) if(!flag_mgmt) - equip_to_slot_or_del(new /obj/item/flashlight(src), SLOT_HUD_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/storage/belt/utility/full/multitool(src), SLOT_HUD_BELT) + equip_to_slot_or_del(new /obj/item/flashlight(src), ITEM_SLOT_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/storage/belt/utility/full/multitool(src), ITEM_SLOT_BELT) var/obj/item/clothing/gloves/combat/G = new /obj/item/clothing/gloves/combat(src) G.name = "black gloves" - equip_to_slot_or_del(G, SLOT_HUD_GLOVES) + equip_to_slot_or_del(G, ITEM_SLOT_GLOVES) // Implants: // Uplink @@ -167,11 +167,11 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0) // Radio & PDA var/obj/item/radio/R = new /obj/item/radio/headset/syndicate/syndteam(src) R.set_frequency(SYNDTEAM_FREQ) - equip_to_slot_or_del(R, SLOT_HUD_LEFT_EAR) - equip_or_collect(new /obj/item/pda(src), SLOT_HUD_IN_BACKPACK) + equip_to_slot_or_del(R, ITEM_SLOT_LEFT_EAR) + equip_or_collect(new /obj/item/pda(src), ITEM_SLOT_IN_BACKPACK) // Other gear - equip_to_slot_or_del(new /obj/item/clothing/shoes/chameleon/noslip(src), SLOT_HUD_SHOES) + equip_to_slot_or_del(new /obj/item/clothing/shoes/chameleon/noslip(src), ITEM_SLOT_SHOES) var/obj/item/card/id/syndicate/W = new(src) if(flag_mgmt) @@ -191,6 +191,6 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0) W.access += get_syndicate_access("Syndicate Operative") W.name = "[real_name]'s ID Card ([W.assignment])" W.registered_name = real_name - equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + equip_to_slot_or_del(W, ITEM_SLOT_ID) return 1 diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index 3c921066da3e8..ce39aea36f8e9 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -30,12 +30,12 @@ continue qdel(I) - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt(H), SLOT_HUD_JUMPSUIT) - H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), SLOT_HUD_LEFT_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), SLOT_HUD_HEAD) - H.equip_to_slot_or_del(new /obj/item/claymore/highlander(H), SLOT_HUD_RIGHT_HAND) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/pinpointer(H.loc), SLOT_HUD_LEFT_STORE) + H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt(H), ITEM_SLOT_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), ITEM_SLOT_LEFT_EAR) + H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), ITEM_SLOT_HEAD) + H.equip_to_slot_or_del(new /obj/item/claymore/highlander(H), ITEM_SLOT_RIGHT_HAND) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), ITEM_SLOT_SHOES) + H.equip_to_slot_or_del(new /obj/item/pinpointer(H.loc), ITEM_SLOT_LEFT_POCKET) var/obj/item/card/id/W = new(H) W.name = "[H.real_name]'s ID Card" @@ -44,7 +44,7 @@ W.access += get_all_centcom_access() W.assignment = "Highlander" W.registered_name = H.real_name - H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + H.equip_to_slot_or_del(W, ITEM_SLOT_ID) H.dna.species.after_equip_job(null, H) H.regenerate_icons() @@ -79,13 +79,13 @@ messages.Add(H.mind.prepare_announce_objectives(FALSE)) to_chat(H, chat_box_red(messages.Join("
"))) - var/obj/item/slot_item_ID = H.get_item_by_slot(SLOT_HUD_WEAR_ID) + var/obj/item/slot_item_ID = H.get_item_by_slot(ITEM_SLOT_ID) qdel(slot_item_ID) - var/obj/item/slot_item_hand = H.get_item_by_slot(SLOT_HUD_RIGHT_HAND) + var/obj/item/slot_item_hand = H.get_item_by_slot(ITEM_SLOT_RIGHT_HAND) H.unEquip(slot_item_hand) var/obj/item/multisword/pure_evil/multi = new(H) - H.equip_to_slot_or_del(multi, SLOT_HUD_RIGHT_HAND) + H.equip_to_slot_or_del(multi, ITEM_SLOT_RIGHT_HAND) var/obj/item/card/id/W = new(H) W.icon_state = "centcom" @@ -94,7 +94,7 @@ W.assignment = "Multiverse Summoner" W.registered_name = H.real_name W.update_label(H.real_name) - H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + H.equip_to_slot_or_del(W, ITEM_SLOT_ID) H.update_icons() diff --git a/code/modules/admin/verbs/onlyoneteam.dm b/code/modules/admin/verbs/onlyoneteam.dm index 80ca1f922ad20..6301cfb14779f 100644 --- a/code/modules/admin/verbs/onlyoneteam.dm +++ b/code/modules/admin/verbs/onlyoneteam.dm @@ -23,14 +23,14 @@ to_chat(H, "You are part of the [station_name()] dodgeball tournament. Throw dodgeballs at crewmembers wearing a different color than you. OOC: Use THROW on an EMPTY-HAND to catch thrown dodgeballs.") - H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), SLOT_HUD_LEFT_EAR) - H.equip_to_slot_or_del(new /obj/item/beach_ball/dodgeball_team(H), SLOT_HUD_RIGHT_HAND) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), SLOT_HUD_SHOES) + H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), ITEM_SLOT_LEFT_EAR) + H.equip_to_slot_or_del(new /obj/item/beach_ball/dodgeball_team(H), ITEM_SLOT_RIGHT_HAND) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), ITEM_SLOT_SHOES) if(!team_toggle) GLOB.team_alpha += H - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/red/dodgeball(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/red/dodgeball(H), ITEM_SLOT_JUMPSUIT) var/obj/item/card/id/W = new(H) W.name = "[H.real_name]'s ID Card" W.icon_state = "centcom" @@ -38,12 +38,12 @@ W.access += get_all_centcom_access() W.assignment = "Professional Pee-Wee League Dodgeball Player" W.registered_name = H.real_name - H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + H.equip_to_slot_or_del(W, ITEM_SLOT_ID) else GLOB.team_bravo += H - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/blue/dodgeball(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/blue/dodgeball(H), ITEM_SLOT_JUMPSUIT) var/obj/item/card/id/W = new(H) W.name = "[H.real_name]'s ID Card" W.icon_state = "centcom" @@ -51,7 +51,7 @@ W.access += get_all_centcom_access() W.assignment = "Professional Pee-Wee League Dodgeball Player" W.registered_name = H.real_name - H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + H.equip_to_slot_or_del(W, ITEM_SLOT_ID) team_toggle = !team_toggle H.dna.species.after_equip_job(null, H) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index ea21b3d9b3198..d63a217f4ec34 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -37,8 +37,8 @@ M.loc = pick(GLOB.prisonwarp) if(ishuman(M)) var/mob/living/carbon/human/prisoner = M - prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), SLOT_HUD_JUMPSUIT) - prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), SLOT_HUD_SHOES) + prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), ITEM_SLOT_JUMPSUIT) + prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), ITEM_SLOT_SHOES) spawn(50) to_chat(M, "You have been sent to the prison station!") log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm index 692001b720735..0bee77e086a32 100644 --- a/code/modules/admin/verbs/striketeam_syndicate.dm +++ b/code/modules/admin/verbs/striketeam_syndicate.dm @@ -124,36 +124,36 @@ GLOBAL_VAR_INIT(sent_syndicate_strike_team, 0) /mob/living/carbon/human/proc/equip_syndicate_commando(is_leader = FALSE, full_gear = FALSE) var/obj/item/radio/R = new /obj/item/radio/headset/syndicate/alt/syndteam(src) R.set_frequency(SYNDTEAM_FREQ) - equip_to_slot_or_del(R, SLOT_HUD_LEFT_EAR) - equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(src), SLOT_HUD_JUMPSUIT) + equip_to_slot_or_del(R, ITEM_SLOT_LEFT_EAR) + equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(src), ITEM_SLOT_JUMPSUIT) if(!full_gear) - equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(src), SLOT_HUD_SHOES) - equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(src), SLOT_HUD_GLOVES) + equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(src), ITEM_SLOT_SHOES) + equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(src), ITEM_SLOT_GLOVES) - equip_to_slot_or_del(new /obj/item/storage/backpack/security(src), SLOT_HUD_BACK) - equip_to_slot_or_del(new /obj/item/storage/box/survival_syndi(src), SLOT_HUD_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/storage/backpack/security(src), ITEM_SLOT_BACK) + equip_to_slot_or_del(new /obj/item/storage/box/survival_syndi(src), ITEM_SLOT_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/gun/projectile/revolver(src), SLOT_HUD_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/ammo_box/a357(src), SLOT_HUD_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/combat/nanites(src), SLOT_HUD_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/grenade/plastic/c4/x4(src), SLOT_HUD_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/gun/projectile/revolver(src), ITEM_SLOT_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/ammo_box/a357(src), ITEM_SLOT_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/combat/nanites(src), ITEM_SLOT_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/grenade/plastic/c4/x4(src), ITEM_SLOT_IN_BACKPACK) if(is_leader) - equip_to_slot_or_del(new /obj/item/pinpointer(src), SLOT_HUD_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/disk/nuclear/unrestricted(src), SLOT_HUD_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/pinpointer(src), ITEM_SLOT_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/disk/nuclear/unrestricted(src), ITEM_SLOT_IN_BACKPACK) else - equip_to_slot_or_del(new /obj/item/grenade/plastic/c4/x4(src), SLOT_HUD_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/card/emag(src), SLOT_HUD_RIGHT_STORE) - equip_to_slot_or_del(new /obj/item/melee/energy/sword/saber/red(src), SLOT_HUD_LEFT_STORE) + equip_to_slot_or_del(new /obj/item/grenade/plastic/c4/x4(src), ITEM_SLOT_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/card/emag(src), ITEM_SLOT_RIGHT_POCKET) + equip_to_slot_or_del(new /obj/item/melee/energy/sword/saber/red(src), ITEM_SLOT_LEFT_POCKET) if(full_gear) - equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(src), SLOT_HUD_WEAR_MASK) - equip_to_slot_or_del(new /obj/item/clothing/suit/space/hardsuit/syndi/elite/sst(src), SLOT_HUD_OUTER_SUIT) - equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), SLOT_HUD_GLASSES) - equip_to_slot_or_del(new /obj/item/storage/belt/military/sst(src), SLOT_HUD_BELT) - equip_to_slot_or_del(new /obj/item/tank/internals/oxygen/red(src), SLOT_HUD_SUIT_STORE) - equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/elite(src), SLOT_HUD_SHOES) - equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/l6_saw(src), SLOT_HUD_RIGHT_HAND) - equip_to_slot_or_del(new /obj/item/ammo_box/magazine/mm556x45(src), SLOT_HUD_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(src), ITEM_SLOT_MASK) + equip_to_slot_or_del(new /obj/item/clothing/suit/space/hardsuit/syndi/elite/sst(src), ITEM_SLOT_OUTER_SUIT) + equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), ITEM_SLOT_EYES) + equip_to_slot_or_del(new /obj/item/storage/belt/military/sst(src), ITEM_SLOT_BELT) + equip_to_slot_or_del(new /obj/item/tank/internals/oxygen/red(src), ITEM_SLOT_SUIT_STORE) + equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/elite(src), ITEM_SLOT_SHOES) + equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/l6_saw(src), ITEM_SLOT_RIGHT_HAND) + equip_to_slot_or_del(new /obj/item/ammo_box/magazine/mm556x45(src), ITEM_SLOT_IN_BACKPACK) var/obj/item/bio_chip/dust/D = new /obj/item/bio_chip/dust(src) D.implant(src) @@ -163,7 +163,7 @@ GLOBAL_VAR_INIT(sent_syndicate_strike_team, 0) W.assignment = "Syndicate Commando" W.access += get_syndicate_access(W.assignment) W.registered_name = real_name - equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + equip_to_slot_or_del(W, ITEM_SLOT_ID) return 1 diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 8c156e9e34435..30fb8dd2923ce 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -22,7 +22,7 @@ GLOBAL_LIST_EMPTY(antagonists) /// Should we replace the role-banned player with a ghost? var/replace_banned = TRUE /// List of objectives connected to this datum. - var/datum/objective_holder/objective_holder + VAR_PRIVATE/datum/objective_holder/objective_holder /// Antagonist datum specific information that appears in the player's notes. Information stored here will be removed when the datum is removed from the player. var/antag_memory /// The special role that will be applied to the owner's `special_role` var. i.e. `SPECIAL_ROLE_TRAITOR`, `SPECIAL_ROLE_VAMPIRE`. @@ -45,10 +45,6 @@ GLOBAL_LIST_EMPTY(antagonists) var/wiki_page_name /// The organization, if any, this antag is associated with var/datum/antag_org/organization - /// If set to TRUE, the antag will be notified they are targeted by another antagonist this round. - var/targeted_by_antag = FALSE - /// The message displayed to the antag if targeted_by_antag is set to TRUE - var/targeted_by_antag_message = "You can't shake the feeling someone's been stalking you. You might be an assassin's next target." //Blurb stuff /// Intro Blurbs text colour @@ -287,22 +283,22 @@ GLOBAL_LIST_EMPTY(antagonists) */ /datum/antagonist/proc/has_antag_objectives(include_team = TRUE) . = FALSE - if(include_team) + . |= objective_holder.has_objectives() + if(!. && include_team) var/datum/team/team = get_team() if(istype(team)) . |= team.objective_holder.has_objectives() - . |= objective_holder.has_objectives() /** * Get all of this antagonist's objectives, including from the team. */ /datum/antagonist/proc/get_antag_objectives(include_team = TRUE) . = list() + . |= objective_holder.get_objectives() if(include_team) var/datum/team/team = get_team() if(istype(team)) . |= team.objective_holder.get_objectives() - . |= objective_holder.get_objectives() /** * Proc called when the datum is given to a mind. diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index 51648d3904499..c6793185540cd 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -104,7 +104,7 @@ /obj/item/antag_spawner/nuke_ops/borg_tele/assault/Initialize(mapload) . = ..() - poll_icon = image(icon = 'icons/mob/robots.dmi', icon_state = "syndie-bloodhound-preview") + poll_icon = image(icon = 'icons/mob/robots.dmi', icon_state = "spidersyndi-preview") /obj/item/antag_spawner/nuke_ops/borg_tele/medical name = "syndicate medical teleporter" diff --git a/code/modules/antagonists/changeling/powers/biodegrade.dm b/code/modules/antagonists/changeling/powers/biodegrade.dm index 9d037689bbe1b..7a94fbf46e467 100644 --- a/code/modules/antagonists/changeling/powers/biodegrade.dm +++ b/code/modules/antagonists/changeling/powers/biodegrade.dm @@ -17,7 +17,7 @@ var/used = FALSE // only one form of shackles removed per use if(user.handcuffed) - var/obj/O = user.get_item_by_slot(SLOT_HUD_HANDCUFFED) + var/obj/O = user.get_item_by_slot(ITEM_SLOT_HANDCUFFED) if(!istype(O)) return FALSE user.visible_message("[user] vomits a glob of acid on [user.p_their()] [O.name]!", \ @@ -26,7 +26,7 @@ used = TRUE if(user.legcuffed) - var/obj/O = user.get_item_by_slot(SLOT_HUD_LEGCUFFED) + var/obj/O = user.get_item_by_slot(ITEM_SLOT_LEGCUFFED) if(!istype(O)) return FALSE user.visible_message("[user] vomits a glob of acid on [user.p_their()] [O.name]!", \ @@ -35,7 +35,7 @@ used = TRUE if(user.wear_suit && user.wear_suit.breakouttime && !used) - var/obj/item/clothing/suit/S = user.get_item_by_slot(SLOT_HUD_OUTER_SUIT) + var/obj/item/clothing/suit/S = user.get_item_by_slot(ITEM_SLOT_OUTER_SUIT) if(!istype(S)) return FALSE user.visible_message("[user] vomits a glob of acid across the front of [user.p_their()] [S.name]!", \ diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index dc1719ef157fb..146cabfa1a476 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -107,8 +107,8 @@ user.unEquip(user.head) user.unEquip(user.wear_suit) - user.equip_to_slot_if_possible(new suit_type(user), SLOT_HUD_OUTER_SUIT, TRUE, TRUE) - user.equip_to_slot_if_possible(new helmet_type(user), SLOT_HUD_HEAD, TRUE, TRUE) + user.equip_to_slot_if_possible(new suit_type(user), ITEM_SLOT_OUTER_SUIT, TRUE, TRUE) + user.equip_to_slot_if_possible(new helmet_type(user), ITEM_SLOT_HEAD, TRUE, TRUE) cling.chem_recharge_slowdown += recharge_slowdown return TRUE @@ -248,6 +248,7 @@ desc = "a tentacle." projectile_type = /obj/item/projectile/tentacle caliber = "tentacle" + icon = 'icons/obj/projectiles.dmi' icon_state = "tentacle_end" muzzle_flash_effect = null muzzle_flash_color = null @@ -516,7 +517,7 @@ flags = NODROP | DROPDEL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 20, BOMB = 10, RAD = 0, FIRE = 90, ACID = 90) - flags_inv = HIDEJUMPSUIT + flags_inv = HIDEJUMPSUIT | HIDESHOES cold_protection = 0 heat_protection = 0 sprite_sheets = null diff --git a/code/modules/antagonists/cult/datum_cultist.dm b/code/modules/antagonists/cult/datum_cultist.dm index 105b66256bea5..457abc6fea7ba 100644 --- a/code/modules/antagonists/cult/datum_cultist.dm +++ b/code/modules/antagonists/cult/datum_cultist.dm @@ -128,9 +128,9 @@ RESTRICT_TYPE(/datum/antagonist/cultist) return var/mob/living/carbon/human/H = owner.current var/list/slots = list( - "backpack" = SLOT_HUD_IN_BACKPACK, - "left pocket" = SLOT_HUD_LEFT_STORE, - "right pocket" = SLOT_HUD_RIGHT_STORE + "backpack" = ITEM_SLOT_IN_BACKPACK, + "left pocket" = ITEM_SLOT_LEFT_POCKET, + "right pocket" = ITEM_SLOT_RIGHT_POCKET ) var/where = H.equip_in_one_of_slots(new item_path(H), slots) diff --git a/code/modules/antagonists/cult/team_cult.dm b/code/modules/antagonists/cult/team_cult.dm index 7eb4b8443f9e6..61c8c2dbfa9d8 100644 --- a/code/modules/antagonists/cult/team_cult.dm +++ b/code/modules/antagonists/cult/team_cult.dm @@ -31,14 +31,23 @@ RESTRICT_TYPE(/datum/team/cult) /// Boolean that prevents all_members_timer from being called multiple times var/is_in_transition = FALSE + /// Timer until we do a recount of cultist members + var/recount_timer + +/datum/team/cult/New(list/starting_members) + . = ..() + recount_timer = addtimer(CALLBACK(src, PROC_REF(cult_threshold_check)), 5 MINUTES, TIMER_STOPPABLE|TIMER_DELETE_ME|TIMER_LOOP) + +/datum/team/cult/Destroy(force, ...) + deltimer(recount_timer) + return ..() + /datum/team/cult/create_team(list/starting_members) cult_threshold_check() // Set this ALWAYS before any check_cult_size check, or . = ..() objective_holder.add_objective(/datum/objective/servecult) - addtimer(CALLBACK(src, PROC_REF(cult_threshold_check)), 2 MINUTES) // Check again in 2 minutes for latejoiners - cult_status = NARSIE_DEMANDS_SACRIFICE create_next_sacrifice() @@ -102,7 +111,7 @@ RESTRICT_TYPE(/datum/team/cult) /** * Returns the current number of cultists and constructs. * - * Returns the number of cultists and constructs in a list ([1] = Cultists, [2] = Constructs), or as one combined number. + * Returns the number of cultists and constructs in the format `list(number of Cultists, number of Constructs)`, or as one combined number. * * * separate - Should the number be returned as a list with two separate values (Humans and Constructs) or as one number. */ diff --git a/code/modules/antagonists/revolutionary/datum_headrev.dm b/code/modules/antagonists/revolutionary/datum_headrev.dm index 1f229266badf3..3097fbc022980 100644 --- a/code/modules/antagonists/revolutionary/datum_headrev.dm +++ b/code/modules/antagonists/revolutionary/datum_headrev.dm @@ -32,11 +32,11 @@ RESTRICT_TYPE(/datum/antagonist/rev/head) return var/list/slots = list( - "backpack" = SLOT_HUD_IN_BACKPACK, - "left pocket" = SLOT_HUD_LEFT_STORE, - "right pocket" = SLOT_HUD_RIGHT_STORE, - "left hand" = SLOT_HUD_LEFT_HAND, - "right hand" = SLOT_HUD_RIGHT_HAND, + "backpack" = ITEM_SLOT_IN_BACKPACK, + "left pocket" = ITEM_SLOT_LEFT_POCKET, + "right pocket" = ITEM_SLOT_RIGHT_POCKET, + "left hand" = ITEM_SLOT_LEFT_HAND, + "right hand" = ITEM_SLOT_RIGHT_HAND, ) var/flashloc_name diff --git a/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm index 6fc057cacedba..e7d397c9bdbf1 100644 --- a/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm +++ b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm @@ -157,7 +157,7 @@ var/list/datum/mind/target_blacklist = null /// Static list that is basically [/datum/objective/contract/var/possible_zone_names] but with area names replaced by /area objects if available. var/static/list/possible_zones = null - /// The owning [/datum/syndicatce_contract]. + /// The owning [/datum/syndicate_contract]. var/datum/syndicate_contract/owning_contract = null /// Name fixer regex because area names have rogue characters sometimes. var/static/regex/name_fixer = regex("(\[a-zа-яё0-9 \\'\]+)$", "ig") // SS220 EDIT - Regex for RU Areas diff --git a/code/modules/antagonists/traitor/contractor/items/contractor_uplink.dm b/code/modules/antagonists/traitor/contractor/items/contractor_uplink.dm index 5da2b31ad5852..2edeadfd98a16 100644 --- a/code/modules/antagonists/traitor/contractor/items/contractor_uplink.dm +++ b/code/modules/antagonists/traitor/contractor/items/contractor_uplink.dm @@ -9,7 +9,7 @@ icon = 'icons/obj/device.dmi' icon_state = "contractor_uplink" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "programming=5;syndicate=4" // Hackerman encryption /// The Contractor Hub associated with this uplink. var/datum/contractor_hub/hub = null diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index f998b973270de..48a30072c43fa 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -12,8 +12,6 @@ RESTRICT_TYPE(/datum/antagonist/traitor) clown_gain_text = "Your syndicate training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself." clown_removal_text = "You lose your syndicate training and return to your own clumsy, clownish self." wiki_page_name = "Traitor" - targeted_by_antag_message = "Our intelligence suggests that you are likely to be the target of a rival member of the Syndicate. \ - Remain vigilant, they know who you are and what you can do." /// Should the traitor get codewords? var/give_codewords = TRUE /// Should we give the traitor their uplink? @@ -21,6 +19,9 @@ RESTRICT_TYPE(/datum/antagonist/traitor) blurb_r = 200 blurb_a = 0.75 + /// Have we / are we sending a backstab message at this time. If we are, do not send another. + var/sending_backstab = FALSE + /datum/antagonist/traitor/on_gain() // Create this in case the traitor wants to mindslaves someone. if(!owner.som) @@ -274,14 +275,32 @@ RESTRICT_TYPE(/datum/antagonist/traitor) return "[GLOB.current_date_string], [station_time_timestamp()]\n[station_name()], [get_area_name(owner.current, TRUE)]\nBEGIN_MISSION" /datum/antagonist/traitor/proc/reveal_delayed_objectives() - for(var/datum/objective/delayed/delayed_obj in objective_holder.objectives) + + for(var/datum/objective/delayed/delayed_obj in get_antag_objectives(FALSE)) delayed_obj.reveal_objective() if(!owner?.current) return SEND_SOUND(owner.current, sound('sound/ambience/alarm4.ogg')) - if(targeted_by_antag || prob(ORG_PROB_PARANOIA)) // Low chance of fake 'You are targeted' notification - to_chat(owner.current, "[targeted_by_antag_message]") + + if(prob(ORG_PROB_PARANOIA)) // Low chance of fake 'You are targeted' notification + queue_backstab() + var/list/messages = owner.prepare_announce_objectives() to_chat(owner.current, chat_box_red(messages.Join("
"))) delayed_objectives = FALSE + +/datum/antagonist/traitor/proc/queue_backstab() + // We do not want to send out two of these. As such, if the datum is already sending a backstab, abort. + if(sending_backstab) + return + sending_backstab = TRUE + addtimer(CALLBACK(src, PROC_REF(send_backstab)), rand(2 MINUTES, 5 MINUTES)) + +/datum/antagonist/traitor/proc/send_backstab() + if(!owner.current) + return + add_antag_objective(/datum/objective/potentially_backstabbed) + var/list/messages = owner.prepare_announce_objectives() + to_chat(owner.current, chat_box_red(messages.Join("
"))) + SEND_SOUND(owner.current, sound('sound/ambience/alarm4.ogg')) diff --git a/code/modules/antagonists/wizard/datum_apprentice.dm b/code/modules/antagonists/wizard/datum_apprentice.dm index 3935e7d9e8207..a929a07dbfb79 100644 --- a/code/modules/antagonists/wizard/datum_apprentice.dm +++ b/code/modules/antagonists/wizard/datum_apprentice.dm @@ -33,14 +33,14 @@ if(!class_type) CRASH("/datum/antagonist/wizard/apprentice was never assigned a class_type") var/mob/living/carbon/human/new_wiz = owner.current - new_wiz.equip_to_slot_or_del(new /obj/item/radio/headset(new_wiz), SLOT_HUD_LEFT_EAR) + new_wiz.equip_to_slot_or_del(new /obj/item/radio/headset(new_wiz), ITEM_SLOT_LEFT_EAR) if(class_type == "stealth") - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(new_wiz), SLOT_HUD_JUMPSUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(new_wiz), ITEM_SLOT_JUMPSUIT) else - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(new_wiz), SLOT_HUD_JUMPSUIT) - new_wiz.equip_to_slot_or_del(new /obj/item/storage/backpack(new_wiz), SLOT_HUD_BACK) - new_wiz.equip_to_slot_or_del(new /obj/item/storage/box(new_wiz), SLOT_HUD_IN_BACKPACK) - new_wiz.equip_to_slot_or_del(new /obj/item/teleportation_scroll/apprentice(new_wiz), SLOT_HUD_RIGHT_STORE) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(new_wiz), ITEM_SLOT_JUMPSUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/storage/backpack(new_wiz), ITEM_SLOT_BACK) + new_wiz.equip_to_slot_or_del(new /obj/item/storage/box(new_wiz), ITEM_SLOT_IN_BACKPACK) + new_wiz.equip_to_slot_or_del(new /obj/item/teleportation_scroll/apprentice(new_wiz), ITEM_SLOT_RIGHT_POCKET) var/list/messages = list() switch(class_type) @@ -50,18 +50,18 @@ ADD_TRAIT(new_wiz, TRAIT_RESISTHEAT, MAGIC_TRAIT) ADD_TRAIT(new_wiz, TRAIT_RESISTHIGHPRESSURE, MAGIC_TRAIT) new_wiz.mind.AddSpell(new /datum/spell/ethereal_jaunt(null)) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_wiz), SLOT_HUD_SHOES) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(new_wiz), SLOT_HUD_OUTER_SUIT) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(new_wiz), SLOT_HUD_HEAD) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_wiz), ITEM_SLOT_SHOES) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(new_wiz), ITEM_SLOT_OUTER_SUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(new_wiz), ITEM_SLOT_HEAD) messages += "Your service has not gone unrewarded. Under the tutelage of [my_teacher.real_name], you've acquired proficiency in the fundamentals of Firebending, enabling you to cast spells like Fireball, Sacred Flame, and Ethereal Jaunt." messages += "You are immune to fire, but you are NOT immune to the explosions caused by your fireballs. Neither is your teacher, for that matter. Be careful!" if("translocation") new_wiz.mind.AddSpell(new /datum/spell/area_teleport/teleport(null)) new_wiz.mind.AddSpell(new /datum/spell/turf_teleport/blink(null)) new_wiz.mind.AddSpell(new /datum/spell/ethereal_jaunt(null)) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_wiz), SLOT_HUD_SHOES) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(new_wiz), SLOT_HUD_OUTER_SUIT) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(new_wiz), SLOT_HUD_HEAD) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_wiz), ITEM_SLOT_SHOES) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(new_wiz), ITEM_SLOT_OUTER_SUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(new_wiz), ITEM_SLOT_HEAD) messages += "Your service has not gone unrewarded. While studying under [my_teacher.real_name], you mastered reality-bending mobility spells, allowing you to cast Teleport, Blink, and Ethereal Jaunt." if("restoration") new_wiz.mind.AddSpell(new /datum/spell/charge(null)) @@ -69,10 +69,10 @@ var/datum/spell/return_to_teacher/S = new /datum/spell/return_to_teacher(null) S.teacher = my_teacher.mind new_wiz.mind.AddSpell(S) - new_wiz.equip_to_slot_or_del(new /obj/item/gun/magic/staff/healing(new_wiz), SLOT_HUD_RIGHT_HAND) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/marisa(new_wiz), SLOT_HUD_SHOES) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/marisa(new_wiz), SLOT_HUD_OUTER_SUIT) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/marisa(new_wiz), SLOT_HUD_HEAD) + new_wiz.equip_to_slot_or_del(new /obj/item/gun/magic/staff/healing(new_wiz), ITEM_SLOT_RIGHT_HAND) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/marisa(new_wiz), ITEM_SLOT_SHOES) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/marisa(new_wiz), ITEM_SLOT_OUTER_SUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/marisa(new_wiz), ITEM_SLOT_HEAD) messages += "Your service has not gone unrewarded. Under the guidance of [my_teacher.real_name], you've acquired life-saving survival spells. You can now cast Charge and Knock, and possess the ability to teleport back to your mentor." messages += "Your Charge spell can be used to recharge your Staff of Healing or reduce the cooldowns of your teacher, if you are grabbing them with empty hands." if("stealth") @@ -80,20 +80,20 @@ new_wiz.mind.AddSpell(new /datum/spell/aoe/knock(null)) new_wiz.mind.AddSpell(new /datum/spell/fireball/toolbox(null)) new_wiz.mind.AddSpell(new /datum/spell/disguise_self(null)) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_wiz), SLOT_HUD_SHOES) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(new_wiz), SLOT_HUD_WEAR_MASK) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(new_wiz), SLOT_HUD_GLOVES) - new_wiz.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_wiz), SLOT_HUD_BELT) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_wiz), ITEM_SLOT_SHOES) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(new_wiz), ITEM_SLOT_MASK) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(new_wiz), ITEM_SLOT_GLOVES) + new_wiz.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_wiz), ITEM_SLOT_BELT) messages += "Your service has not gone unrewarded. Under the mentorship of [my_teacher.real_name], you've mastered stealthy, robeless spells. You can now cast Mindswap, Knock, Homing Toolbox, and Disguise Self without the need for wizard robes." if("honk") new_wiz.mind.AddSpell(new /datum/spell/touch/banana/apprentice(null)) new_wiz.mind.AddSpell(new /datum/spell/ethereal_jaunt(null)) new_wiz.mind.AddSpell(new /datum/spell/summonitem(null)) - new_wiz.equip_to_slot_or_del(new /obj/item/gun/magic/staff/slipping(new_wiz), SLOT_HUD_RIGHT_HAND) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes/magical/nodrop(new_wiz), SLOT_HUD_SHOES) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/clown(new_wiz), SLOT_HUD_OUTER_SUIT) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/clown(new_wiz), SLOT_HUD_HEAD) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clownwiz(new_wiz), SLOT_HUD_WEAR_MASK) + new_wiz.equip_to_slot_or_del(new /obj/item/gun/magic/staff/slipping(new_wiz), ITEM_SLOT_RIGHT_HAND) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes/magical/nodrop(new_wiz), ITEM_SLOT_SHOES) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/clown(new_wiz), ITEM_SLOT_OUTER_SUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/clown(new_wiz), ITEM_SLOT_HEAD) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clownwiz(new_wiz), ITEM_SLOT_MASK) messages += "Your dedication pays off! Under [my_teacher.real_name]'s guidance, you've mastered magical honkings, seamlessly casting spells like Banana Touch, Ethereal Jaunt, and Instant Summons, while skillfully wielding a Staff of Slipping. Honk!" return messages diff --git a/code/modules/antagonists/wizard/datum_wizard.dm b/code/modules/antagonists/wizard/datum_wizard.dm index f3e1f622eb1bf..252a6f7567822 100644 --- a/code/modules/antagonists/wizard/datum_wizard.dm +++ b/code/modules/antagonists/wizard/datum_wizard.dm @@ -88,22 +88,22 @@ new_wiz.internal = new_wiz.r_hand new_wiz.update_action_buttons_icon() else - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(new_wiz), SLOT_HUD_JUMPSUIT) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(new_wiz), SLOT_HUD_HEAD) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(new_wiz), ITEM_SLOT_JUMPSUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(new_wiz), ITEM_SLOT_HEAD) new_wiz.dna.species.after_equip_job(null, new_wiz) new_wiz.rejuvenate() //fix any damage taken by naked vox/plasmamen/etc while round setups - new_wiz.equip_to_slot_or_del(new /obj/item/radio/headset(new_wiz), SLOT_HUD_LEFT_EAR) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_wiz), SLOT_HUD_SHOES) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(new_wiz), SLOT_HUD_OUTER_SUIT) - new_wiz.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_wiz), SLOT_HUD_BACK) + new_wiz.equip_to_slot_or_del(new /obj/item/radio/headset(new_wiz), ITEM_SLOT_LEFT_EAR) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_wiz), ITEM_SLOT_SHOES) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(new_wiz), ITEM_SLOT_OUTER_SUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_wiz), ITEM_SLOT_BACK) if(new_wiz.dna.species.speciesbox) - new_wiz.equip_to_slot_or_del(new new_wiz.dna.species.speciesbox(new_wiz), SLOT_HUD_IN_BACKPACK) + new_wiz.equip_to_slot_or_del(new new_wiz.dna.species.speciesbox(new_wiz), ITEM_SLOT_IN_BACKPACK) else - new_wiz.equip_to_slot_or_del(new /obj/item/storage/box/survival(new_wiz), SLOT_HUD_IN_BACKPACK) - new_wiz.equip_to_slot_or_del(new /obj/item/teleportation_scroll(new_wiz), SLOT_HUD_RIGHT_STORE) + new_wiz.equip_to_slot_or_del(new /obj/item/storage/box/survival(new_wiz), ITEM_SLOT_IN_BACKPACK) + new_wiz.equip_to_slot_or_del(new /obj/item/teleportation_scroll(new_wiz), ITEM_SLOT_RIGHT_POCKET) var/obj/item/spellbook/spellbook = new /obj/item/spellbook(new_wiz) spellbook.owner = new_wiz - new_wiz.equip_to_slot_or_del(spellbook, SLOT_HUD_LEFT_HAND) + new_wiz.equip_to_slot_or_del(spellbook, ITEM_SLOT_LEFT_HAND) var/list/reading = list() reading += "You will find a list of available spells in your spell book. Choose your magic arsenal carefully." diff --git a/code/modules/arcade/arcade_base.dm b/code/modules/arcade/arcade_base.dm index 5a1949b426f46..7c1d4b913eee4 100644 --- a/code/modules/arcade/arcade_base.dm +++ b/code/modules/arcade/arcade_base.dm @@ -3,7 +3,7 @@ name = "Arcade Game" desc = "One of the most generic arcade games ever." icon = 'icons/obj/arcade.dmi' - icon_state = "clawmachine_on" + icon_state = "clawmachine_1_on" idle_power_consumption = 40 var/tokens = 0 diff --git a/code/modules/asset_cache/asset_list.dm b/code/modules/asset_cache/asset_list.dm index e5cd8d966f0a3..cfee41c7ef310 100644 --- a/code/modules/asset_cache/asset_list.dm +++ b/code/modules/asset_cache/asset_list.dm @@ -311,9 +311,9 @@ GLOBAL_LIST_EMPTY(asset_datums) var/frame = 1 var/movement_states = FALSE - /// Used in asset name generation, (asset_name = "[prefix].[icon_state_name].png") + /// Used in asset name generation, (asset_name = `"[prefix].[icon_state_name].png"`) var/prefix = "default" - /// Generate icon filenames using GENERATE_ASSET_NAME instead the "[prefix].[icon_state_name].png" format + /// Generate icon filenames using GENERATE_ASSET_NAME instead the `"[prefix].[icon_state_name].png"` format var/generic_icon_names = FALSE /datum/asset/simple/icon_states/register(_icon = icon) diff --git a/code/modules/asset_cache/assets/asset_chem_master.dm b/code/modules/asset_cache/assets/asset_chem_master.dm index 7371b807289ac..8b5e867a1de1b 100644 --- a/code/modules/asset_cache/assets/asset_chem_master.dm +++ b/code/modules/asset_cache/assets/asset_chem_master.dm @@ -5,7 +5,7 @@ /datum/asset/spritesheet/chem_master/create_spritesheets() for(var/pill_type = 1 to 20) Insert("pill[pill_type]", 'icons/obj/chemical.dmi', "pill[pill_type]") - for(var/bottle_type in list("bottle", "small_bottle", "wide_bottle", "round_bottle", "reagent_bottle")) + for(var/bottle_type in list("bottle", "reagent_bottle")) Insert(bottle_type, 'icons/obj/chemical.dmi', bottle_type) /datum/asset/spritesheet/chem_master/ModifyInserted(icon/pre_asset) diff --git a/code/modules/asset_cache/assets/asset_job_icons.dm b/code/modules/asset_cache/assets/asset_job_icons.dm new file mode 100644 index 0000000000000..345ee7122c5ce --- /dev/null +++ b/code/modules/asset_cache/assets/asset_job_icons.dm @@ -0,0 +1,12 @@ +/// All job icon sprites, as visible on a security HUD. Used by orbit menu. +/datum/asset/spritesheet/job_icons + name = "job_icons" + +/datum/asset/spritesheet/job_icons/create_spritesheets() + var/list/states = GLOB.joblist + "prisoner" + "centcom" + "solgov" + "soviet" + "unknown" + for(var/state in states) + Insert(ckey(state), 'icons/mob/hud/job_assets.dmi', ckey(state)) + +/datum/asset/spritesheet/job_icons/ModifyInserted(icon/pre_asset) + pre_asset.Scale(16, 16) + return pre_asset diff --git a/code/modules/asset_cache/assets/asset_nanomap.dm b/code/modules/asset_cache/assets/asset_nanomap.dm index 62f32cc4587ef..f5b0c2be21a81 100644 --- a/code/modules/asset_cache/assets/asset_nanomap.dm +++ b/code/modules/asset_cache/assets/asset_nanomap.dm @@ -2,8 +2,8 @@ // It REALLY doesnt matter too much if these arent up to date // They are relatively big assets = list( - "Cyberiad220_nanomap_z1.png" = 'icons/_nanomaps/Cyberiad220_nanomap_z1.png', // SS220 EDIT START - OUR MAPS - "Delta220_nanomap_z1.png" = 'icons/_nanomaps/Delta220_nanomap_z1.png', + "BoxStation220_nanomap_z1.png" = 'icons/_nanomaps/BoxStation220_nanomap_z1.png', // SS220 EDIT START - OUR MAPS + "DeltaStation220_nanomap_z1.png" = 'icons/_nanomaps/DeltaStation220_nanomap_z1.png', "MetaStation220_nanomap_z1.png" = 'icons/_nanomaps/MetaStation220_nanomap_z1.png', "Lavaland_nanomap_z1.png" = 'icons/_nanomaps/Lavaland_nanomap_z1.png', // SS220 EDIT END - OUR MAPS "CereStation_nanomap_z1.png" = 'icons/_nanomaps/CereStation_nanomap_z1.png', diff --git a/code/modules/asset_cache/assets/asset_orbit_icons.dm b/code/modules/asset_cache/assets/asset_orbit_icons.dm deleted file mode 100644 index edc7c9923e1d4..0000000000000 --- a/code/modules/asset_cache/assets/asset_orbit_icons.dm +++ /dev/null @@ -1,12 +0,0 @@ -/// Sprites for Orbit Role UI -/datum/asset/spritesheet/orbit_job - name = "orbit_job" - -/datum/asset/spritesheet/orbit_job/create_spritesheets() - var/list/states = GLOB.joblist + "prisoner" + "centcom" + "solgov" + "soviet" + "unknown" - for(var/state in states) - Insert(ckey(state), 'icons/mob/hud/job_assets.dmi', ckey(state)) - -/datum/asset/spritesheet/orbit_job/ModifyInserted(icon/pre_asset) - pre_asset.Scale(16, 16) - return pre_asset diff --git a/code/modules/asset_cache/assets/asset_strip.dm b/code/modules/asset_cache/assets/asset_strip.dm index 463a4a8179313..236294743e3f1 100644 --- a/code/modules/asset_cache/assets/asset_strip.dm +++ b/code/modules/asset_cache/assets/asset_strip.dm @@ -3,6 +3,7 @@ "inventory-glasses.png" = 'icons/ui_icons/inventory/glasses.png', "inventory-head.png" = 'icons/ui_icons/inventory/head.png', "inventory-mask.png" = 'icons/ui_icons/inventory/mask.png', + "inventory-neck.png" = 'icons/ui_icons/inventory/neck.png', "inventory-ears.png" = 'icons/ui_icons/inventory/ears.png', "inventory-uniform.png" = 'icons/ui_icons/inventory/uniform.png', "inventory-suit.png" = 'icons/ui_icons/inventory/suit.png', diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index aa1abcaf9798a..eba569848dd97 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -664,6 +664,9 @@ What are the archived variables for? var/total_agent_b = 0 for(var/datum/gas_mixture/G as anything in mixtures) + if(!istype(G)) + stack_trace("share_many_airs had [G] in mixtures ([json_encode(mixtures)])") + continue total_volume += G.volume var/heat_capacity = G.heat_capacity() total_heat_capacity += heat_capacity @@ -685,6 +688,8 @@ What are the archived variables for? //Update individual gas_mixtures by volume ratio for(var/datum/gas_mixture/G as anything in mixtures) + if(!istype(G)) + continue G.private_oxygen = total_oxygen * G.volume / total_volume G.private_nitrogen = total_nitrogen * G.volume / total_volume G.private_toxins = total_toxins * G.volume / total_volume diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm index 5783ac6a52275..51478704541f8 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm @@ -2,7 +2,7 @@ name = "circulator/heat exchanger" desc = "A gas circulator pump and heat exchanger. Its input port is on the south side, and its output port is on the north side." icon = 'icons/obj/atmospherics/circulator.dmi' - icon_state = "circ1-off" + icon_state = "circ8-off" anchored = TRUE density = TRUE can_unwrench = TRUE diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_he.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_he.dm index 3d1dd04dd86ac..510ec482c7678 100644 --- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_he.dm +++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_he.dm @@ -87,7 +87,6 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging/hidden level=1 - icon_state="intact-f" plane = FLOOR_PLANE layer = GAS_PIPE_HIDDEN_LAYER @@ -134,6 +133,5 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/hidden level=1 - icon_state="intact-f" plane = FLOOR_PLANE layer = GAS_PIPE_HIDDEN_LAYER diff --git a/code/modules/awaymissions/mission_code/ruins/nian_freighter.dm b/code/modules/awaymissions/mission_code/ruins/nian_freighter.dm new file mode 100644 index 0000000000000..9372018e5396b --- /dev/null +++ b/code/modules/awaymissions/mission_code/ruins/nian_freighter.dm @@ -0,0 +1,30 @@ +/obj/item/paper/fluff/ruins/nian_freighter/manifest + name = "Voidhopper of Nexus Shipping Manifest" + info = {" +

Voidhopper of Nexus Shipping Manifest

+
+
Order: #7934
Destination: + The destination seems to have been blacked out.
Requested By: + Athena, Praetorian of Gliese
CONTENTS:
+
    +
  • 1 pair of kitty ears
    • +
  • 1 banhammer
    • +
  • 1 exosuit mining scanner
    • +
  • 1 diamond-tipped exosuit drill
    • +
  • 1 'LittleBoy' Mining Grenade Launcher
    • +
  • 1 mecha voice modification kit: Honk
    • +
  • 20 plastitanium glass
    • +
  • 50 uranium sheets
    • +
  • 50 reinforced plasma glass
    • +
  • 50 metal sheets
    • +
  • 1 fuel tank
    • +
  • 1 radiant dance machine mark IV
    • +
  • 1 soap
    • +
  • 1 advanced mop
    • +
  • 1 advanced space cleaner
    • +
+
CHECK CONTENTS AND SIGN BELOW THE LINE TO CONFIRM RECEIPT OF GOODS +
+ X: Athena, Praetorian of Gliese + "} + icon_state = "paper_words" diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm index f0f893d7b1249..5fa4cb43baff9 100644 --- a/code/modules/awaymissions/mission_code/ruins/oldstation.dm +++ b/code/modules/awaymissions/mission_code/ruins/oldstation.dm @@ -50,6 +50,7 @@ // MARK: EQUIPMENT ////////////////////////////// /obj/item/storage/firstaid/ancient + name = "first-aid kit" icon_state = "firstaid" desc = "A first aid kit with the ability to heal common types of injuries." diff --git a/code/modules/awaymissions/mission_code/ruins/telecomns.dm b/code/modules/awaymissions/mission_code/ruins/telecomns.dm index 725dcf52d0cd4..d485817cf1930 100644 --- a/code/modules/awaymissions/mission_code/ruins/telecomns.dm +++ b/code/modules/awaymissions/mission_code/ruins/telecomns.dm @@ -427,18 +427,17 @@ GLOBAL_LIST_EMPTY(telecomms_trap_tank) for(var/I in 1 to 7) new /obj/item/wormhole_jaunter/contractor(src) -/obj/effect/spawner/random_spawners/telecomms_emp_loot +/obj/effect/spawner/random/telecomms_emp_loot name = "telecomms emp loot" - result = list( + loot = list( /obj/item/grenade/empgrenade = 8, /obj/item/gun/energy/ionrifle/carbine = 1, /obj/item/gun/energy/ionrifle = 1) -/obj/effect/spawner/random_spawners/telecomms_teleprod_maybe +/obj/effect/spawner/random/telecomms_teleprod_maybe name = "teleprod maybe" - result = list( - /datum/nothing = 4, - /obj/item/melee/baton/cattleprod/teleprod = 1) + loot = list(/obj/item/melee/baton/cattleprod/teleprod = 1) + spawn_loot_chance = 20 /obj/effect/spawner/random/telecomms_weldertank_maybe name = "weldertank maybe" diff --git a/code/modules/client/login_processing/10-load_preferences.dm b/code/modules/client/login_processing/10-load_preferences.dm index 0ef03d03c4c21..b16174dfd60d8 100644 --- a/code/modules/client/login_processing/10-load_preferences.dm +++ b/code/modules/client/login_processing/10-load_preferences.dm @@ -31,7 +31,9 @@ keybindings, server_region, muted_adminsounds_ckeys, - viewrange + viewrange, + map_vote_pref_json, + toggles_3 FROM player WHERE ckey=:ckey"}, list( "ckey" = C.ckey diff --git a/code/modules/client/login_processing/__client_login_processor.dm b/code/modules/client/login_processing/__client_login_processor.dm index 2bb96bf154613..2393226ba40fb 100644 --- a/code/modules/client/login_processing/__client_login_processor.dm +++ b/code/modules/client/login_processing/__client_login_processor.dm @@ -14,7 +14,8 @@ * This makes it easier to track stuff down -AA07 * * Also if you have used other languages before with "interface" types (Java, C# (Microsoft Java), etc), - * treat this class as one of those. [get_query(client/C)] and [process_result(datum/db_query/Q, client/C)] MUST be overriden + * treat this class as one of those. [/datum/client_login_processor/proc/get_query] and + * [/datum/client_login_processor/proc/process_result] MUST be overriden. */ /datum/client_login_processor /// The login priority. A lower priority will fire first diff --git a/code/modules/client/preference/link_processing.dm b/code/modules/client/preference/link_processing.dm index 2e7e88fa9b9e2..8b7845be767f7 100644 --- a/code/modules/client/preference/link_processing.dm +++ b/code/modules/client/preference/link_processing.dm @@ -944,7 +944,20 @@ if(ishuman(usr)) //mid-round preference changes, for aesthetics var/mob/living/carbon/human/H = usr H.remake_hud() + if("map_pick") + var/list/potential_maps = list() + for(var/x in subtypesof(/datum/map)) + var/datum/map/M = x + if(!initial(M.voteable)) + continue + potential_maps += M + var/list/output = tgui_input_ranked_list(usr, "Pick a map, in order of most wanted to least. This will go on until there are no more maps left.", "Maps", potential_maps) + if(!length(output)) + return + map_vote_pref_json = list() //Clear it out + for(var/index in 1 to length(output)) //This is an associated list to make blackbox tracking easier + map_vote_pref_json[output[index]] = index if("tgui") toggles2 ^= PREFTOGGLE_2_FANCYUI diff --git a/code/modules/client/preference/loadout/loadout_accessories.dm b/code/modules/client/preference/loadout/loadout_accessories.dm index 10cb910c97a86..a4a8f50368c0e 100644 --- a/code/modules/client/preference/loadout/loadout_accessories.dm +++ b/code/modules/client/preference/loadout/loadout_accessories.dm @@ -13,7 +13,7 @@ /datum/gear/accessory main_typepath = /datum/gear/accessory - slot = SLOT_HUD_TIE + slot = ITEM_SLOT_ACCESSORY sort_category = "Accessories" /datum/gear/accessory/scarf diff --git a/code/modules/client/preference/loadout/loadout_glasses.dm b/code/modules/client/preference/loadout/loadout_glasses.dm index c6188f3146426..af40da04e6ed1 100644 --- a/code/modules/client/preference/loadout/loadout_glasses.dm +++ b/code/modules/client/preference/loadout/loadout_glasses.dm @@ -13,7 +13,7 @@ /datum/gear/glasses main_typepath = /datum/gear/glasses - slot = SLOT_HUD_GLASSES + slot = ITEM_SLOT_EYES sort_category = "Glasses" /datum/gear/glasses/sunglasses diff --git a/code/modules/client/preference/loadout/loadout_gloves.dm b/code/modules/client/preference/loadout/loadout_gloves.dm index ccf4de8c44e38..180c75296fcfd 100644 --- a/code/modules/client/preference/loadout/loadout_gloves.dm +++ b/code/modules/client/preference/loadout/loadout_gloves.dm @@ -13,7 +13,7 @@ /datum/gear/gloves main_typepath = /datum/gear/gloves - slot = SLOT_HUD_GLOVES + slot = ITEM_SLOT_GLOVES sort_category = "Gloves" /datum/gear/gloves/fingerless diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 325e37e5995f1..6d3b7e84575fa 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -13,7 +13,7 @@ /datum/gear/hat main_typepath = /datum/gear/hat - slot = SLOT_HUD_HEAD + slot = ITEM_SLOT_HEAD sort_category = "Headwear" /datum/gear/hat/hhat_yellow diff --git a/code/modules/client/preference/loadout/loadout_racial.dm b/code/modules/client/preference/loadout/loadout_racial.dm index 4b576e96daa01..aaf337ece8ca6 100644 --- a/code/modules/client/preference/loadout/loadout_racial.dm +++ b/code/modules/client/preference/loadout/loadout_racial.dm @@ -20,31 +20,36 @@ display_name = "Tajaran veil" description = "A common traditional nano-fiber veil worn by many Tajaran. It is rare and offensive to see it on other races. Can be combined with various other eyewear." path = /obj/item/clothing/glasses/hud/tajblind - slot = SLOT_HUD_GLASSES + slot = ITEM_SLOT_EYES /datum/gear/racial/footwraps display_name = "Cloth footwraps" path = /obj/item/clothing/shoes/footwraps - slot = SLOT_HUD_SHOES + slot = ITEM_SLOT_SHOES /datum/gear/racial/handwraps display_name = "Cloth handwraps" path = /obj/item/clothing/gloves/handwraps - slot = SLOT_HUD_GLOVES + slot = ITEM_SLOT_GLOVES /datum/gear/racial/vox_casual display_name = "Vox 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/vox_casual - slot = SLOT_HUD_JUMPSUIT + slot = ITEM_SLOT_JUMPSUIT /datum/gear/racial/vox_robes display_name = "Vox robes" description = "Large, comfortable robes worn by those who need a bit more covering. The thick fabric contains a pocket suitable for those that need their hands free during their work, while the cloth serves to cover scars or other injuries to the wearer's body." path = /obj/item/clothing/suit/hooded/vox_robes - slot = SLOT_HUD_OUTER_SUIT + slot = ITEM_SLOT_OUTER_SUIT /datum/gear/racial/plasmamansuit_coke display_name = "Coke Suit" description = "Plasmaman envirosuit designed by Space Cola Co and gifted to the people of Boron as part of an elaborate advertisement campaign." path = /obj/item/storage/box/coke_envirosuit + +/datum/gear/racial/plasmamansuit_tacticool + display_name = "Tactical Suit" + description = "Plasmaman envirosuit supplied by black markets. Forged on Boron. Does not have suit sensors." + path = /obj/item/storage/box/tacticool_envirosuit diff --git a/code/modules/client/preference/loadout/loadout_shoes.dm b/code/modules/client/preference/loadout/loadout_shoes.dm index 6181e2120a7b1..26fafc2c58006 100644 --- a/code/modules/client/preference/loadout/loadout_shoes.dm +++ b/code/modules/client/preference/loadout/loadout_shoes.dm @@ -13,7 +13,7 @@ /datum/gear/shoes main_typepath = /datum/gear/shoes - slot = SLOT_HUD_SHOES + slot = ITEM_SLOT_SHOES sort_category = "Shoes" /datum/gear/shoes/sandals diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index b4f36409d1c62..4023a2a82e233 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -13,7 +13,7 @@ /datum/gear/suit main_typepath = /datum/gear/suit - slot = SLOT_HUD_OUTER_SUIT + slot = ITEM_SLOT_OUTER_SUIT sort_category = "External Wear" //WINTER COATS diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index 97fdfaad69d29..a8c472998af39 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -14,7 +14,7 @@ // Uniform slot /datum/gear/uniform main_typepath = /datum/gear/uniform - slot = SLOT_HUD_JUMPSUIT + slot = ITEM_SLOT_JUMPSUIT sort_category = "Uniforms and Casual Dress" /datum/gear/uniform/suit diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 4cca25a246b2d..880e1f8b40e5a 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -63,6 +63,7 @@ GLOBAL_LIST_INIT(special_role_times, list( var/UI_style = "Midnight" var/toggles = TOGGLES_DEFAULT var/toggles2 = TOGGLES_2_DEFAULT // Created because 1 column has a bitflag limit of 24 (BYOND limitation not MySQL) + var/toggles3 = TOGGLES_3_DEFAULT // Created for see above. I need to JSONify this at some point -aa07 var/sound = SOUND_DEFAULT var/light = LIGHT_DEFAULT /// Glow level for the lighting. Takes values from GLOW_HIGH to GLOW_DISABLE. @@ -132,6 +133,8 @@ GLOBAL_LIST_INIT(special_role_times, list( var/list/admin_sound_ckey_ignore = list() /// View range preference for this client var/viewrange = DEFAULT_CLIENT_VIEWSIZE + /// Map preferences for the first past the post system + var/list/map_vote_pref_json = list() /datum/preferences/New(client/C, datum/db_query/Q) // Process our query parent = C @@ -170,7 +173,7 @@ GLOBAL_LIST_INIT(special_role_times, list( dat += "
" dat += "Настройки персонажа" dat += "Игровые настройки" - dat += "Антагонисты" + dat += "Антагонисты and Maps" dat += "Привязка клавиш" dat += "Общие настройки" dat += "
" @@ -490,7 +493,7 @@ GLOBAL_LIST_INIT(special_role_times, list( dat += " - TGUI Say Theme: [(toggles2 & PREFTOGGLE_2_ENABLE_TGUI_SAY_LIGHT_MODE) ? "Light" : "Dark"]
" dat += "" - if(TAB_ANTAG) // Antagonist's Preferences + if(TAB_ANTAG) // Antagonist's Preferences (and maps) dat += "
" dat += "

Special Role Settings

" if(jobban_isbanned(user, ROLE_SYNDICATE)) @@ -512,12 +515,14 @@ GLOBAL_LIST_INIT(special_role_times, list( else var/is_special = (i in src.be_special) dat += "Be [capitalize(i)]:[(is_special) ? "Yes" : "No"]
" - dat += "

Total Playtime:

" if(!GLOB.configuration.jobs.enable_exp_tracking) dat += "Playtime tracking is not enabled." else dat += "Your [EXP_TYPE_CREW] playtime is [user.client.get_exp_type(EXP_TYPE_CREW)]
" + dat += "		" + dat += "

Map Settings

" + dat += " - Choose your map preferences: Click here!
" dat += "
" if(TAB_KEYS) diff --git a/code/modules/client/preference/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm index 084bba3926f7d..44a27ab8eecd0 100644 --- a/code/modules/client/preference/preferences_mysql.dm +++ b/code/modules/client/preference/preferences_mysql.dm @@ -4,6 +4,7 @@ //general preferences var/raw_muted_admins + var/raw_fptp while(query.NextRow()) ooccolor = query.item[1] UI_style = query.item[2] @@ -32,6 +33,8 @@ server_region = query.item[25] raw_muted_admins = query.item[26] viewrange = query.item[27] + raw_fptp = query.item[28] + toggles3 = text2num(query.item[29]) lastchangelog_2 = lastchangelog // Clone please @@ -41,6 +44,7 @@ default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot)) toggles = sanitize_integer(toggles, 0, TOGGLES_TOTAL, initial(toggles)) toggles2 = sanitize_integer(toggles2, 0, TOGGLES_2_TOTAL, initial(toggles2)) + toggles3 = sanitize_integer(toggles3, 0, TOGGLES_3_TOTAL, initial(toggles3)) sound = sanitize_integer(sound, 0, 65535, initial(sound)) UI_style_color = sanitize_hexcolor(UI_style_color, initial(UI_style_color)) UI_style_alpha = sanitize_integer(UI_style_alpha, 0, 255, initial(UI_style_alpha)) @@ -60,7 +64,11 @@ admin_sound_ckey_ignore = json_decode(raw_muted_admins) catch admin_sound_ckey_ignore = list() // Invalid JSON, handle safely please - + if(length(raw_fptp)) + try + map_vote_pref_json = json_decode(raw_fptp) + catch + map_vote_pref_json = list() // Sanitize the region if(!(server_region in GLOB.configuration.system.region_map)) server_region = null // This region doesnt exist anymore @@ -88,6 +96,7 @@ default_slot=:defaultslot, toggles=:toggles, toggles_2=:toggles2, + toggles_3=:toggles3, atklog=:atklog, sound=:sound, light=:light, @@ -104,7 +113,8 @@ keybindings=:keybindings, server_region=:server_region, muted_adminsounds_ckeys=:muted_adminsounds_ckeys, - viewrange=:viewrange + viewrange=:viewrange, + map_vote_pref_json=:map_vote_pref_json WHERE ckey=:ckey"}, list( // OH GOD THE PARAMETERS "ooccolour" = ooccolor, @@ -116,6 +126,7 @@ // Even though its a number in the DB, you have to use num2text here, otherwise byond adds scientific notation to the number "toggles" = num2text(toggles, CEILING(log(10, (TOGGLES_TOTAL)), 1)), "toggles2" = num2text(toggles2, CEILING(log(10, (TOGGLES_2_TOTAL)), 1)), + "toggles3" = num2text(toggles3, CEILING(log(10, (TOGGLES_3_TOTAL)), 1)), "atklog" = atklog, "sound" = sound, "light" = light, @@ -133,7 +144,8 @@ "ckey" = C.ckey, "server_region" = server_region, "muted_adminsounds_ckeys" = json_encode(admin_sound_ckey_ignore), - "viewrange" = viewrange + "viewrange" = viewrange, + "map_vote_pref_json" = json_encode(map_vote_pref_json) )) if(!query.warn_execute()) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 20a15ef8b61a0..fd1a76acff70b 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -28,7 +28,6 @@ var/visor_flags_inv = NONE //same as visor_flags, but for flags_inv var/visor_flags_cover = NONE //for cover flags var/visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT | VISOR_VISIONFLAGS | VISOR_DARKNESSVIEW | VISOR_INVISVIEW //what to toggle when toggled with weldingvisortoggle() - var/can_toggle = FALSE var/toggle_message = null var/alt_toggle_message = null @@ -93,7 +92,7 @@ return FALSE // Skip species restriction checks on non-equipment slots - if(slot in list(SLOT_HUD_RIGHT_HAND, SLOT_HUD_LEFT_HAND, SLOT_HUD_IN_BACKPACK, SLOT_HUD_LEFT_STORE, SLOT_HUD_RIGHT_STORE)) + if(slot & (ITEM_SLOT_RIGHT_HAND | ITEM_SLOT_LEFT_HAND | ITEM_SLOT_IN_BACKPACK | ITEM_SLOT_LEFT_POCKET | ITEM_SLOT_RIGHT_POCKET)) return TRUE if(species_restricted && ishuman(M)) @@ -145,7 +144,7 @@ name = "ears" w_class = WEIGHT_CLASS_TINY throwforce = 2 - slot_flags = SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_BOTH_EARS resistance_flags = NONE sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/ears.dmi', //We read you loud and skree-er. @@ -179,7 +178,7 @@ w_class = WEIGHT_CLASS_HUGE icon = 'icons/mob/screen_gen.dmi' icon_state = "block" - slot_flags = SLOT_FLAG_EARS | SLOT_FLAG_TWOEARS + slot_flags = ITEM_SLOT_BOTH_EARS /obj/item/clothing/ears/offear/New(obj/O) . = ..() @@ -197,7 +196,7 @@ icon = 'icons/obj/clothing/glasses.dmi' w_class = WEIGHT_CLASS_SMALL flags_cover = GLASSESCOVERSEYES - slot_flags = SLOT_FLAG_EYES + slot_flags = ITEM_SLOT_EYES materials = list(MAT_GLASS = 250) var/vision_flags = 0 var/see_in_dark = 0 //Base human is 2 @@ -249,7 +248,7 @@ icon = 'icons/obj/clothing/gloves.dmi' siemens_coefficient = 0.50 body_parts_covered = HANDS - slot_flags = SLOT_FLAG_GLOVES + slot_flags = ITEM_SLOT_GLOVES attack_verb = list("challenged") strip_delay = 2 SECONDS put_on_delay = 4 SECONDS @@ -379,7 +378,7 @@ icon = 'icons/obj/clothing/hats.dmi' icon_override = 'icons/mob/clothing/head.dmi' body_parts_covered = HEAD - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD var/HUDType = null var/vision_flags = 0 @@ -429,7 +428,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_HEAD) == src) + if(H.get_item_by_slot(ITEM_SLOT_HEAD) == src) for(var/obj/item/clothing/head/hat as anything in attached_hats) hat.attached_unequip() @@ -539,7 +538,7 @@ name = "mask" icon = 'icons/obj/clothing/masks.dmi' body_parts_covered = HEAD - slot_flags = SLOT_FLAG_MASK + slot_flags = ITEM_SLOT_MASK strip_delay = 4 SECONDS put_on_delay = 4 SECONDS dyeable = FALSE @@ -570,9 +569,9 @@ if(initial(flags_cover) & MASKCOVERSMOUTH) //If the mask covers the mouth when it's down and can be adjusted yet lost that trait when it was adjusted, make it cover the mouth again. flags_cover |= MASKCOVERSMOUTH if(H.head == src) - if(isnull(user.get_item_by_slot(slot_bitfield_to_slot(slot_flags)))) + if(isnull(user.get_item_by_slot(slot_flags))) user.unEquip(src) - user.equip_to_slot(src, slot_bitfield_to_slot(slot_flags)) + user.equip_to_slot(src, slot_flags) else if(flags_inv == HIDEFACE) //Means that only things like bandanas and balaclavas will be affected since they obscure the identity of the wearer. if(H.l_hand && H.r_hand) //If both hands are occupied, drop the object on the ground. user.unEquip(src) @@ -597,9 +596,9 @@ if(flags & AIRTIGHT) //If the mask was airtight, it won't be anymore since you just pushed it off your face. flags &= ~AIRTIGHT if(user.wear_mask == src) - if(isnull(user.get_item_by_slot(slot_bitfield_to_slot(slot_flags)))) + if(isnull(user.get_item_by_slot(slot_flags))) user.unEquip(src) - user.equip_to_slot(src, slot_bitfield_to_slot(slot_flags)) + user.equip_to_slot(src, slot_flags) else if(initial(flags_inv) == HIDEFACE) //Means that you won't have to take off and put back on simple things like breath masks which, realistically, can just be pulled down off your face. if(H.l_hand && H.r_hand) //If both hands are occupied, drop the object on the ground. user.unEquip(src) @@ -627,7 +626,7 @@ gender = PLURAL //Carn: for grammatically correct text-parsing body_parts_covered = FEET - slot_flags = SLOT_FLAG_FEET + slot_flags = ITEM_SLOT_SHOES dyeable = TRUE dyeing_key = DYE_REGISTRY_SHOES @@ -650,11 +649,9 @@ var/blood_state = BLOOD_STATE_NOT_BLOODY var/list/bloody_shoes = list(BLOOD_STATE_HUMAN = 0, BLOOD_STATE_XENO = 0, BLOOD_STATE_NOT_BLOODY = 0, BLOOD_BASE_ALPHA = BLOODY_FOOTPRINT_BASE_ALPHA) - - /obj/item/clothing/shoes/equipped(mob/user, slot) . = ..() - if(!no_slip || slot != SLOT_HUD_SHOES) + if(!no_slip || slot != ITEM_SLOT_SHOES) return ADD_TRAIT(user, TRAIT_NOSLIP, UID()) @@ -665,7 +662,7 @@ var/mob/living/carbon/human/H = user if(!user) return - if(H.get_item_by_slot(SLOT_HUD_SHOES) == src) + if(H.get_item_by_slot(ITEM_SLOT_SHOES) == src) REMOVE_TRAIT(H, TRAIT_NOSLIP, UID()) /obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params) @@ -761,7 +758,7 @@ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) drop_sound = 'sound/items/handling/cloth_drop.ogg' pickup_sound = 'sound/items/handling/cloth_pickup.ogg' - slot_flags = SLOT_FLAG_OCLOTHING + slot_flags = ITEM_SLOT_OUTER_SUIT dyeable = FALSE var/fire_resist = T0C + 100 @@ -861,7 +858,7 @@ /obj/item/clothing/suit/equipped(mob/living/carbon/human/user, slot) //Handle tail-hiding on a by-species basis. ..() - if(ishuman(user) && hide_tail_by_species && slot == SLOT_HUD_OUTER_SUIT) + if(ishuman(user) && hide_tail_by_species && slot == ITEM_SLOT_OUTER_SUIT) if("modsuit" in hide_tail_by_species) return if(user.dna.species.sprite_sheet_name in hide_tail_by_species) @@ -965,7 +962,7 @@ name = "under" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS permeability_coefficient = 0.90 - slot_flags = SLOT_FLAG_ICLOTHING + slot_flags = ITEM_SLOT_JUMPSUIT armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) equip_sound = 'sound/items/equip/jumpsuit_equip.ogg' drop_sound = 'sound/items/handling/cloth_drop.ogg' @@ -1007,7 +1004,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_JUMPSUIT) == src) + if(H.get_item_by_slot(ITEM_SLOT_JUMPSUIT) == src) for(var/obj/item/clothing/accessory/A in accessories) A.attached_unequip(user) // SS220 EDIT - FIX @@ -1015,7 +1012,7 @@ ..() if(!ishuman(user)) return - if(slot == SLOT_HUD_JUMPSUIT) + if(slot == ITEM_SLOT_JUMPSUIT) for(var/obj/item/clothing/accessory/A in accessories) A.attached_equip(user) // SS220 EDIT - FIX @@ -1029,7 +1026,7 @@ if(length(accessories) >= MAX_EQUIPABLE_ACCESSORIES) //this is neccesary to prevent chat spam when examining clothing return FALSE for(var/obj/item/clothing/accessory/AC in accessories) - if((A.slot in list(ACCESSORY_SLOT_UTILITY, ACCESSORY_SLOT_ARMBAND)) && AC.slot == A.slot) + if((A.slot & (ACCESSORY_SLOT_UTILITY | ACCESSORY_SLOT_ARMBAND)) && (AC.slot & A.slot)) return FALSE if(!A.allow_duplicates && AC.type == A.type) return FALSE @@ -1124,7 +1121,7 @@ if(copytext(item_color,-2) != "_d") basecolor = item_color - if(user.get_item_by_slot(SLOT_HUD_JUMPSUIT) != src) + if(user.get_item_by_slot(ITEM_SLOT_JUMPSUIT) != src) to_chat(user, "You must wear the uniform to adjust it!") else @@ -1188,3 +1185,9 @@ deconstruct(FALSE) else ..() + +/obj/item/clothing/neck + name = "necklace" + icon = 'icons/obj/clothing/neck.dmi' + body_parts_covered = UPPER_TORSO + slot_flags = ITEM_SLOT_NECK diff --git a/code/modules/clothing/ears/earmuffs.dm b/code/modules/clothing/ears/earmuffs.dm index bf47c4bebe1ea..55df72c904c6a 100644 --- a/code/modules/clothing/ears/earmuffs.dm +++ b/code/modules/clothing/ears/earmuffs.dm @@ -14,7 +14,7 @@ /obj/item/clothing/ears/earmuffs/equipped(mob/user, slot) . = ..() - if(ishuman(user) && ((slot == SLOT_HUD_LEFT_EAR) || (slot == SLOT_HUD_RIGHT_EAR))) + if(ishuman(user) && (slot & ITEM_SLOT_BOTH_EARS)) ADD_TRAIT(user, TRAIT_DEAF, "[CLOTHING_TRAIT][UID()]") /obj/item/clothing/ears/earmuffs/dropped(mob/user) diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index e593c0eb03d1e..d6189f7615874 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -31,10 +31,10 @@ /obj/item/clothing/glasses/meson/engine/equipped(mob/user, slot, initial) . = ..() - if(active_on_equip && mode == MODE_MESON && slot == SLOT_HUD_GLASSES) + if(active_on_equip && mode == MODE_MESON && slot == ITEM_SLOT_EYES) ADD_TRAIT(user, TRAIT_MESON_VISION, "meson_glasses[UID()]") - if(active_on_equip_rad && mode == MODE_RAD && slot == SLOT_HUD_GLASSES) + if(active_on_equip_rad && mode == MODE_RAD && slot == ITEM_SLOT_EYES) ADD_TRAIT(user, SM_HALLUCINATION_IMMUNE, "meson_glasses[UID()]") /obj/item/clothing/glasses/meson/engine/proc/toggle_mode(mob/user, voluntary) @@ -95,7 +95,7 @@ item_state = icon_state if(isliving(loc)) var/mob/living/user = loc - if(user.get_item_by_slot(SLOT_HUD_GLASSES) == src) + if(user.get_item_by_slot(ITEM_SLOT_EYES) == src) user.update_inv_glasses() else user.update_inv_l_hand() diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index e06ef37583fcf..2004447294b37 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -103,7 +103,7 @@ /obj/item/clothing/glasses/meson/equipped(mob/user, slot, initial) . = ..() - if(active_on_equip && slot == SLOT_HUD_GLASSES) + if(active_on_equip && slot == ITEM_SLOT_EYES) ADD_TRAIT(user, TRAIT_MESON_VISION, "meson_glasses[UID()]") /obj/item/clothing/glasses/meson/dropped(mob/user) @@ -169,7 +169,7 @@ actions_types = list(/datum/action/item_action/toggle_research_scanner) /obj/item/clothing/glasses/science/item_action_slot_check(slot) - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) return TRUE /obj/item/clothing/glasses/science/night @@ -370,7 +370,7 @@ toggle_noir(user) /obj/item/clothing/glasses/sunglasses/noir/item_action_slot_check(slot) - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) return TRUE /obj/item/clothing/glasses/sunglasses/noir/proc/toggle_noir(mob/user) @@ -404,7 +404,7 @@ actions_types = list(/datum/action/item_action/toggle_research_scanner) /obj/item/clothing/glasses/sunglasses/reagent/item_action_slot_check(slot) - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) return TRUE /obj/item/clothing/glasses/virussunglasses @@ -429,7 +429,7 @@ flags = NODROP /obj/item/clothing/glasses/sunglasses/lasers/equipped(mob/user, slot) //grant them laser eyes upon equipping it. - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) ADD_TRAIT(user, TRAIT_LASEREYES, "admin_zapglasses") user.regenerate_icons() ..(user, slot) diff --git a/code/modules/clothing/glasses/hudglasses.dm b/code/modules/clothing/glasses/hudglasses.dm index b45c9d9c44792..1c4a60cd8f1f6 100644 --- a/code/modules/clothing/glasses/hudglasses.dm +++ b/code/modules/clothing/glasses/hudglasses.dm @@ -16,7 +16,7 @@ /obj/item/clothing/glasses/hud/equipped(mob/living/carbon/human/user, slot) ..() - if(slot != SLOT_HUD_GLASSES) + if(slot != ITEM_SLOT_EYES) return for(var/new_hud in hud_types) var/datum/atom_hud/H = GLOB.huds[new_hud] diff --git a/code/modules/clothing/glasses/tajblind.dm b/code/modules/clothing/glasses/tajblind.dm index cf7932884061f..00ec29e529651 100644 --- a/code/modules/clothing/glasses/tajblind.dm +++ b/code/modules/clothing/glasses/tajblind.dm @@ -66,7 +66,7 @@ /obj/item/clothing/glasses/hud/tajblind/meson/equipped(mob/user, slot, initial) . = ..() - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) ADD_TRAIT(user, TRAIT_MESON_VISION, "meson_glasses[UID()]") /obj/item/clothing/glasses/hud/tajblind/meson/dropped(mob/user) @@ -91,7 +91,7 @@ desc += "
It has science goggles integrated into it." /obj/item/clothing/glasses/hud/tajblind/sci/item_action_slot_check(slot) - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) return TRUE /obj/item/clothing/glasses/hud/tajblind/med @@ -136,7 +136,7 @@ /obj/item/clothing/glasses/hud/tajblind/shaded/meson/equipped(mob/user, slot, initial) . = ..() - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) ADD_TRAIT(user, TRAIT_MESON_VISION, "meson_glasses[UID()]") /obj/item/clothing/glasses/hud/tajblind/shaded/meson/dropped(mob/user) @@ -162,7 +162,7 @@ desc += "
It has science goggles integrated into it." /obj/item/clothing/glasses/hud/tajblind/shaded/sci/item_action_slot_check(slot) - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) return TRUE /obj/item/clothing/glasses/hud/tajblind/shaded/med diff --git a/code/modules/clothing/gloves/boxing_gloves.dm b/code/modules/clothing/gloves/boxing_gloves.dm index 72adfaf38ebc0..2c2ab0f724be8 100644 --- a/code/modules/clothing/gloves/boxing_gloves.dm +++ b/code/modules/clothing/gloves/boxing_gloves.dm @@ -14,7 +14,7 @@ /obj/item/clothing/gloves/boxing/equipped(mob/user, slot) if(!ishuman(user)) return - if(slot == SLOT_HUD_GLOVES) + if(slot == ITEM_SLOT_GLOVES) var/mob/living/carbon/human/H = user style.teach(H, TRUE) @@ -23,7 +23,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_GLOVES) == src) + if(H.get_item_by_slot(ITEM_SLOT_GLOVES) == src) style.remove(H) /obj/item/clothing/gloves/boxing/green diff --git a/code/modules/clothing/gloves/misc_gloves.dm b/code/modules/clothing/gloves/misc_gloves.dm index a485117e51bf1..3cc42d2328400 100644 --- a/code/modules/clothing/gloves/misc_gloves.dm +++ b/code/modules/clothing/gloves/misc_gloves.dm @@ -107,13 +107,6 @@ transfer_prints = TRUE clipped = TRUE -/obj/item/clothing/gloves/batmangloves - name = "batgloves" - desc = "Used for handling all things bat related." - icon_state = "bmgloves" - item_state = "bmgloves" - item_color="bmgloves" - /obj/item/clothing/gloves/cursedclown name = "cursed white gloves" desc = "These things smell terrible, and they're all lumpy. Gross." diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index b24eff63868a9..848651f2b1b6d 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -58,7 +58,7 @@ /obj/item/clothing/head/helmet/meson/equipped(mob/user, slot, initial) . = ..() - if(slot == SLOT_HUD_HEAD) + if(slot == ITEM_SLOT_HEAD) ADD_TRAIT(user, TRAIT_MESON_VISION, "meson_helmet[UID()]") /obj/item/clothing/head/helmet/meson/dropped(mob/user) diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index 3e6c2b2081501..c6a2d82de349d 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -281,7 +281,7 @@ tip_fedora(user) /obj/item/clothing/head/fedora/item_action_slot_check(slot) - if(slot == SLOT_HUD_HEAD) + if(slot == ITEM_SLOT_HEAD) return TRUE /obj/item/clothing/head/fedora/proc/tip_fedora(mob/user) @@ -412,6 +412,7 @@ /obj/item/clothing/head/beret/purple name = "Pierson Family Beret" desc = "A purple beret, with a small golden crescent moon sewn onto it." + icon = 'icons/obj/clothing/hats.dmi' icon_state = "beret_purple" item_state = "purpleberet" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 524358e00dd8e..35c40863d2519 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -24,7 +24,7 @@ armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = INFINITY, ACID = 75) flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) actions_types = list(/datum/action/item_action/toggle) - visor_flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE resistance_flags = FIRE_PROOF sprite_sheets = list( @@ -201,7 +201,7 @@ /obj/item/clothing/head/kitty/equipped(mob/M, slot) . = ..() - if(ishuman(M) && slot == SLOT_HUD_HEAD) + if(ishuman(M) && slot == ITEM_SLOT_HEAD) update_icon(NONE, M) /obj/item/clothing/head/kitty/mouse diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 98ba676b12be2..cab34dd939f12 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -8,7 +8,7 @@ w_class = WEIGHT_CLASS_SMALL can_toggle = TRUE actions_types = list(/datum/action/item_action/adjust) - adjusted_flags = SLOT_FLAG_HEAD + adjusted_flags = ITEM_SLOT_HEAD sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', diff --git a/code/modules/clothing/masks/misc_masks.dm b/code/modules/clothing/masks/misc_masks.dm index 8f94631e3466b..df4684a5e5e00 100644 --- a/code/modules/clothing/masks/misc_masks.dm +++ b/code/modules/clothing/masks/misc_masks.dm @@ -223,7 +223,7 @@ pontificate(user) /obj/item/clothing/mask/fakemoustache/item_action_slot_check(slot) - if(slot == SLOT_HUD_WEAR_MASK) + if(slot == ITEM_SLOT_MASK) return 1 /obj/item/clothing/mask/fakemoustache/proc/pontificate(mob/user) @@ -361,8 +361,8 @@ flags_inv = HIDEFACE flags_cover = MASKCOVERSMOUTH w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_FLAG_MASK - adjusted_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_MASK + adjusted_flags = ITEM_SLOT_HEAD icon_state = "bandbotany" dyeable = TRUE dyeing_key = DYE_REGISTRY_BANDANA @@ -466,7 +466,7 @@ /obj/item/clothing/mask/cursedclown/equipped(mob/user, slot) ..() var/mob/living/carbon/human/H = user - if(istype(H) && slot == SLOT_HUD_WEAR_MASK) + if(istype(H) && slot == ITEM_SLOT_MASK) to_chat(H, "[src] grips your face!") if(H.mind && H.mind.assigned_role != "Cluwne") H.makeCluwne() diff --git a/code/modules/clothing/neck/cloaks.dm b/code/modules/clothing/neck/cloaks.dm new file mode 100644 index 0000000000000..02ae9f4d4f18c --- /dev/null +++ b/code/modules/clothing/neck/cloaks.dm @@ -0,0 +1,47 @@ +//Cloaks. No, not THAT kind of cloak. + +/obj/item/clothing/neck/cloak + name = "grey cloak" + desc = "It's a cloak that can be worn around your neck in a pretty dull color." + icon_state = "cloak" + w_class = WEIGHT_CLASS_SMALL + body_parts_covered = UPPER_TORSO | ARMS + +/obj/item/clothing/neck/cloak/head_of_security + name = "head of security's cloak" + desc = "Worn by the leader of Brigston, ruling the station with an iron fist." + icon_state = "hoscloak" + +/obj/item/clothing/neck/cloak/quartermaster + name = "quartermaster's cloak" + desc = "Worn by the God-emperor of Cargonia, supplying the station with the necessary tools for survival." + icon_state = "qmcloak" + +/obj/item/clothing/neck/cloak/chief_medical_officer + name = "chief medical officer's cloak" + desc = "Worn by the leader of Medistan, the valiant men and women keeping pestilence at bay." + icon_state = "cmocloak" + +/obj/item/clothing/neck/cloak/chief_engineer + name = "chief engineer's cloak" + desc = "Worn by the leader of both Atmosia and Delamistan, wielder of unlimited power." + icon_state = "cecloak" + +/obj/item/clothing/neck/cloak/research_director + name = "research director's cloak" + desc = "Worn by the leader of Scientopia, the greatest thaumaturgist and researcher of rapid unexpected self disassembly." + icon_state = "rdcloak" + +/obj/item/clothing/neck/cloak/captain + name = "captain's cloak" + desc = "Worn by the supreme leader of Space Station 13." + icon_state = "capcloak" + +/obj/item/clothing/neck/cloak/captain/Initialize(mapload) + . = ..() + desc = "Worn by the supreme leader of [station_name()]." + +/obj/item/clothing/neck/cloak/head_of_personnel + name = "head of personnel's cloak" + desc = "Worn by the Head of Personnel. It smells faintly of bureaucracy." + icon_state = "hopcloak" diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 3fdcf020870a3..6e36ba0d104f6 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -8,7 +8,7 @@ strip_delay = 7 SECONDS put_on_delay = 7 SECONDS resistance_flags = FIRE_PROOF - + no_slip = FALSE var/magboot_state = "magboots" var/magpulse = FALSE var/slowdown_active = 2 @@ -24,7 +24,7 @@ /obj/item/clothing/shoes/magboots/equipped(mob/user, slot, initial) . = ..() - if(slot != SLOT_HUD_SHOES || !ishuman(user)) + if(slot != ITEM_SLOT_SHOES || !ishuman(user)) return check_mag_pulse(user) @@ -42,7 +42,7 @@ REMOVE_TRAIT(user, TRAIT_NOSLIP, UID()) slowdown = slowdown_passive else - if(user.get_item_by_slot(SLOT_HUD_SHOES) == src) + if(user.get_item_by_slot(ITEM_SLOT_SHOES) == src) ADD_TRAIT(user, TRAIT_NOSLIP, UID()) slowdown = slowdown_active magpulse = !magpulse @@ -56,7 +56,7 @@ for(var/X in actions) var/datum/action/A = X A.UpdateButtons() - check_mag_pulse(user, removing = (user.get_item_by_slot(SLOT_HUD_SHOES) != src)) + check_mag_pulse(user, removing = (user.get_item_by_slot(ITEM_SLOT_SHOES) != src)) /obj/item/clothing/shoes/magboots/proc/check_mag_pulse(mob/user, removing = FALSE) if(!user) @@ -144,7 +144,7 @@ /obj/item/clothing/shoes/magboots/clown/equipped(mob/user, slot) . = ..() - if(slot == SLOT_HUD_SHOES && enabled_waddle) + if(slot == ITEM_SLOT_SHOES && enabled_waddle) user.AddElement(/datum/element/waddling) /obj/item/clothing/shoes/magboots/clown/dropped(mob/user) @@ -302,7 +302,7 @@ ..() if(!ishuman(user)) return - if(slot == SLOT_HUD_SHOES && cell && core) + if(slot == ITEM_SLOT_SHOES && cell && core) style.teach(user, TRUE) /obj/item/clothing/shoes/magboots/gravity/dropped(mob/user) @@ -310,14 +310,14 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_SHOES) == src) + if(H.get_item_by_slot(ITEM_SLOT_SHOES) == src) style.remove(H) if(magpulse) to_chat(user, "As [src] are removed, they deactivate.") toggle_magpulse(user, TRUE) /obj/item/clothing/shoes/magboots/gravity/item_action_slot_check(slot) - if(slot == SLOT_HUD_SHOES) + if(slot == ITEM_SLOT_SHOES) return TRUE /obj/item/clothing/shoes/magboots/gravity/proc/dash(mob/user, action) diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm index 068d6671e59aa..e0a1ac06e51bb 100644 --- a/code/modules/clothing/shoes/misc_shoes.dm +++ b/code/modules/clothing/shoes/misc_shoes.dm @@ -103,7 +103,7 @@ /obj/item/clothing/shoes/clown_shoes/equipped(mob/user, slot) . = ..() - if(slot == SLOT_HUD_SHOES && enabled_waddle) + if(slot == ITEM_SLOT_SHOES && enabled_waddle) user.AddElement(/datum/element/waddling) /obj/item/clothing/shoes/clown_shoes/dropped(mob/user) @@ -154,7 +154,7 @@ var/recharging_time = 0 /obj/item/clothing/shoes/clown_shoes/slippers/item_action_slot_check(slot, mob/user) - if(slot == SLOT_HUD_SHOES) + if(slot == ITEM_SLOT_SHOES) return TRUE /obj/item/clothing/shoes/clown_shoes/slippers/proc/slide_one(mob/living/user, progress, prev_dir , prev_flags) @@ -460,7 +460,7 @@ var/recharging_time = 0 //time until next dash /obj/item/clothing/shoes/bhop/item_action_slot_check(slot) - if(slot == SLOT_HUD_SHOES) + if(slot == ITEM_SLOT_SHOES) return TRUE /obj/item/clothing/shoes/bhop/ui_action_click(mob/user, action) diff --git a/code/modules/clothing/spacesuits/alien_suits.dm b/code/modules/clothing/spacesuits/alien_suits.dm index d38a9944f255b..159b011cc96a6 100644 --- a/code/modules/clothing/spacesuits/alien_suits.dm +++ b/code/modules/clothing/spacesuits/alien_suits.dm @@ -32,6 +32,7 @@ //Unathi space gear. Huge and restrictive. /obj/item/clothing/head/helmet/space/unathi icon = 'icons/obj/clothing/species/unathi/hats.dmi' + icon_state = null species_restricted = list("Unathi") sprite_sheets = list( "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi' @@ -46,6 +47,7 @@ /obj/item/clothing/suit/space/unathi icon = 'icons/obj/clothing/species/unathi/suits.dmi' + icon_state = null species_restricted = list("Unathi") sprite_sheets = list( "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi' @@ -81,6 +83,7 @@ max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT dyeable = FALSE icon = 'icons/obj/clothing/species/vox/suits.dmi' + icon_state = null species_restricted = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/suit.dmi') @@ -90,6 +93,7 @@ flags = STOPSPRESSUREDMAGE flags_cover = HEADCOVERSEYES icon = 'icons/obj/clothing/species/vox/hats.dmi' + icon_state = null species_restricted = list("Vox") sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi') diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index c4e7304ed4c9d..2043bdd69e061 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -2,7 +2,7 @@ /obj/item/clothing/head/helmet/space/hardsuit name = "hardsuit helmet" desc = "A special helmet designed for work in a hazardous, low-pressure environment." - icon_state = "hardsuit0-engineering" + icon_state = null item_state = "eng_helm" max_integrity = 300 armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5, RAD = 150, FIRE = 50, ACID = 150) @@ -81,12 +81,12 @@ soundloop.stop(user) /obj/item/clothing/head/helmet/space/hardsuit/item_action_slot_check(slot) - if(slot == SLOT_HUD_HEAD) + if(slot == ITEM_SLOT_HEAD) return 1 /obj/item/clothing/head/helmet/space/hardsuit/equipped(mob/user, slot) ..() - if(slot != SLOT_HUD_HEAD) + if(slot != ITEM_SLOT_HEAD) if(suit) suit.RemoveHelmet() soundloop.stop(user) @@ -143,7 +143,7 @@ /obj/item/clothing/suit/space/hardsuit name = "hardsuit" desc = "A special space suit for environments that might pose hazards beyond just the vacuum of space. Provides more protection than a standard space suit." - icon_state = "hardsuit-engineering" + icon_state = null item_state = "eng_hardsuit" max_integrity = 300 armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5, RAD = 150, FIRE = 50, ACID = 150) @@ -201,7 +201,7 @@ if(jetpack) to_chat(user, "[src] already has a jetpack installed.") return - if(src == user.get_item_by_slot(SLOT_HUD_OUTER_SUIT)) //Make sure the player is not wearing the suit before applying the upgrade. + if(src == user.get_item_by_slot(ITEM_SLOT_OUTER_SUIT)) //Make sure the player is not wearing the suit before applying the upgrade. to_chat(user, "You cannot install the upgrade to [src] while wearing it.") return @@ -219,7 +219,7 @@ if(!jetpack) to_chat(user, "[src] has no jetpack installed.") return - if(src == user.get_item_by_slot(SLOT_HUD_OUTER_SUIT)) + if(src == user.get_item_by_slot(ITEM_SLOT_OUTER_SUIT)) to_chat(user, "You cannot remove the jetpack from [src] while wearing it.") return jetpack.turn_off(user) @@ -229,10 +229,10 @@ /obj/item/clothing/suit/space/hardsuit/equipped(mob/user, slot) ..() - if(helmettype && slot != SLOT_HUD_OUTER_SUIT) + if(helmettype && slot != ITEM_SLOT_OUTER_SUIT) RemoveHelmet() if(jetpack) - if(slot == SLOT_HUD_OUTER_SUIT) + if(slot == ITEM_SLOT_OUTER_SUIT) for(var/X in jetpack.actions) var/datum/action/A = X A.Grant(user) @@ -246,7 +246,7 @@ A.Remove(user) /obj/item/clothing/suit/space/hardsuit/item_action_slot_check(slot) - if(slot == SLOT_HUD_OUTER_SUIT) //we only give the mob the ability to toggle the helmet if he's wearing the hardsuit. + if(slot == ITEM_SLOT_OUTER_SUIT) //we only give the mob the ability to toggle the helmet if he's wearing the hardsuit. return 1 /obj/item/clothing/suit/space/hardsuit/on_mob_move(dir, mob/mob) @@ -451,37 +451,37 @@ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/soviet/commander //Security -/obj/item/clothing/head/helmet/space/hardsuit/security - name = "security hardsuit helmet" - desc = "A special helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor." - icon_state = "hardsuit0-sec" - item_state = "sec_helm" - item_color = "sec" - armor = list(MELEE = 25, BULLET = 10, LASER = 20, ENERGY = 5, BOMB = 5, RAD = 50, FIRE = 150, ACID = 150) - -/obj/item/clothing/suit/space/hardsuit/security - name = "security hardsuit" - desc = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor." - icon_state = "hardsuit-sec" - item_state = "sec_hardsuit" - armor = list(MELEE = 25, BULLET = 10, LASER = 20, ENERGY = 5, BOMB = 5, RAD = 50, FIRE = 150, ACID = 150) - allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank/internals,/obj/item/melee/baton,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/restraints/handcuffs) - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security - -/obj/item/clothing/head/helmet/space/hardsuit/security/hos - name = "head of security's hardsuit helmet" - desc = "A special bulky helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor." - icon_state = "hardsuit0-hos" - item_color = "hos" - armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = INFINITY) - -/obj/item/clothing/suit/space/hardsuit/security/hos - name = "head of security's hardsuit" - desc = "A special bulky suit that protects against hazardous, low pressure environments. Has an additional layer of armor." - icon_state = "hardsuit-hos" - armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = INFINITY) - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/hos - jetpack = /obj/item/tank/jetpack/suit +// /obj/item/clothing/head/helmet/space/hardsuit/security +// name = "security hardsuit helmet" +// desc = "A special helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor." +// icon_state = "hardsuit0-sec" +// item_state = "sec_helm" +// item_color = "sec" +// armor = list(MELEE = 25, BULLET = 10, LASER = 20, ENERGY = 5, BOMB = 5, RAD = 50, FIRE = 150, ACID = 150) + +// /obj/item/clothing/suit/space/hardsuit/security +// name = "security hardsuit" +// desc = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor." +// icon_state = "hardsuit-sec" +// item_state = "sec_hardsuit" +// armor = list(MELEE = 25, BULLET = 10, LASER = 20, ENERGY = 5, BOMB = 5, RAD = 50, FIRE = 150, ACID = 150) +// allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank/internals,/obj/item/melee/baton,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/restraints/handcuffs) +// helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security + +// /obj/item/clothing/head/helmet/space/hardsuit/security/hos +// name = "head of security's hardsuit helmet" +// desc = "A special bulky helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor." +// icon_state = "hardsuit0-hos" +// item_color = "hos" +// armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = INFINITY) + +// /obj/item/clothing/suit/space/hardsuit/security/hos +// name = "head of security's hardsuit" +// desc = "A special bulky suit that protects against hazardous, low pressure environments. Has an additional layer of armor." +// icon_state = "hardsuit-hos" +// armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = INFINITY) +// helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/hos +// jetpack = /obj/item/tank/jetpack/suit //Singuloth armor diff --git a/code/modules/clothing/spacesuits/misc_spacesuits.dm b/code/modules/clothing/spacesuits/misc_spacesuits.dm index 202b89711c942..c07d9b4729116 100644 --- a/code/modules/clothing/spacesuits/misc_spacesuits.dm +++ b/code/modules/clothing/spacesuits/misc_spacesuits.dm @@ -14,7 +14,7 @@ ) /obj/item/clothing/head/helmet/space/capspace/equipped(mob/living/carbon/human/user, slot) - if(ishuman(user) && slot == SLOT_HUD_HEAD) + if(ishuman(user) && slot == ITEM_SLOT_HEAD) if(isvox(user)) if(flags & BLOCKHAIR) flags &= ~BLOCKHAIR diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 500a1f000a8fe..632f9838974ac 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -288,3 +288,69 @@ desc = "A plasmaman envirohelm designed by Space Cola Co for the plasmamen." icon_state = "coke_envirohelm" item_state = "coke_envirohelm" + +/obj/item/clothing/head/helmet/space/plasmaman/tacticool + name = "diver envirosuit helmet" + desc = "A plasmaman helm resembling old diver helms." + icon_state = "diver_envirohelm" + base_icon_state = "diver_envirohelm" + item_state = "diver_envirohelm" + /// Different icons and names for the helm to use when reskinning + var/list/static/plasmaman_helm_options = list("Diver" = "diver_envirohelm", "Knight" = "knight_envirohelm", "Skull" = "skull_envirohelm") + /// Checks if the helm has been reskinned already + var/reskinned = FALSE + +/obj/item/clothing/head/helmet/space/plasmaman/tacticool/examine(mob/user) + . = ..() + if(!reskinned) + . += "You can Alt-Click to reskin it." + +/obj/item/clothing/head/helmet/space/plasmaman/tacticool/AltClick(mob/user) + ..() + if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) + to_chat(user, "You can't do that right now!") + return + if(reskin_radial_check(user) && !reskinned) + reskin(user) + +/obj/item/clothing/head/helmet/space/plasmaman/tacticool/update_icon_state() + if(!up) + icon_state = base_icon_state + else + icon_state = "[base_icon_state][on ? "-light":""]" + item_state = icon_state + +/obj/item/clothing/head/helmet/space/plasmaman/tacticool/proc/reskin(mob/M) + var/list/skins = list() + for(var/I in plasmaman_helm_options) + skins[I] = image(icon, icon_state = plasmaman_helm_options[I]) + var/choice = show_radial_menu(M, src, skins, radius = 40, custom_check = CALLBACK(src, PROC_REF(reskin_radial_check), M), require_near = TRUE) + + if(!choice || !reskin_radial_check(M)) + return + switch(choice) + if("Diver") + name = initial(name) + desc = initial(desc) + base_icon_state = initial(base_icon_state) + if("Knight") + name = "knight envirosuit helmet" + desc = "A plasmaman envirohelm designed in the shape of a knight helm." + base_icon_state = "knight_envirohelm" + visor_icon = "knight_envisor" + if("Skull") + name = "skull envirosuit helmet" + desc = "A plasmaman envirohelm designed in the shape of a skull." + base_icon_state = "skull_envirohelm" + visor_icon = "skull_envisor" + update_icon() + M.update_inv_head() + reskinned = TRUE + +/obj/item/clothing/head/helmet/space/plasmaman/tacticool/proc/reskin_radial_check(mob/user) + if(!ishuman(user)) + return FALSE + var/mob/living/carbon/human/H = user + if(!H.is_in_hands(src) || HAS_TRAIT(H, TRAIT_HANDS_BLOCKED)) + return FALSE + return TRUE diff --git a/code/modules/clothing/suits/armor_suits.dm b/code/modules/clothing/suits/armor_suits.dm index 0ef37b03aa227..1657f320aa6a1 100644 --- a/code/modules/clothing/suits/armor_suits.dm +++ b/code/modules/clothing/suits/armor_suits.dm @@ -229,7 +229,6 @@ icon_state = "captain_jacket" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS armor = list(MELEE = 40, BULLET = 20, LASER = 25, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = INFINITY, ACID = 450) - flags_inv = HIDEJUMPSUIT /obj/item/clothing/suit/armor/vest/capcarapace/jacket/tunic name = "captain's tunic" @@ -264,7 +263,6 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS armor = list(MELEE = 50, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 200, ACID = 200) - flags_inv = HIDEJUMPSUIT strip_delay = 80 put_on_delay = 60 sprite_sheets = list( @@ -532,7 +530,7 @@ /obj/item/clothing/suit/armor/reactive/fire/equipped(mob/user, slot) ..() - if(slot != SLOT_HUD_OUTER_SUIT) + if(slot != ITEM_SLOT_OUTER_SUIT) return ADD_TRAIT(user, TRAIT_RESISTHEAT, "[UID()]") @@ -559,7 +557,7 @@ /obj/item/clothing/suit/armor/reactive/cryo/equipped(mob/user, slot) ..() - if(slot != SLOT_HUD_OUTER_SUIT) + if(slot != ITEM_SLOT_OUTER_SUIT) return ADD_TRAIT(user, TRAIT_RESISTCOLD, "[UID()]") @@ -726,13 +724,13 @@ flags_2 = RAD_PROTECT_CONTENTS_2 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS slowdown = 3 - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + flags_inv = HIDEGLOVES|HIDEJUMPSUIT hide_tail_by_species = list("Vox") /obj/item/clothing/suit/armor/tdome armor = list(MELEE = 200, BULLET = 200, LASER = 50, ENERGY = 50, BOMB = INFINITY, RAD = INFINITY, FIRE = 450, ACID = 450) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + flags_inv = HIDEGLOVES|HIDEJUMPSUIT flags = THICKMATERIAL flags_2 = RAD_PROTECT_CONTENTS_2 cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/suits/cardborg_suit.dm b/code/modules/clothing/suits/cardborg_suit.dm index 9a7a214f13b3b..dca49e0dda972 100644 --- a/code/modules/clothing/suits/cardborg_suit.dm +++ b/code/modules/clothing/suits/cardborg_suit.dm @@ -105,7 +105,7 @@ CONTENTS: icon_state = "cardborg_h_deathbot" item_state = "cardborg_h_deathbot" dog_fashion = /datum/dog_fashion/head/cardborg/deathbot - available_disguises = list("nano_bloodhound", "syndie_bloodhound", "syndi-medi", "syndi-engi", "ertgamma") + available_disguises = list("nano_bloodhound", "syndie_bloodhound", "syndi-medi", "syndi-engi", "ertgamma", "spidersyndi", "syndieheavy") species_disguise = "High-tech killer robot" /* @@ -192,7 +192,7 @@ CONTENTS: */ /obj/item/clothing/head/cardborg/equipped(mob/living/user, slot) ..() - if(ishuman(user) && slot == SLOT_HUD_HEAD) + if(ishuman(user) && slot == ITEM_SLOT_HEAD) var/mob/living/carbon/human/H = user if(!istype(H.wear_suit, /obj/item/clothing/suit/cardborg)) return @@ -205,14 +205,14 @@ CONTENTS: /obj/item/clothing/suit/cardborg/equipped(mob/living/user, slot) ..() - if(ishuman(user) && slot == SLOT_HUD_OUTER_SUIT) + if(ishuman(user) && slot == ITEM_SLOT_OUTER_SUIT) var/mob/living/carbon/human/H = user if(!istype(H.head, /obj/item/clothing/head/cardborg)) return var/obj/item/clothing/head/cardborg/head = H.head apply_borg_disguise(user, head) -/obj/item/clothing/suit/cardborg/dropped(mob/living/user) +/obj/item/clothing/suit/cardborg/dropped(mob/living/user) ..() user.remove_alt_appearance("selected_borg_disguise") diff --git a/code/modules/clothing/suits/hood.dm b/code/modules/clothing/suits/hood.dm index 9deab56b08260..660911e7fe0a0 100644 --- a/code/modules/clothing/suits/hood.dm +++ b/code/modules/clothing/suits/hood.dm @@ -29,11 +29,11 @@ ToggleHood() /obj/item/clothing/suit/hooded/item_action_slot_check(slot, mob/user) - if(slot == SLOT_HUD_OUTER_SUIT) + if(slot == ITEM_SLOT_OUTER_SUIT) return 1 /obj/item/clothing/suit/hooded/equipped(mob/user, slot) - if(slot != SLOT_HUD_OUTER_SUIT) + if(slot != ITEM_SLOT_OUTER_SUIT) RemoveHood() ..() @@ -65,7 +65,7 @@ if(H.head) to_chat(H,"You're already wearing something on your head!") return - else if(H.equip_to_slot_if_possible(hood, SLOT_HUD_HEAD, FALSE, FALSE)) + else if(H.equip_to_slot_if_possible(hood, ITEM_SLOT_HEAD, FALSE, FALSE)) suit_adjusted = 1 icon_state = "[initial(icon_state)]_hood" H.update_inv_wear_suit() @@ -94,7 +94,7 @@ /obj/item/clothing/head/hooded/equipped(mob/user, slot) ..() - if(slot != SLOT_HUD_HEAD) + if(slot != ITEM_SLOT_HEAD) if(suit) suit.RemoveHood() else diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm index f18c22133f266..f67574bf124b0 100644 --- a/code/modules/clothing/suits/job_suits.dm +++ b/code/modules/clothing/suits/job_suits.dm @@ -30,7 +30,7 @@ ) /obj/item/clothing/suit/mantle/armor/captain - name = "captain's cloak" + name = "captain's mantle" desc = "An armor-plated piece of fashion for the ruling elite. Protect your upper half in style." icon_state = "capmantle" item_state = "capmantle" @@ -72,7 +72,7 @@ icon_state = "monkrobe" item_state = "monkrobe" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS - flags_inv = HIDESHOES|HIDEJUMPSUIT + flags_inv = HIDEJUMPSUIT hoodtype = /obj/item/clothing/head/hooded/monk_hood allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen) diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm index b884e4dfc42c1..2a484557e8f71 100644 --- a/code/modules/clothing/suits/misc_suits.dm +++ b/code/modules/clothing/suits/misc_suits.dm @@ -67,7 +67,6 @@ desc = "Yarr." icon_state = "hgpirate" item_state = "hgpirate" - flags_inv = HIDEJUMPSUIT /obj/item/clothing/suit/cyborg_suit @@ -149,7 +148,7 @@ icon_state = "hastur" item_state = "hastur" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + flags_inv = HIDESHOES|HIDEJUMPSUIT /obj/item/clothing/suit/imperium_monk @@ -298,7 +297,7 @@ /obj/item/clothing/suit/hooded/carp_costume/dragon/equipped(mob/user, slot, initial) . = ..() - if(slot == SLOT_HUD_OUTER_SUIT) + if(slot == ITEM_SLOT_OUTER_SUIT) user.faction += "carp" to_chat(user, "You feel a something gnash in the back of your mind- the carp are your friends, not your foe.") playsound(loc, 'sound/weapons/bite.ogg', 35, TRUE) @@ -697,7 +696,7 @@ /obj/item/clothing/suit/straight_jacket/equipped(mob/living/carbon/human/user, slot) . = ..() - if(slot == SLOT_HUD_OUTER_SUIT) + if(slot == ITEM_SLOT_OUTER_SUIT) ADD_TRAIT(user, TRAIT_RESTRAINED, "straight_jacket") /obj/item/clothing/suit/straight_jacket/dropped(mob/user, silent) @@ -723,18 +722,6 @@ item_state = "leathercoat" resistance_flags = FIRE_PROOF -/obj/item/clothing/suit/browncoat - name = "brown leather coat" - desc = "A long, brown leather coat." - icon_state = "browncoat" - item_state = "browncoat" - -/obj/item/clothing/suit/neocoat - name = "black coat" - desc = "A flowing, black coat." - icon_state = "neocoat" - item_state = "neocoat" - /obj/item/clothing/suit/browntrenchcoat name = "brown trench coat" desc = "It makes you stand out. Just the opposite of why it's typically worn. Nice try trying to blend in while wearing it." @@ -792,14 +779,6 @@ name = "white tracksuit" icon_state = "trackjacketwhite_open" -//actual suits - -/obj/item/clothing/suit/creamsuit - name = "cream suit" - desc = "A cream coloured, genteel suit." - icon_state = "creamsuit" - item_state = "creamsuit" - /obj/item/clothing/suit/jacket/miljacket name = "olive military jacket" desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable. This one comes in olive." @@ -1194,6 +1173,7 @@ /obj/item/clothing/suit/fluff/noble_coat name = "noble coat" desc = "The livid blues, purples and greens are awesome enough to evoke a visceral response in you; it is not dissimilar to indigestion." + icon = 'icons/obj/clothing/suits.dmi' icon_state = "noble_coat" item_state = "noble_coat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS @@ -1275,7 +1255,7 @@ return ..() /obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/equipped(mob/living/carbon/human/H, slot) - if(!istype(H) || slot != SLOT_HUD_OUTER_SUIT) + if(!istype(H) || slot != ITEM_SLOT_OUTER_SUIT) STOP_PROCESSING(SSobj, src) return else diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index c6b4c1beb5360..0e55e6ae647cb 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -35,7 +35,7 @@ if(H.head) to_chat(H, "You're already wearing something on your head!") return - else if(H.equip_to_slot_if_possible(helmet, SLOT_HUD_HEAD, FALSE, FALSE)) + else if(H.equip_to_slot_if_possible(helmet, ITEM_SLOT_HEAD, FALSE, FALSE)) to_chat(H, "You engage the helmet on the hardsuit.") suit_toggled = TRUE H.update_inv_wear_suit() diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 2834263a557ea..3af618eb2eaf5 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -5,7 +5,7 @@ icon_state = "bluetie" item_state = "" //no inhands item_color = "bluetie" - slot_flags = SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_ACCESSORY w_class = WEIGHT_CLASS_SMALL var/slot = ACCESSORY_SLOT_DECOR var/obj/item/clothing/under/has_suit = null //the suit the tie may be attached to @@ -417,7 +417,7 @@ desc = "This glowing blue badge marks the holder as THE LAW." icon_state = "holobadge" item_color = "holobadge" - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_ACCESSORY var/stored_name = null @@ -605,7 +605,7 @@ icon_state = "necklace" item_state = "necklace" item_color = "necklace" - slot_flags = SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_ACCESSORY /obj/item/clothing/accessory/necklace/long name = "large necklace" @@ -646,7 +646,7 @@ icon_state = "locketgold" item_state = "locketgold" item_color = "locketgold" - slot_flags = SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_ACCESSORY var/base_icon var/open var/obj/item/held //Item inside locket. diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index b7d8b8f6fa74c..774304725e25a 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -103,7 +103,7 @@ if(!holstered) var/obj/item/gun/gun = user.get_active_hand() if(!istype(gun)) - to_chat(user, "You need your gun equiped to holster it.") + to_chat(user, "You need your gun equipped to holster it.") return holster(gun, user) else diff --git a/code/modules/clothing/under/costumes.dm b/code/modules/clothing/under/costumes.dm index ead86b6b7ff42..6e5a1ac15360e 100644 --- a/code/modules/clothing/under/costumes.dm +++ b/code/modules/clothing/under/costumes.dm @@ -135,6 +135,7 @@ /obj/item/clothing/under/psysuit name = "dark undersuit" desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm." + icon = 'icons/obj/clothing/under/costumes.dmi' icon_state = "psysuit" item_state = "psysuit" item_color = "psysuit" diff --git a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm index 15adfb45ab6d7..2a557d2ea12ba 100644 --- a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm +++ b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm @@ -42,21 +42,21 @@ /obj/item/clothing/under/rank/engineering/atmospheric_technician/contortionist/equipped(mob/living/carbon/human/user, slot) . = ..() - if(slot != SLOT_HUD_JUMPSUIT) + if(slot != ITEM_SLOT_JUMPSUIT) return if(!user.ventcrawler) user.ventcrawler = VENTCRAWLER_ALWAYS /obj/item/clothing/under/rank/engineering/atmospheric_technician/contortionist/dropped(mob/living/carbon/human/user) . = ..() - if(user.get_item_by_slot(SLOT_HUD_JUMPSUIT) != src) + if(user.get_item_by_slot(ITEM_SLOT_JUMPSUIT) != src) return if(!user.get_int_organ(/obj/item/organ/internal/heart/gland/ventcrawling)) // This is such a snowflaky check user.ventcrawler = VENTCRAWLER_NONE /obj/item/clothing/under/rank/engineering/atmospheric_technician/contortionist/proc/check_clothing(mob/user as mob) //Allowed to wear: glasses, shoes, gloves, pockets, mask, and jumpsuit (obviously) - var/list/slot_must_be_empty = list(SLOT_HUD_BACK,SLOT_HUD_HANDCUFFED,SLOT_HUD_LEGCUFFED,SLOT_HUD_LEFT_HAND,SLOT_HUD_RIGHT_HAND,SLOT_HUD_BELT,SLOT_HUD_HEAD,SLOT_HUD_OUTER_SUIT) + var/list/slot_must_be_empty = list(ITEM_SLOT_BACK,ITEM_SLOT_HANDCUFFED,ITEM_SLOT_LEGCUFFED,ITEM_SLOT_LEFT_HAND,ITEM_SLOT_RIGHT_HAND,ITEM_SLOT_BELT,ITEM_SLOT_HEAD,ITEM_SLOT_OUTER_SUIT) for(var/slot_id in slot_must_be_empty) if(user.get_item_by_slot(slot_id)) to_chat(user,"You can't fit inside while wearing \the [user.get_item_by_slot(slot_id)].") diff --git a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm index ad986528c7455..a11e17175869f 100644 --- a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm +++ b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm @@ -126,3 +126,11 @@ icon_state = "coke_envirosuit" item_state = "coke_envirosuit" item_color = "coke_envirosuit" + +/obj/item/clothing/under/plasmaman/tacticool + name = "tactical envirosuit" + desc = "An envirosuit designed to be sleek and tactical, forged on unknown parts of Boron." + icon_state = "tacticool_envirosuit" + item_state = "tacticool_envirosuit" + item_color = "tacticool_envirosuit" + has_sensor = FALSE diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index 788e59583e810..6d85efc99e739 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -14,7 +14,7 @@ /obj/item/clothing/under/pants/equipped(mob/user, slot) - if(ishuman(user) && slot == SLOT_HUD_JUMPSUIT) + if(ishuman(user) && slot == ITEM_SLOT_JUMPSUIT) var/mob/living/carbon/human/H = user if(H.undershirt != "Nude") var/additional_body_parts = UPPER_TORSO|ARMS diff --git a/code/modules/clothing/under/syndicate_jumpsuits.dm b/code/modules/clothing/under/syndicate_jumpsuits.dm index ceda190cdf364..659bd6233283b 100644 --- a/code/modules/clothing/under/syndicate_jumpsuits.dm +++ b/code/modules/clothing/under/syndicate_jumpsuits.dm @@ -51,7 +51,7 @@ /obj/item/clothing/under/syndicate/silicon_cham/equipped(mob/user, slot, initial) . = ..() - if(slot == SLOT_HUD_JUMPSUIT) + if(slot == ITEM_SLOT_JUMPSUIT) ADD_TRAIT(user, TRAIT_AI_UNTRACKABLE, "silicon_cham[UID()]") user.set_invisible(SEE_INVISIBLE_LIVING) to_chat(user, "You feel a slight shiver as the cybernetic obfuscators activate.") diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm index f4b4cc6b1f951..e169c8c7c0e91 100644 --- a/code/modules/crafting/craft.dm +++ b/code/modules/crafting/craft.dm @@ -90,7 +90,7 @@ if(AM.flags_2 & HOLOGRAM_2) continue . += AM - for(var/slot in list(SLOT_HUD_RIGHT_STORE, SLOT_HUD_LEFT_STORE)) + for(var/slot in list(ITEM_SLOT_RIGHT_POCKET, ITEM_SLOT_LEFT_POCKET)) . += user.get_item_by_slot(slot) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 0938dabfc7d96..72c69dca524d9 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -150,7 +150,7 @@ force = 5 sharp = FALSE flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 5 w_class = WEIGHT_CLASS_NORMAL attack_verb = list("attacked", "slashed", "stabbed", "sliced") @@ -186,7 +186,7 @@ /obj/item/clothing/glasses/sunglasses_fake/fluff/kaki name = "broken thermonocle" desc = "A weathered Vox thermonocle, doesn't seem to work anymore." - icon_state = "thermoncle" + icon_state = "thermonocle" /// Rapidvalj: Hakikarahiti /obj/item/fluff/rapid_wheelchair_kit @@ -216,6 +216,7 @@ name = "custom zippo" desc = "A custom made zippo lighter." icon = 'icons/obj/custom_items.dmi' + icon_state = null /// GodOfOreos: Jason Conrad /obj/item/lighter/zippo/fluff/purple @@ -1555,7 +1556,7 @@ icon_state = "fethasnecklace" item_state = "fethasnecklace" item_color = "fethasnecklace" - slot_flags = SLOT_FLAG_MASK | SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_MASK | ITEM_SLOT_ACCESSORY /// HugoLuman: Dan Martinez /obj/item/bedsheet/fluff/hugosheet @@ -1613,7 +1614,7 @@ var/obj/item/clothing/head/helmet/space/plasmaman/lf53_fluff/F = new(P.loc) if(P == H.head) H.unEquip(P, TRUE, TRUE) - H.equip_to_slot(F, SLOT_HUD_HEAD, TRUE) + H.equip_to_slot(F, ITEM_SLOT_HEAD, TRUE) H.update_inv_head() qdel(P) @@ -1689,7 +1690,7 @@ icon_state = "panzermedal" item_state = "panzermedal" item_color = "panzermedal" - slot_flags = SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_ACCESSORY /// Sagrotter: Xann Zxiax /obj/item/clothing/accessory/medal/fluff/XannZxiax @@ -1699,7 +1700,7 @@ icon_state = "Xann_necklace" item_state = "Xann_necklace" item_color = "Xann_necklace" - slot_flags = SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_ACCESSORY /// Rb303: Isthel Eisenwald /obj/item/clothing/accessory/rbscarf @@ -1770,6 +1771,7 @@ name = "fluff ring" desc = "Someone forgot to set this fluff item's description, notify a coder!" icon = 'icons/obj/custom_items.dmi' + icon_state = null fluff_material = TRUE /obj/item/clothing/gloves/ring/fluff/update_icon_state() diff --git a/code/modules/detective_work/scanner.dm b/code/modules/detective_work/scanner.dm index 94f44bbdbaeec..6bb25918fee25 100644 --- a/code/modules/detective_work/scanner.dm +++ b/code/modules/detective_work/scanner.dm @@ -10,7 +10,7 @@ w_class = WEIGHT_CLASS_NORMAL item_state = "electronic" flags = CONDUCT | NOBLUDGEON - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "engineering=4;biotech=2;programming=5" var/scanning = FALSE var/list/log = list() diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm index 475610825f3d6..f77ccd5a48722 100644 --- a/code/modules/error_handler/error_handler.dm +++ b/code/modules/error_handler/error_handler.dm @@ -136,6 +136,9 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0) for(var/line in desclines) log_world(line) log_runtime_txt(line) +#ifdef CIBUILDING + log_world("::error file=[e.file],line=[e.line],title=Runtime::[e]") +#endif if(GLOB.error_cache) GLOB.error_cache.logError(e, desclines, e_src = e_src) #endif diff --git a/code/modules/events/meaty_ops.dm b/code/modules/events/meaty_ops.dm deleted file mode 100644 index 2c828ee1bf889..0000000000000 --- a/code/modules/events/meaty_ops.dm +++ /dev/null @@ -1,15 +0,0 @@ -/datum/event/meteor_wave/goreop/announce() - var/meteor_declaration = "Метеоритные Оперативники заявили о своем намерении полностью уничтожить [station_name()] своими телами, и бросают вызов экипажу, чтобы они попытались остановить их." - GLOB.major_announcement.Announce(meteor_declaration, "Объявление 'Войны'", 'sound/effects/siren.ogg') - -/datum/event/meteor_wave/goreop/setup() - waves = 3 - -/datum/event/meteor_wave/goreop/get_meteor_count() - return 5 - -/datum/event/meteor_wave/goreop/get_meteors() - return GLOB.meteors_ops - -/datum/event/meteor_wave/goreop/end() - GLOB.minor_announcement.Announce("Все Метеоритные Оперативники мертвы. Безоговорочная победа станции!", "Метеоритные Оперативники.") diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm index 89ca75c8cc33c..fe31a78edeb67 100644 --- a/code/modules/fish/fish_items.dm +++ b/code/modules/fish/fish_items.dm @@ -8,7 +8,7 @@ desc = "A small scoop to collect fish eggs with." icon = 'icons/obj/fish_items.dmi' icon_state = "egg_scoop" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 @@ -19,7 +19,7 @@ desc = "A tiny net to capture fish with. It's a death sentence!" icon = 'icons/obj/fish_items.dmi' icon_state = "net" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 @@ -44,7 +44,7 @@ desc = "A brush for cleaning the inside of aquariums. Contains a built-in odor neutralizer." icon = 'icons/obj/fish_items.dmi' icon_state = "brush" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 diff --git a/code/modules/food_and_drinks/drinks/drinks_base.dm b/code/modules/food_and_drinks/drinks/drinks_base.dm index 30e52563f1ed3..4574e56c98406 100644 --- a/code/modules/food_and_drinks/drinks/drinks_base.dm +++ b/code/modules/food_and_drinks/drinks/drinks_base.dm @@ -325,7 +325,7 @@ /obj/item/reagent_containers/drinks/flask/gold name = "captain's flask" - desc = "A gold flask belonging to the captain." + desc = "A regal flask belonging to the captain, with Nanotrasen's logo inlaid with pearl." icon_state = "flask_gold" materials = list(MAT_GOLD=500) diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index b40b169a286ce..3505ef31e639e 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -86,7 +86,7 @@ to_chat(user, "You fill [src] with [trans] units of the contents of [target].") //Something like a glass or a food item. Player probably wants to transfer TO it. - else if(target.is_drainable() || istype(target, /obj/item/food)) + else if(target.is_refillable() || istype(target, /obj/item/food)) if(!reagents.total_volume) to_chat(user, "[src] is empty!") return @@ -118,6 +118,7 @@ icon_state = "emptycondiment" name = "condiment bottle" desc = "Пустая бутылка для соуса" + update_appearance(UPDATE_NAME) /obj/item/reagent_containers/condiment/enzyme name = "universal enzyme" diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index e013810990496..c4239dbe4e5b7 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -266,15 +266,6 @@ do {\ snack_overlays = 0 top = 0 -/obj/item/food/customizable/candy/bar - name = "flavored chocolate bar" - desc = "Made in a factory downtown." - icon_state = "barcustom" - baseicon = "barcustom" - basename = "flavored chocolate bar" - snack_overlays = 0 - top = 0 - /obj/item/food/customizable/candy/sucker name = "flavored sucker" desc = "Suck suck suck." 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 97b91f9cc19d5..ae406f7f782b6 100644 --- a/code/modules/food_and_drinks/food/foods/baked_goods.dm +++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm @@ -453,7 +453,7 @@ slices_num = 5 bitesize = 3 filling_color = "#610977" - list_reagents = list("nutriment" = 20, "vitamin" = 10, "cream" = 5, "berryjuice", 5) + list_reagents = list("nutriment" = 20, "vitamin" = 10, "cream" = 5, "berryjuice" = 5) tastes = list("cake" = 4, "violets" = 2, "jam" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE @@ -1242,7 +1242,7 @@ 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" + icon_state = "grapetart" trash = /obj/item/trash/plate filling_color = "#8c00ff" bitesize = 3 diff --git a/code/modules/food_and_drinks/food/foods/junkfood.dm b/code/modules/food_and_drinks/food/foods/junkfood.dm index 0c3b1297b9985..e988c416c177a 100644 --- a/code/modules/food_and_drinks/food/foods/junkfood.dm +++ b/code/modules/food_and_drinks/food/foods/junkfood.dm @@ -121,6 +121,17 @@ user.put_in_hands(L) qdel(src) +/obj/item/food/deluxe_chocolate_bar + name = "Deluxe Chocolate-bar" + desc = "Crafted from premium cacao and infused with quantum nutrients, this luxury chocolate bar is wrapped in nanofoil for ultimate freshness. Experience the essence of culinary supremacy with every bite." + icon = 'icons/obj/food/candy.dmi' + icon_state = "choco" + filling_color = "#7D5F46" + antable = FALSE + junkiness = 25 + list_reagents = list("chocolate" = 5, "sugar" = 10) + tastes = list("chocolate" = 1) + ////////////////////// // Homemade // ////////////////////// diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 4d6c1845454fc..339fee416d911 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -281,18 +281,18 @@ for(var/obj/item/I in H.get_contents()) if(I.resistance_flags & INDESTRUCTIBLE) I.forceMove(get_turf(src)) - if(H.get_item_by_slot(SLOT_HUD_SUIT_STORE)) - var/obj/item/ws = H.get_item_by_slot(SLOT_HUD_SUIT_STORE) + if(H.get_item_by_slot(ITEM_SLOT_SUIT_STORE)) + var/obj/item/ws = H.get_item_by_slot(ITEM_SLOT_SUIT_STORE) if(ws.resistance_flags & INDESTRUCTIBLE) ws.forceMove(get_turf(src)) H.s_store = null - if(H.get_item_by_slot(SLOT_HUD_LEFT_STORE)) - var/obj/item/ls = H.get_item_by_slot(SLOT_HUD_LEFT_STORE) + if(H.get_item_by_slot(ITEM_SLOT_LEFT_POCKET)) + var/obj/item/ls = H.get_item_by_slot(ITEM_SLOT_LEFT_POCKET) if(ls.resistance_flags & INDESTRUCTIBLE) ls.forceMove(get_turf(src)) H.l_store = null - if(H.get_item_by_slot(SLOT_HUD_RIGHT_STORE)) - var/obj/item/rs = H.get_item_by_slot(SLOT_HUD_RIGHT_STORE) + if(H.get_item_by_slot(ITEM_SLOT_RIGHT_POCKET)) + var/obj/item/rs = H.get_item_by_slot(ITEM_SLOT_RIGHT_POCKET) if(rs.resistance_flags & INDESTRUCTIBLE) rs.forceMove(get_turf(src)) H.r_store = null diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm index 965e9a95911f2..90274d1ac1594 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm @@ -197,6 +197,14 @@ /obj/machinery/kitchen_machine/proc/special_attack_shove(mob/living/target, mob/living/attacker) return FALSE +/** + * Check if the machine is running when trying to add reagents to it. + */ +/obj/machinery/kitchen_machine/is_refillable() + if(operating) + return FALSE + . = ..() + /******************** * Machine Menu * ********************/ diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 45f9c17e00fd2..32af569e0691b 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -313,7 +313,6 @@ name = "hand of cards" desc = "Some playing cards." icon = 'icons/obj/playing_cards.dmi' - icon_state = "empty" w_class = WEIGHT_CLASS_TINY actions_types = list(/datum/action/item_action/remove_card, /datum/action/item_action/discard) @@ -398,7 +397,7 @@ if(href_list["pick"] == "Turn") turn_hand(usr) else - if(cardUser.get_item_by_slot(SLOT_HUD_LEFT_HAND) == src || cardUser.get_item_by_slot(SLOT_HUD_RIGHT_HAND) == src) + if(cardUser.get_item_by_slot(ITEM_SLOT_LEFT_HAND) == src || cardUser.get_item_by_slot(ITEM_SLOT_RIGHT_HAND) == src) pickedcard = href_list["pick"] Removecard() cardUser << browse(null, "window=cardhand") diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm index b11cfd562511a..0f2e1e97f45e7 100644 --- a/code/modules/hydroponics/grown/ambrosia.dm +++ b/code/modules/hydroponics/grown/ambrosia.dm @@ -4,7 +4,7 @@ name = "ambrosia branch" desc = "This is a plant." icon_state = "ambrosiavulgaris" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD filling_color = "#008000" bitesize_mod = 2 tastes = list("ambrosia" = 1) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 505ccd1b123a8..bf095885d14bf 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -22,7 +22,7 @@ name = "poppy" desc = "Long-used as a symbol of rest, peace, and death." icon_state = "poppy" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD bitesize_mod = 3 tastes = list("poppy" = 1) filling_color = "#FF6347" @@ -45,7 +45,7 @@ name = "lily" desc = "A beautiful white flower." icon_state = "lily" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD bitesize_mod = 3 tastes = list("lily" = 1) filling_color = "#C7BBAD" @@ -98,7 +98,7 @@ name = "geranium" desc = "A beautiful purple flower." icon_state = "geranium" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD bitesize_mod = 3 tastes = list("geranium" = 1) filling_color = "#A463FB" @@ -128,7 +128,7 @@ name = "harebell" desc = "\"I'll sweeten thy sad grave: thou shalt not lack the flower that's like thy face, pale primrose, nor the azured hare-bell, like thy veins; no, nor the leaf of eglantine, whom not to slander, out-sweeten'd not thy breath.\"" icon_state = "harebell" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD filling_color = "#E6E6FA" tastes = list("harebell" = 1) bitesize_mod = 3 @@ -161,7 +161,7 @@ icon_state = "sunflower" damtype = "fire" force = 0 - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD throwforce = 0 w_class = WEIGHT_CLASS_TINY throw_speed = 1 @@ -190,7 +190,7 @@ name = "moonflower" desc = "Store in a location at least 50 yards away from werewolves." icon_state = "moonflower" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD filling_color = "#E6E6FA" bitesize_mod = 2 tastes = list("moonflower" = 1) @@ -217,7 +217,7 @@ icon_state = "novaflower" damtype = "fire" force = 0 - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD throwforce = 0 w_class = WEIGHT_CLASS_TINY throw_speed = 1 diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 262c623b226dc..543e1f026a227 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -6,7 +6,7 @@ icon_state = "hydro" item_state = "analyzer" w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "magnets=2;biotech=2" materials = list(MAT_METAL = 210, MAT_GLASS = 40) @@ -42,7 +42,7 @@ belt_icon = null volume = 100 container_type = OPENCONTAINER - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 @@ -63,7 +63,7 @@ belt_icon = null volume = 100 container_type = OPENCONTAINER - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 @@ -149,7 +149,7 @@ w_class = WEIGHT_CLASS_BULKY flags = CONDUCT armour_penetration_flat = 20 - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK origin_tech = "materials=3;combat=2" attack_verb = list("chopped", "sliced", "cut", "reaped") hitsound = 'sound/weapons/bladeslice.ogg' @@ -199,7 +199,7 @@ sharp = FALSE w_class = WEIGHT_CLASS_SMALL extend = FALSE - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "materials=3;combat=3" attack_verb = list("hit", "poked") hitsound = "swing_hit" @@ -208,7 +208,7 @@ extend = !extend if(extend) to_chat(user, "With a flick of your wrist, you extend the scythe. It's reaping time!") - slot_flags = SLOT_FLAG_BACK //won't fit on belt, but can be worn on belt when extended + slot_flags = ITEM_SLOT_BACK //won't fit on belt, but can be worn on belt when extended w_class = WEIGHT_CLASS_BULKY //won't fit in backpacks while extended force = 15 //slightly better than normal scythe damage attack_verb = list("chopped", "sliced", "cut", "reaped") @@ -217,7 +217,7 @@ playsound(src.loc, 'sound/weapons/blade_unsheath.ogg', 50, 1) //Sound credit to Qat of Freesound.org else to_chat(user, "You collapse the scythe, folding it away for easy storage.") - slot_flags = SLOT_FLAG_BELT //can be worn on belt again, but no longer makes sense to wear on the back + slot_flags = ITEM_SLOT_BELT //can be worn on belt again, but no longer makes sense to wear on the back w_class = WEIGHT_CLASS_SMALL force = 3 attack_verb = list("hit", "poked") diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 8d6e08f6fcc8c..e98fd98a52b8f 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -427,8 +427,7 @@ if(copytext(name, 1, 13) == "experimental") // Don't delete 'experimental' N = "experimental " + N name = N + V - if(GetComponent(/datum/component/label)) - GetComponent(/datum/component/label).apply_label() // Don't delete labels + update_appearance(UPDATE_NAME) //Append name additives such as from labels diff --git a/code/modules/instruments/guitar.dm b/code/modules/instruments/guitar.dm index 25a3073e7a903..a03153e29063e 100644 --- a/code/modules/instruments/guitar.dm +++ b/code/modules/instruments/guitar.dm @@ -34,3 +34,21 @@ "48"='sound/instruments/synthesis_samples/guitar/crisis_muted/c3.ogg', "60"='sound/instruments/synthesis_samples/guitar/crisis_muted/c4.ogg', "72"='sound/instruments/synthesis_samples/guitar/crisis_muted/c5.ogg') + +/datum/instrument/guitar/synth_legacy // A synth version of legacy for efficiency. Better for crowded scores. + name = "Synth Legacy Guitar" + id = "sleggt" + real_samples = list("36"='sound/instruments/synthesis_samples/guitar/synth_legacy/cn3.ogg', + "48"='sound/instruments/synthesis_samples/guitar/synth_legacy/cn4.ogg', + "60"='sound/instruments/synthesis_samples/guitar/synth_legacy/cn5.ogg', + "72"='sound/instruments/synthesis_samples/guitar/synth_legacy/cn6.ogg') + +/datum/instrument/guitar/pgm_clean + name = "Pigments Clean Guitar" + id = "piclgt" + real_samples = list("36"='sound/instruments/synthesis_samples/guitar/pgm_clean/c3.ogg', + "48"='sound/instruments/synthesis_samples/guitar/pgm_clean/c4.ogg', + "60"='sound/instruments/synthesis_samples/guitar/pgm_clean/c5.ogg', + "72"='sound/instruments/synthesis_samples/guitar/pgm_clean/c6.ogg', + "84"='sound/instruments/synthesis_samples/guitar/pgm_clean/c7.ogg') + diff --git a/code/modules/instruments/objs/items/headphones.dm b/code/modules/instruments/objs/items/headphones.dm index 32373c5afb4df..fe0f4f54e9e6a 100644 --- a/code/modules/instruments/objs/items/headphones.dm +++ b/code/modules/instruments/objs/items/headphones.dm @@ -56,7 +56,7 @@ icon_state = item_state = "headphones[on]" /obj/item/clothing/ears/headphones/item_action_slot_check(slot) - if(slot == SLOT_HUD_LEFT_EAR || slot == SLOT_HUD_RIGHT_EAR) + if(slot & ITEM_SLOT_BOTH_EARS) return TRUE /** diff --git a/code/modules/instruments/objs/items/instrument_items.dm b/code/modules/instruments/objs/items/instrument_items.dm index a524685b7d96c..6ed3fe637c086 100644 --- a/code/modules/instruments/objs/items/instrument_items.dm +++ b/code/modules/instruments/objs/items/instrument_items.dm @@ -40,7 +40,7 @@ item_state = "guitar" attack_verb = list("played metal on", "serenaded", "crashed", "smashed") hitsound = 'sound/weapons/guitarslam.ogg' - allowed_instrument_ids = list("guitar", "csteelgt", "cnylongt", "ccleangt", "cmutedgt") + allowed_instrument_ids = list("guitar", "csteelgt", "cnylongt", "ccleangt", "cmutedgt", "sleggt", "piclgt") /// This is a special guitar for the emagged service borg that hits pretty hard and can still play music. Clonk. /obj/item/instrument/guitar/cyborg diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 275bfea1921cc..fa1e698c084d4 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -194,3 +194,46 @@ /obj/effect/mapping_helpers/airlock/windoor/autoname/desk/payload(obj/machinery/door/window/windoor) if(windoor.dir == dir) windoor.name = "[get_area_name(windoor, TRUE)] Desk" + +/obj/effect/mapping_helpers/turfs + icon = 'icons/turf/overlays.dmi' + +/obj/effect/mapping_helpers/turfs/Initialize(mapload) + . = ..() + + var/turf/T = get_turf(src) + if(istype(T)) + payload(T) + +/obj/effect/mapping_helpers/turfs/proc/payload(turf/simulated/T) + SHOULD_CALL_PARENT(FALSE) + CRASH("root turf mapping_helper payload called") + +/obj/effect/mapping_helpers/turfs/damage + icon_state = "damaged" + +/obj/effect/mapping_helpers/turfs/damage/payload(turf/simulated/T) + T.break_tile() + +/obj/effect/mapping_helpers/turfs/burn + icon_state = "burned" + +/obj/effect/mapping_helpers/turfs/burn/payload(turf/simulated/T) + T.burn_tile() + +/obj/effect/mapping_helpers/turfs/rust + icon_state = "rustwall" + var/spawn_probability = 100 + +/obj/effect/mapping_helpers/turfs/rust/payload(turf/simulated/wall/T) + if(!istype(T)) + return + + if(prob(spawn_probability)) + T.rust() + +/obj/effect/mapping_helpers/turfs/rust/probably + spawn_probability = 75 + +/obj/effect/mapping_helpers/turfs/rust/maybe + spawn_probability = 25 diff --git a/code/modules/mapping/station_datums.dm b/code/modules/mapping/station_datums.dm index b74e7d5c3e0a2..7ccc0d3633d5c 100644 --- a/code/modules/mapping/station_datums.dm +++ b/code/modules/mapping/station_datums.dm @@ -1,6 +1,6 @@ /datum/map/boxstation fluff_name = "NSS Cyberiad" - technical_name = "Cyberiad" + technical_name = "BoxStation" 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' @@ -14,7 +14,7 @@ /datum/map/deltastation fluff_name = "NSS Kerberos" - technical_name = "Delta" + technical_name = "DeltaStation" 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' diff --git a/code/modules/maptext_alerts/text_blurbs.dm b/code/modules/maptext_alerts/text_blurbs.dm index 285d39693c764..c4b8f2b95f37e 100644 --- a/code/modules/maptext_alerts/text_blurbs.dm +++ b/code/modules/maptext_alerts/text_blurbs.dm @@ -1,18 +1,26 @@ /** - Shows a ticker reading out the given text on a client's screen. - - targets = mob or list of mobs to show it to. - duration = how long it lingers after it finishes ticking. - message = the message to display. Due to using maptext it isn't very flexible format-wise. 11px font, up to 480 pixels per line. Use \n for line breaks. Single-character HTML tags (, , etc.) are handled correctly but others display strangely. Note that maptext can display text macros in strange ways, ex. \improper showing as "ÿ". Lines containing only spaces, including ones only containing "\improper ", don't display. - scroll_down = by default each line pushes the previous line upwards - this tells it to start high and scroll down. Ticks on \n - does not autodetect line breaks in long strings. - screen_position = screen loc for the bottom-left corner of the blurb. - text_alignment = "right", "left", or "center" - text_color = colour of the text. - blurb_key = a key used for specific blurb types so they are not shown repeatedly. - ignore_key = used to skip key checks. - text_limit = limit in characters of the message. + * Shows a ticker reading out the given text on a client's screen. + * + * Arguments: + * * targets - mob or list of mobs to show it to. + * * duration - how long it lingers after it finishes ticking. + * * message - the message to display. Due to using maptext it isn't very + * flexible format-wise. 11px font, up to 480 pixels per line. Use `\n` for + * line breaks. Single-character HTML tags (``, ``, `` etc.) are handled + * correctly but others display strangely. Note that maptext can display text + * macros in strange ways, ex. \improper showing as "ÿ". Lines containing + * only spaces, including ones only containing "\improper ", don't display. + * * scroll_down - by default each line pushes the previous line upwards - this + * tells it to start high and scroll down. Ticks on `\n` - does not autodetect + * line breaks in long strings. + * * screen_position - screen loc for the bottom-left corner of the blurb. + * * text_alignment - "right", "left", or "center" + * * text_color - colour of the text. + * * blurb_key - a key used for specific blurb types so they are not shown + * repeatedly. + * * ignore_key - used to skip key checks. + * * text_limit - limit in characters of the message. **/ - /proc/show_blurb(list/mob/targets, duration = 3 SECONDS, message, scroll_down, screen_position = "LEFT+0:16,BOTTOM+1:16", text_alignment = "left", text_color = "#FFFFFF", blurb_key, ignore_key = FALSE, speed = 1) set waitfor = 0 if(!islist(targets)) diff --git a/code/modules/martial_arts/bearserk.dm b/code/modules/martial_arts/bearserk.dm index 26fe0e196f63d..3c5833484ba1a 100644 --- a/code/modules/martial_arts/bearserk.dm +++ b/code/modules/martial_arts/bearserk.dm @@ -54,7 +54,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(slot == SLOT_HUD_HEAD) + if(slot == ITEM_SLOT_HEAD) style.teach(H, TRUE) H.faction |= "soviet" H.physiology.stun_mod *= 0.80 @@ -65,7 +65,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_HEAD) == src) + if(H.get_item_by_slot(ITEM_SLOT_HEAD) == src) style.remove(H) H.faction -= "soviet" H.physiology.stun_mod /= 0.80 diff --git a/code/modules/martial_arts/judo.dm b/code/modules/martial_arts/judo.dm index 74cae47d84c8c..5afe28e2856a8 100644 --- a/code/modules/martial_arts/judo.dm +++ b/code/modules/martial_arts/judo.dm @@ -45,7 +45,7 @@ /obj/item/storage/belt/judobelt/equipped(mob/user, slot) if(!ishuman(user)) return - if(slot == SLOT_HUD_BELT) + if(slot == ITEM_SLOT_BELT) var/mob/living/carbon/human/H = user if(HAS_TRAIT(user, TRAIT_PACIFISM)) to_chat(H, "The arts of Corporate Judo echo uselessly in your head, the thought of violence disgusts you!") @@ -60,7 +60,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_BELT) == src) + if(H.get_item_by_slot(ITEM_SLOT_BELT) == src) style.remove(H) to_chat(user, "You suddenly forget the arts of Corporate Judo...") diff --git a/code/modules/martial_arts/krav_maga.dm b/code/modules/martial_arts/krav_maga.dm index 3d9fd8645eb83..11badf02162a6 100644 --- a/code/modules/martial_arts/krav_maga.dm +++ b/code/modules/martial_arts/krav_maga.dm @@ -153,7 +153,7 @@ /obj/item/clothing/gloves/color/black/krav_maga/equipped(mob/user, slot) if(!ishuman(user)) return - if(slot == SLOT_HUD_GLOVES) + if(slot == ITEM_SLOT_GLOVES) var/mob/living/carbon/human/H = user style.teach(H, TRUE) @@ -162,7 +162,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_GLOVES) == src) + if(H.get_item_by_slot(ITEM_SLOT_GLOVES) == src) style.remove(H) // Warden gloves diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 2c5f594591612..9594dc9fdafd0 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -268,7 +268,7 @@ /obj/item/storage/belt/champion/wrestling/equipped(mob/user, slot) if(!ishuman(user)) return - if(slot == SLOT_HUD_BELT) + if(slot == ITEM_SLOT_BELT) var/mob/living/carbon/human/H = user if(HAS_TRAIT(user, TRAIT_PACIFISM)) to_chat(user, "In spite of the grandiosity of the belt, you don't feel like getting into any fights.") @@ -282,7 +282,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_BELT) == src) + if(H.get_item_by_slot(ITEM_SLOT_BELT) == src) style.remove(H) to_chat(user, "You no longer have an urge to flex your muscles.") @@ -369,7 +369,7 @@ righthand_file = 'icons/mob/inhands/staves_righthand.dmi' force = 10 w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK throwforce = 20 throw_speed = 2 attack_verb = list("smashed", "slammed", "whacked", "thwacked") diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 3442e7e98537f..6e8241f6dd1b5 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -11,7 +11,7 @@ item_state = "crusher0" force = 0 //You can't hit stuff unless wielded w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK throwforce = 5 throw_speed = 4 armour_penetration_flat = 10 @@ -510,9 +510,6 @@ chaser.monster_damage_boost = FALSE // Weaker due to no cooldown chaser.damage = 20 //But also stronger due to AI / mining mob resistance -/obj/effect/temp_visual/hierophant/wall/crusher - duration = 75 - /obj/item/crusher_trophy/adaptive_intelligence_core name = "adaptive intelligence core" desc = "Seems to be one of the cores from a massive robot. Suitable as a trophy for a kinetic crusher." diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm index 1d353d1309c8b..f0acc21cc5352 100644 --- a/code/modules/mining/equipment/marker_beacons.dm +++ b/code/modules/mining/equipment/marker_beacons.dm @@ -74,7 +74,8 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( name = "marker beacon" desc = "A Prism-brand path illumination device. It is anchored in place and glowing steadily." icon = 'icons/obj/lighting.dmi' - icon_state = "marker" + icon_state = "markerrandom" + base_icon_state = "marker" layer = BELOW_OPEN_DOOR_LAYER armor = list(MELEE = 50, BULLET = 75, LASER = 75, ENERGY = 75, BOMB = 25, RAD = 100, FIRE = 25, ACID = 0) max_integrity = 50 @@ -104,7 +105,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( /obj/structure/marker_beacon/update_icon_state() while(!picked_color || !GLOB.marker_beacon_colors[picked_color]) picked_color = pick(GLOB.marker_beacon_colors) - icon_state = "[initial(icon_state)][lowertext(picked_color)]-on" + icon_state = "[base_icon_state][lowertext(picked_color)]-on" set_light(light_range, light_power, GLOB.marker_beacon_colors[picked_color]) /obj/structure/marker_beacon/attack_hand(mob/living/user) @@ -150,6 +151,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( name = "docking beacon" desc = "An illumination device used to designate docking ports. It is anchored in place and pulsing steadily." icon_state = "dockingmarker" + base_icon_state = "dockingmarker" flags = NODECONSTRUCT /obj/structure/marker_beacon/dock_marker/update_icon_state() diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm index 77b915f942725..fe0fd5b0a7854 100644 --- a/code/modules/mining/equipment/mineral_scanner.dm +++ b/code/modules/mining/equipment/mineral_scanner.dm @@ -7,7 +7,7 @@ item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT var/cooldown = 35 var/current_cooldown = 0 @@ -37,7 +37,7 @@ item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT var/cooldown = 35 var/current_cooldown = 0 var/range = 7 @@ -75,6 +75,7 @@ plane = FULLSCREEN_PLANE layer = FLASH_LAYER icon = 'icons/effects/ore_visuals.dmi' + icon_state = null appearance_flags = 0 //to avoid having TILE_BOUND in the flags, so that the 480x480 icon states let you see it no matter where you are duration = 35 pixel_x = -224 diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 8a9bb832b883f..4d5a6e63d55bb 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/mining_tool.dmi' icon_state = "pickaxe" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 15 throwforce = 10 item_state = "pickaxe" @@ -130,7 +130,7 @@ icon = 'icons/obj/mining_tool.dmi' icon_state = "shovel" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 8 throwforce = 4 item_state = "shovel" diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 9f98316b5d2aa..03b66feb01185 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -99,6 +99,10 @@ icon = 'icons/obj/lavaland/survival_pod.dmi' icon_state = "pwindow" +/obj/structure/window/full/shuttle/survival_pod/tinted + name = "tinted pod window" + opacity = TRUE + //Floors /turf/simulated/floor/pod name = "pod floor" diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index 28e64797fd078..17cf4e80bd8f7 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -12,7 +12,7 @@ GLOBAL_LIST_EMPTY(wormhole_effect) throw_speed = 3 throw_range = 5 origin_tech = "bluespace=2" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT /obj/item/wormhole_jaunter/attack_self(mob/user) user.visible_message("[user.name] activates the [name]!") @@ -55,7 +55,7 @@ GLOBAL_LIST_EMPTY(wormhole_effect) qdel(src) /obj/item/wormhole_jaunter/proc/chasm_react(mob/user) - if(user.get_item_by_slot(SLOT_HUD_BELT) == src) + if(user.get_item_by_slot(ITEM_SLOT_BELT) == src) to_chat(user, "Your [name] activates, saving you from the chasm!") activate(user, FALSE) else diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index 04825b90b8389..f05c780505a4e 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -66,7 +66,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) to_chat(user, "You start attaching the pack to [A]...") if(do_after(user, 50, target = A)) to_chat(user, "You attach the pack to [A] and activate it.") - user.equip_to_slot_if_possible(src, SLOT_HUD_IN_BACKPACK, FALSE, TRUE) + user.equip_to_slot_if_possible(src, ITEM_SLOT_IN_BACKPACK, FALSE, TRUE) uses_left-- if(uses_left <= 0) user.drop_item(src) diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 9768e5d08e684..9780ef5a7c846 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -2,7 +2,8 @@ gender = PLURAL layer = PROJECTILE_HIT_THRESHHOLD_LAYER //sporangiums up don't shoot icon = 'icons/obj/lavaland/ash_flora.dmi' - icon_state = "l_mushroom" + icon_state = "l_mushroom1" + base_icon_state = "l_mushroom" name = "large mushrooms" desc = "A number of large mushrooms, covered in a faint layer of ash and what can only be spores." anchored = TRUE @@ -24,7 +25,7 @@ /obj/structure/flora/ash/Initialize(mapload) . = ..() - base_icon = "[icon_state][rand(1, 4)]" + base_icon = "[base_icon_state][rand(1, 4)]" icon_state = base_icon /obj/structure/flora/ash/proc/harvest(user) @@ -80,7 +81,8 @@ regrowth_time_low = 4200 /obj/structure/flora/ash/leaf_shroom - icon_state = "s_mushroom" + icon_state = "s_mushroom1" + base_icon_state = "s_mushroom" name = "leafy mushrooms" desc = "A number of mushrooms, each of which surrounds a greenish sporangium with a number of leaf-like structures." harvested_name = "leafless mushrooms" @@ -96,7 +98,8 @@ regrowth_time_high = 6000 /obj/structure/flora/ash/cap_shroom - icon_state = "r_mushroom" + icon_state = "r_mushroom1" + base_icon_state = "r_mushroom" name = "tall mushrooms" desc = "Several mushrooms, the larger of which have a ring of conks at the midpoint of their stems." harvested_name = "small mushrooms" @@ -111,7 +114,8 @@ regrowth_time_high = 5400 /obj/structure/flora/ash/stem_shroom - icon_state = "t_mushroom" + icon_state = "t_mushroom1" + base_icon_state = "t_mushroom" name = "numerous mushrooms" desc = "A large number of mushrooms, some of which have long, fleshy stems. They're radiating light!" light_range = 1.5 @@ -128,7 +132,8 @@ regrowth_time_high = 6000 /obj/structure/flora/ash/cacti - icon_state = "cactus" + icon_state = "cactus1" + base_icon_state = "cactus" name = "fruiting cacti" desc = "Several prickly cacti, brimming with ripe fruit and covered in a thin layer of ash." harvested_name = "cacti" @@ -156,6 +161,7 @@ name = "large rock" desc = "A volcanic rock. Pioneers used to ride these babies for miles." icon_state = "basalt1" + base_icon_state = "basalt" density = TRUE resistance_flags = FIRE_PROOF harvest = /obj/item/stack/ore/glass/basalt diff --git a/code/modules/mining/lavaland/loot/ashdragon_loot.dm b/code/modules/mining/lavaland/loot/ashdragon_loot.dm index 31f42bc2ef8b2..94fc152dab4ec 100644 --- a/code/modules/mining/lavaland/loot/ashdragon_loot.dm +++ b/code/modules/mining/lavaland/loot/ashdragon_loot.dm @@ -252,7 +252,7 @@ lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi' righthand_file = 'icons/mob/inhands/staves_righthand.dmi' item_state = "lavastaff" - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY force = 25 damtype = BURN diff --git a/code/modules/mining/lavaland/loot/hierophant_loot.dm b/code/modules/mining/lavaland/loot/hierophant_loot.dm index d5e747ed200dc..eaa7ecc93184c 100644 --- a/code/modules/mining/lavaland/loot/hierophant_loot.dm +++ b/code/modules/mining/lavaland/loot/hierophant_loot.dm @@ -10,7 +10,7 @@ righthand_file = 'icons/mob/inhands/64x64_righthand.dmi' inhand_x_dimension = 64 inhand_y_dimension = 64 - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY force = 15 attack_verb = list("clubbed", "beat", "pummeled") diff --git a/code/modules/mining/lavaland/loot/legion_loot.dm b/code/modules/mining/lavaland/loot/legion_loot.dm index 40c1e51167a32..4153ea14f90fc 100644 --- a/code/modules/mining/lavaland/loot/legion_loot.dm +++ b/code/modules/mining/lavaland/loot/legion_loot.dm @@ -6,7 +6,7 @@ righthand_file = 'icons/mob/inhands/staves_righthand.dmi' item_state = "staffofstorms" icon = 'icons/obj/guns/magic.dmi' - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY force = 25 damtype = BURN @@ -96,7 +96,7 @@ // This early return stops the staff from shooting lightning at someone when being used as a lighter. if(iscarbon(target)) var/mob/living/carbon/cig_haver = target - var/mask_item = cig_haver.get_item_by_slot(SLOT_HUD_WEAR_MASK) + var/mask_item = cig_haver.get_item_by_slot(ITEM_SLOT_MASK) if(istype(mask_item, /obj/item/clothing/mask/cigarette) && user.zone_selected == "mouth" && user.a_intent == INTENT_HELP) return diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm index 384e4c4cc9304..0f8f872a5a043 100644 --- a/code/modules/mining/lavaland/loot/tendril_loot.dm +++ b/code/modules/mining/lavaland/loot/tendril_loot.dm @@ -18,7 +18,7 @@ desc = "Somehow, it's in two places at once." icon = 'icons/obj/storage.dmi' icon_state = "cultpack" - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK resistance_flags = INDESTRUCTIBLE var/obj/item/storage/backpack/shared/bag @@ -344,6 +344,7 @@ desc = "a hook." projectile_type = /obj/item/projectile/hook caliber = "hook" + icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "hook" muzzle_flash_effect = null diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 682a21b7a0226..b9ec9519f975e 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -42,6 +42,10 @@ new /obj/item/clothing/suit/jacket/bomber/mining(src) new /obj/item/clothing/suit/hooded/wintercoat/miner(src) new /obj/item/clothing/suit/hooded/wintercoat/miner(src) + new /obj/item/clothing/head/helmet/space/plasmaman/mining(src) + new /obj/item/clothing/head/helmet/space/plasmaman/mining(src) + new /obj/item/clothing/under/plasmaman/mining(src) + new /obj/item/clothing/under/plasmaman/mining(src) /obj/structure/closet/secure_closet/miner name = "miner's equipment" diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm index fb50bc42bae8a..9f13488cba08c 100644 --- a/code/modules/mob/dead/observer/orbit.dm +++ b/code/modules/mob/dead/observer/orbit.dm @@ -13,7 +13,7 @@ GLOBAL_DATUM_INIT(orbit_menu, /datum/orbit_menu, new) /datum/orbit_menu/ui_assets(mob/user) return list( - get_asset_datum(/datum/asset/spritesheet/orbit_job) + get_asset_datum(/datum/asset/spritesheet/job_icons) ) /datum/orbit_menu/ui_act(action, list/params, datum/tgui/ui) diff --git a/code/modules/mob/inventory_procs.dm b/code/modules/mob/inventory_procs.dm index f38dabacd7e4d..725f7fd289525 100644 --- a/code/modules/mob/inventory_procs.dm +++ b/code/modules/mob/inventory_procs.dm @@ -61,9 +61,9 @@ /mob/proc/put_in_hand(obj/item/I, slot) switch(slot) - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) return put_in_l_hand(I) - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) return put_in_r_hand(I) //Puts the item into your l_hand if possible and calls all necessary triggers/updates. returns 1 on success. @@ -75,7 +75,7 @@ l_hand = W W.layer = ABOVE_HUD_LAYER //TODO: move to equipped? W.plane = ABOVE_HUD_PLANE //TODO: move to equipped? - W.equipped(src, SLOT_HUD_LEFT_HAND) + W.equipped(src, ITEM_SLOT_LEFT_HAND) if(pulling == W) stop_pulling() update_inv_l_hand() @@ -91,7 +91,7 @@ r_hand = W W.layer = ABOVE_HUD_LAYER W.plane = ABOVE_HUD_PLANE - W.equipped(src,SLOT_HUD_RIGHT_HAND) + W.equipped(src,ITEM_SLOT_RIGHT_HAND) if(pulling == W) stop_pulling() update_inv_r_hand() @@ -231,6 +231,8 @@ items += glasses if(gloves) items += gloves + if(neck) + items += neck if(shoes) items += shoes if(wear_id) @@ -277,17 +279,17 @@ S.handle_item_insertion(src, M) return TRUE - S = M.get_item_by_slot(SLOT_HUD_WEAR_ID) + S = M.get_item_by_slot(ITEM_SLOT_ID) if(istype(S) && S.can_be_inserted(src, TRUE)) //else we put in a wallet S.handle_item_insertion(src, M) return TRUE - S = M.get_item_by_slot(SLOT_HUD_BELT) + S = M.get_item_by_slot(ITEM_SLOT_BELT) if(istype(S) && S.can_be_inserted(src, TRUE)) //else we put in belt S.handle_item_insertion(src, M) return TRUE - var/obj/item/O = M.get_item_by_slot(SLOT_HUD_BACK) //else we put in backpack + var/obj/item/O = M.get_item_by_slot(ITEM_SLOT_BACK) //else we put in backpack if(istype(O, /obj/item/storage)) S = O if(S.can_be_inserted(src, TRUE)) @@ -315,16 +317,31 @@ /mob/proc/get_item_by_slot(slot_id) switch(slot_id) - if(SLOT_HUD_WEAR_MASK) + if(ITEM_SLOT_MASK) return wear_mask - if(SLOT_HUD_BACK) + if(ITEM_SLOT_BACK) return back - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) return l_hand - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) return r_hand return null +/mob/proc/get_slot_by_item(obj/item/looking_for) + if(looking_for == wear_mask) + return ITEM_SLOT_MASK + + if(looking_for == back) + return ITEM_SLOT_BACK + + if(looking_for == l_hand) + return ITEM_SLOT_LEFT_HAND + + if(looking_for == r_hand) + return ITEM_SLOT_RIGHT_HAND + + return null + //search for a path in inventory and storage items in that inventory (backpack, belt, etc) and return it. /mob/proc/find_item(path) var/list/L = get_contents() diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index c01cffefa31cf..3d12e23fe74e9 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -413,7 +413,7 @@ /datum/language/common name = "Galactic Common" - desc = "The common galactic tongue." + desc = "Originally a carefully crafted fusion of various Human and Skrell dialects, Galactic Common is the most commonly spoken language in the Sector, and incorporates influences from nearly every known sapient species." speech_verb = "says" exclaim_verbs = list("exclaims", "shouts", "yells") whisper_verb = "whispers" @@ -424,15 +424,16 @@ /datum/language/human name = "Sol Common" - desc = "A bastardized hybrid of informal English and elements of Mandarin Chinese; the common language of the Sol system." + desc = "An artifical language designed by the Trans-Solar Federation for ease of use and concise communication." speech_verb = "says" - exclaim_verbs = list("exclaims", "shouts", "yells") + exclaim_verbs = list("snaps", "shouts", "barks") whisper_verb = "whispers" colour = "solcom" key = "1" + space_chance = 70 flags = RESTRICTED - syllables = list("tao","shi","tzu","yi","com","be","is","i","op","vi","ed","lec","mo","cle","te","dis","e") - english_names = 1 + syllables = list("ba","da","ka","ki","to","ta","sa","so","a","e","i","o","u","am","on","na","in", + "ko",) // Galactic common languages (systemwide accepted standards). /datum/language/trader @@ -471,12 +472,13 @@ key = "0" syllables = list ("honk","squeak","bonk","toot","narf","zub","wee","wub","norf") +// SS220 EDIT START - Zvezhan -> Neo-Russkiya /datum/language/com_srus name = "Neo-Russkiya" desc = "Neo-Russkiya, a bastard mix of Gutter, Sol Common, and old Russian. The official language of the USSP. It has started to see use outside of the fringe in hobby circles and protest groups. The linguistic spirit of Sol-Gov criticisms." speech_verb = "articulates" whisper_verb = "mutters" - exclaim_verbs = list("exaggerates") + exclaim_verbs = list("proclaims", "boasts", "accentuates") colour = "com_srus" key = "?" space_chance = 65 @@ -490,6 +492,7 @@ "odasky","trov","niki","ivano","dostov","sokol","oupa","pervom","schel", "tizan","chka","tagan","dobry","okt","boda","veta","idi","cyk","blyt","hui","na", "udi","litchki","casa","linka","toly","anatov","vich","vech","vuch","toi","ka","vod") +// SS220 EDIT END - Zvezhan -> Neo-Russkiya /datum/language/xenocommon name = "Xenomorph" diff --git a/code/modules/mob/living/carbon/alien/alien_death.dm b/code/modules/mob/living/carbon/alien/alien_death.dm index 58be5381c5974..78c021f9bf529 100644 --- a/code/modules/mob/living/carbon/alien/alien_death.dm +++ b/code/modules/mob/living/carbon/alien/alien_death.dm @@ -26,7 +26,8 @@ var/atom/movable/thing = I.remove(src) if(thing) thing.forceMove(get_turf(src)) - thing.throw_at(get_edge_target_turf(src, pick(GLOB.alldirs)), rand(1, 3), 5) + if(!QDELETED(thing)) // This is in case moving to the turf deletes the atom. + thing.throw_at(get_edge_target_turf(src, pick(GLOB.alldirs)), rand(1, 3), 5) flick("gibbed-a", animation) xgibs(loc) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_inventory.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_inventory.dm index 6a929602998e6..7bef0ed3234b1 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_inventory.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_inventory.dm @@ -11,7 +11,7 @@ var/obj/item/W = get_active_hand() if(!W) switch(slot_id) - if(SLOT_HUD_OUTER_SUIT) + if(ITEM_SLOT_OUTER_SUIT) if(wear_suit) wear_suit.attack_alien(src) - if(SLOT_HUD_HEAD) + if(ITEM_SLOT_HEAD) if(head) head.attack_alien(src) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm index ac13fd82732fd..0f2ee12fcfce1 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm @@ -68,7 +68,7 @@ /mob/living/carbon/alien/humanoid/update_inv_wear_suit() if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_OUTER_SUIT] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_OUTER_SUIT)] inv.update_icon() if(wear_suit) diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 191ae69066601..39920b0cacef9 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -138,7 +138,7 @@ "[src] tears [W] off of [target]'s face!") src.loc = target - target.equip_to_slot_if_possible(src, SLOT_HUD_WEAR_MASK, FALSE, TRUE) + target.equip_to_slot_if_possible(src, ITEM_SLOT_MASK, FALSE, TRUE) if(!sterile) M.KnockDown(impregnation_time + 2 SECONDS) flags |= NODROP //You can't take it off until it dies... or figures out you're an IPC. diff --git a/code/modules/mob/living/carbon/carbon_procs.dm b/code/modules/mob/living/carbon/carbon_procs.dm index 6724f788eb7b9..57cca14845f84 100644 --- a/code/modules/mob/living/carbon/carbon_procs.dm +++ b/code/modules/mob/living/carbon/carbon_procs.dm @@ -580,6 +580,9 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven remove_ventcrawl() else if(is_ventcrawling(src)) + var/obj/machinery/atmospherics/atmos_machine = loc + if(!atmos_machine.can_see_pipes()) + return if(target_move) remove_ventcrawl_images() var/obj/machinery/atmospherics/current_pipe = loc @@ -768,22 +771,37 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven /mob/living/carbon/get_item_by_slot(slot_id) switch(slot_id) - if(SLOT_HUD_BACK) + if(ITEM_SLOT_BACK) return back - if(SLOT_HUD_WEAR_MASK) + if(ITEM_SLOT_MASK) return wear_mask - if(SLOT_HUD_OUTER_SUIT) + if(ITEM_SLOT_OUTER_SUIT) return wear_suit - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) return l_hand - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) return r_hand - if(SLOT_HUD_HANDCUFFED) + if(ITEM_SLOT_HANDCUFFED) return handcuffed - if(SLOT_HUD_LEGCUFFED) + if(ITEM_SLOT_LEGCUFFED) return legcuffed return null +/mob/living/carbon/get_slot_by_item(obj/item/looking_for) + if(looking_for == back) + return ITEM_SLOT_BACK + + // if(back && (looking_for in back)) + // return ITEM_SLOT_BACKPACK + + if(looking_for == wear_mask) + return ITEM_SLOT_MASK + + if(looking_for == head) + return ITEM_SLOT_HEAD + + return ..() + //generates realistic-ish pulse output based on preset levels /mob/living/carbon/proc/get_pulse() var/temp = 0 diff --git a/code/modules/mob/living/carbon/carbon_stripping.dm b/code/modules/mob/living/carbon/carbon_stripping.dm index e29abf475da8c..bb0c549726bac 100644 --- a/code/modules/mob/living/carbon/carbon_stripping.dm +++ b/code/modules/mob/living/carbon/carbon_stripping.dm @@ -1,10 +1,10 @@ /datum/strippable_item/mob_item_slot/head key = STRIPPABLE_ITEM_HEAD - item_slot = SLOT_HUD_HEAD + item_slot = ITEM_SLOT_HEAD /datum/strippable_item/mob_item_slot/back key = STRIPPABLE_ITEM_BACK - item_slot = SLOT_HUD_BACK + item_slot = ITEM_SLOT_BACK /datum/strippable_item/mob_item_slot/back/get_alternate_actions(atom/source, mob/user) return get_strippable_alternate_action_internals(get_item(source), source) @@ -16,7 +16,7 @@ /datum/strippable_item/mob_item_slot/mask key = STRIPPABLE_ITEM_MASK - item_slot = SLOT_HUD_WEAR_MASK + item_slot = ITEM_SLOT_MASK /datum/strippable_item/mob_item_slot/mask/get_body_action(atom/source, mob/user) if(!ishuman(source)) @@ -82,9 +82,13 @@ "[user] [muzzle.locked ? "locks" : "unlocks"] [source]'s [muzzle.name].") +/datum/strippable_item/mob_item_slot/neck + key = STRIPPABLE_ITEM_NECK + item_slot = ITEM_SLOT_NECK + /datum/strippable_item/mob_item_slot/handcuffs key = STRIPPABLE_ITEM_HANDCUFFS - item_slot = SLOT_HUD_HANDCUFFED + item_slot = ITEM_SLOT_HANDCUFFED /datum/strippable_item/mob_item_slot/handcuffs/should_show(atom/source, mob/user) if(!iscarbon(source)) @@ -99,7 +103,7 @@ /datum/strippable_item/mob_item_slot/legcuffs key = STRIPPABLE_ITEM_LEGCUFFS - item_slot = SLOT_HUD_LEGCUFFED + item_slot = ITEM_SLOT_LEGCUFFED /datum/strippable_item/mob_item_slot/legcuffs/should_show(atom/source, mob/user) if(!iscarbon(source)) @@ -173,8 +177,8 @@ /datum/strippable_item/hand/left key = STRIPPABLE_ITEM_LHAND - which_hand = SLOT_HUD_LEFT_HAND + which_hand = ITEM_SLOT_LEFT_HAND /datum/strippable_item/hand/right key = STRIPPABLE_ITEM_RHAND - which_hand = SLOT_HUD_RIGHT_HAND + which_hand = ITEM_SLOT_RIGHT_HAND diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index 203b7ae10d4ef..414130c96d5bf 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -12,7 +12,7 @@ final_pixel_y = pixel_y else //if(lying != 0) if(lying_prev == 0) //Standing to lying - final_pixel_y = PIXEL_Y_OFFSET_LYING + final_pixel_y = pixel_y + PIXEL_Y_OFFSET_LYING if(dir & (EAST|WEST)) //Facing east or west final_dir = pick(NORTH, SOUTH) //So you fall on your side rather than your face or ass if(resize != RESIZE_DEFAULT_SIZE) @@ -35,9 +35,9 @@ /mob/living/carbon/proc/update_hands_hud() if(!hud_used) return - var/atom/movable/screen/inventory/R = hud_used.inv_slots[SLOT_HUD_RIGHT_HAND] + var/atom/movable/screen/inventory/R = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_RIGHT_HAND)] R?.update_icon() - var/atom/movable/screen/inventory/L = hud_used.inv_slots[SLOT_HUD_LEFT_HAND] + var/atom/movable/screen/inventory/L = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_LEFT_HAND)] L?.update_icon() /mob/living/carbon/update_inv_r_hand(ignore_cuffs) @@ -66,8 +66,8 @@ update_hud_wear_mask(wear_mask) /mob/living/carbon/update_inv_back() - if(client && hud_used && hud_used.inv_slots[SLOT_HUD_BACK]) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_BACK] + if(client && hud_used && hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_BACK)]) + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_BACK)] inv.update_icon() if(back) diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 42511b04c4618..bba2f1c9e9fa6 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -208,7 +208,7 @@ var/just_sleeping = FALSE //We don't appear as dead upon casual examination, just sleeping if(stat == DEAD || HAS_TRAIT(src, TRAIT_FAKEDEATH)) - var/obj/item/clothing/glasses/E = get_item_by_slot(SLOT_HUD_GLASSES) + var/obj/item/clothing/glasses/E = get_item_by_slot(ITEM_SLOT_EYES) var/are_we_in_weekend_at_bernies = E?.tint && istype(buckled, /obj/structure/chair) //Are we in a chair with our eyes obscured? if(isliving(user) && are_we_in_weekend_at_bernies) diff --git a/code/modules/mob/living/carbon/human/human_death.dm b/code/modules/mob/living/carbon/human/human_death.dm index 3974719e7ec16..6a6b037d61b26 100644 --- a/code/modules/mob/living/carbon/human/human_death.dm +++ b/code/modules/mob/living/carbon/human/human_death.dm @@ -14,12 +14,14 @@ var/atom/movable/thing = I.remove(src) if(thing) thing.forceMove(get_turf(src)) - thing.throw_at(get_edge_target_turf(src, pick(GLOB.alldirs)), rand(1, 3), 5) + if(!QDELETED(thing)) // This is in case moving to the turf deletes the atom. + thing.throw_at(get_edge_target_turf(src, pick(GLOB.alldirs)), rand(1, 3), 5) for(var/obj/item/I in get_equipped_items(include_pockets = TRUE)) unEquip(I, TRUE) I.forceMove(get_turf(src)) - I.throw_at(get_edge_target_turf(src, pick(GLOB.alldirs)), rand(1, 3), 5) + if(!QDELETED(I)) // This is in case moving to the turf deletes the atom. + I.throw_at(get_edge_target_turf(src, pick(GLOB.alldirs)), rand(1, 3), 5) for(var/obj/item/organ/external/E in bodyparts) if(istype(E, /obj/item/organ/external/chest)) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index ceed21264053f..dc716c7d532f0 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -184,7 +184,7 @@ emp_act /mob/living/carbon/human/proc/getarmor_organ(obj/item/organ/external/def_zone, type) if(!type || !def_zone) return 0 var/protection = 0 - var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform, back, gloves, shoes, belt, s_store, glasses, l_ear, r_ear, wear_id) //Everything but pockets. Pockets are l_store and r_store. (if pockets were allowed, putting something armored, gloves or hats for example, would double up on the armor) + var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform, back, gloves, shoes, belt, s_store, glasses, l_ear, r_ear, wear_id, neck) //Everything but pockets. Pockets are l_store and r_store. (if pockets were allowed, putting something armored, gloves or hats for example, would double up on the armor) for(var/bp in body_parts) if(!bp) continue if(bp && isclothing(bp)) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 501eda399e798..e8933a1e8531f 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -45,6 +45,7 @@ var/obj/item/clothing/shoes = null var/obj/item/belt = null var/obj/item/clothing/gloves = null + var/obj/item/clothing/neck = null var/obj/item/clothing/glasses = null var/obj/item/l_ear = null var/obj/item/r_ear = null diff --git a/code/modules/mob/living/carbon/human/human_examine.dm b/code/modules/mob/living/carbon/human/human_examine.dm index b37224d7c0865..49cf383f55a56 100644 --- a/code/modules/mob/living/carbon/human/human_examine.dm +++ b/code/modules/mob/living/carbon/human/human_examine.dm @@ -3,6 +3,7 @@ list("[p_are()] holding", l_hand, "in", "left hand"), list("[p_are()] holding", r_hand, "in", "right hand"), list("[p_are()] wearing", head, "on", "head"), + list("[p_are()] wearing", neck, "around", "neck"), list("[p_are()] wearing", !skip_jumpsuit && w_uniform, null, null, length(w_uniform?.accessories) && "[english_accessory_list(w_uniform)]"), list("[p_are()] wearing", wear_suit, null, null), list("[p_are()] carrying", !skip_suit_storage && s_store, "on", wear_suit && wear_suit.name), diff --git a/code/modules/mob/living/carbon/human/human_inventory.dm b/code/modules/mob/living/carbon/human/human_inventory.dm index 206958d2e123b..56e1ca7d20e1c 100644 --- a/code/modules/mob/living/carbon/human/human_inventory.dm +++ b/code/modules/mob/living/carbon/human/human_inventory.dm @@ -20,50 +20,52 @@ /mob/living/carbon/human/proc/has_organ_for_slot(slot) switch(slot) - if(SLOT_HUD_BACK) + if(ITEM_SLOT_BACK) return has_organ("chest") - if(SLOT_HUD_WEAR_MASK) + if(ITEM_SLOT_MASK) return has_organ("head") - if(SLOT_HUD_HANDCUFFED) + if(ITEM_SLOT_NECK) + return has_organ("chest") + if(ITEM_SLOT_HANDCUFFED) return has_organ("l_hand") && has_organ("r_hand") - if(SLOT_HUD_LEGCUFFED) + if(ITEM_SLOT_LEGCUFFED) return has_organ("l_leg") && has_organ("r_leg") - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) return has_organ("l_hand") - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) return has_organ("r_hand") - if(SLOT_HUD_BELT) + if(ITEM_SLOT_BELT) return has_organ("chest") - if(SLOT_HUD_WEAR_ID) + if(ITEM_SLOT_ID) // the only relevant check for this is the uniform check return TRUE - if(SLOT_HUD_WEAR_PDA) + if(ITEM_SLOT_PDA) return TRUE - if(SLOT_HUD_LEFT_EAR) + if(ITEM_SLOT_LEFT_EAR) return has_organ("head") - if(SLOT_HUD_RIGHT_EAR) + if(ITEM_SLOT_RIGHT_EAR) return has_organ("head") - if(SLOT_HUD_GLASSES) + if(ITEM_SLOT_EYES) return has_organ("head") - if(SLOT_HUD_GLOVES) + if(ITEM_SLOT_GLOVES) return has_organ("l_hand") && has_organ("r_hand") - if(SLOT_HUD_HEAD) + if(ITEM_SLOT_HEAD) return has_organ("head") - if(SLOT_HUD_SHOES) + if(ITEM_SLOT_SHOES) return has_organ("r_foot") && has_organ("l_foot") - if(SLOT_HUD_OUTER_SUIT) + if(ITEM_SLOT_OUTER_SUIT) return has_organ("chest") - if(SLOT_HUD_JUMPSUIT) + if(ITEM_SLOT_JUMPSUIT) return has_organ("chest") - if(SLOT_HUD_LEFT_STORE) + if(ITEM_SLOT_LEFT_POCKET) return has_organ("chest") - if(SLOT_HUD_RIGHT_STORE) + if(ITEM_SLOT_RIGHT_POCKET) return has_organ("chest") - if(SLOT_HUD_SUIT_STORE) + if(ITEM_SLOT_SUIT_STORE) return has_organ("chest") - if(SLOT_HUD_IN_BACKPACK) + if(ITEM_SLOT_IN_BACKPACK) return TRUE - if(SLOT_HUD_TIE) + if(ITEM_SLOT_ACCESSORY) return TRUE /mob/living/carbon/human/unEquip(obj/item/I, force, silent = FALSE) @@ -79,6 +81,8 @@ update_inv_w_uniform() if(I.flags_inv & HIDESHOES) update_inv_shoes() + if(I.flags_inv & HIDEGLOVES) + update_inv_gloves() update_inv_wear_suit() else if(I == w_uniform) if(r_store) @@ -94,6 +98,9 @@ else if(I == gloves) gloves = null update_inv_gloves() + else if(I == neck) + neck = null + update_inv_neck() else if(I == glasses) glasses = null var/obj/item/clothing/glasses/G = I @@ -116,6 +123,8 @@ var/obj/item/clothing/head/hat = I if(hat.vision_flags || hat.see_in_dark || !isnull(hat.lighting_alpha)) update_sight() + if(I.flags_inv & HIDEEARS) + update_inv_ears() head_update(I) update_inv_head() update_misc_effects() @@ -139,6 +148,8 @@ update_head_accessory() if(internal && !get_organ_slot("breathing_tube")) internal = null + if(I.flags_inv & HIDEEARS) + update_inv_ears() wear_mask_update(I, toggle_off = FALSE) sec_hud_set_ID() update_misc_effects() @@ -187,7 +198,6 @@ src.r_hand = null update_inv_r_hand() - I.screen_loc = null if(client) client.screen -= I if(length(observers)) @@ -201,10 +211,10 @@ I.plane = ABOVE_HUD_PLANE switch(slot) - if(SLOT_HUD_BACK) + if(ITEM_SLOT_BACK) back = I update_inv_back() - if(SLOT_HUD_WEAR_MASK) + if(ITEM_SLOT_MASK) wear_mask = I if((wear_mask.flags & BLOCKHAIR) || (wear_mask.flags & BLOCKHEADHAIR)) update_hair() //rebuild hair @@ -212,51 +222,56 @@ update_head_accessory() if(length(hud_list)) sec_hud_set_ID() + if(wear_mask.flags_inv & HIDEEARS) + update_inv_ears() wear_mask_update(I, toggle_off = TRUE) update_misc_effects() update_inv_wear_mask() - if(SLOT_HUD_HANDCUFFED) + if(ITEM_SLOT_NECK) + neck = I + update_inv_neck() + if(ITEM_SLOT_HANDCUFFED) handcuffed = I update_inv_handcuffed() - if(SLOT_HUD_LEGCUFFED) + if(ITEM_SLOT_LEGCUFFED) legcuffed = I update_inv_legcuffed() - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) l_hand = I update_inv_l_hand() - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) r_hand = I update_inv_r_hand() - if(SLOT_HUD_BELT) + if(ITEM_SLOT_BELT) belt = I update_inv_belt() - if(SLOT_HUD_WEAR_ID) + if(ITEM_SLOT_ID) wear_id = I if(length(hud_list)) sec_hud_set_ID() update_inv_wear_id() - if(SLOT_HUD_WEAR_PDA) + if(ITEM_SLOT_PDA) wear_pda = I update_inv_wear_pda() - if(SLOT_HUD_LEFT_EAR) + if(ITEM_SLOT_LEFT_EAR) l_ear = I - if(l_ear.slot_flags & SLOT_FLAG_TWOEARS) - var/obj/item/clothing/ears/offear/O = new(I) - O.forceMove(src) - r_ear = O - O.layer = ABOVE_HUD_LAYER - O.plane = ABOVE_HUD_PLANE + // if(l_ear.slot_flags & ITEM_SLOT_LEFT_EAR) CHAP-TODO: ACTUALLY FIX OFFEARS OR REMOVE THEM COMPLETELY + // var/obj/item/clothing/ears/offear/O = new(I) + // O.forceMove(src) + // r_ear = O + // O.layer = ABOVE_HUD_LAYER + // O.plane = ABOVE_HUD_PLANE update_inv_ears() - if(SLOT_HUD_RIGHT_EAR) + if(ITEM_SLOT_RIGHT_EAR) r_ear = I - if(r_ear.slot_flags & SLOT_FLAG_TWOEARS) - var/obj/item/clothing/ears/offear/O = new(I) - O.forceMove(src) - l_ear = O - O.layer = ABOVE_HUD_LAYER - O.plane = ABOVE_HUD_PLANE + // if(r_ear.slot_flags & ITEM_SLOT_RIGHT_EAR) + // var/obj/item/clothing/ears/offear/O = new(I) + // O.forceMove(src) + // l_ear = O + // O.layer = ABOVE_HUD_LAYER + // O.plane = ABOVE_HUD_PLANE update_inv_ears() - if(SLOT_HUD_GLASSES) + if(ITEM_SLOT_EYES) glasses = I var/obj/item/clothing/glasses/G = I if(G.tint) @@ -267,10 +282,10 @@ update_sight() update_inv_glasses() update_client_colour() - if(SLOT_HUD_GLOVES) + if(ITEM_SLOT_GLOVES) gloves = I update_inv_gloves() - if(SLOT_HUD_HEAD) + if(ITEM_SLOT_HEAD) head = I if((head.flags & BLOCKHAIR) || (head.flags & BLOCKHEADHAIR)) update_hair() //rebuild hair @@ -282,29 +297,35 @@ if(hat.vision_flags || hat.see_in_dark || !isnull(hat.lighting_alpha)) update_sight() // this calls update_inv_head() on its own + if(head.flags_inv & HIDEEARS) + update_inv_ears() update_misc_effects() head_update(I) - if(SLOT_HUD_SHOES) + if(ITEM_SLOT_SHOES) shoes = I update_inv_shoes() - if(SLOT_HUD_OUTER_SUIT) + if(ITEM_SLOT_OUTER_SUIT) wear_suit = I + if(wear_suit.flags_inv & HIDEJUMPSUIT) + update_inv_w_uniform() if(wear_suit.flags_inv & HIDESHOES) update_inv_shoes() + if(wear_suit.flags_inv & HIDEGLOVES) + update_inv_gloves() update_inv_wear_suit() - if(SLOT_HUD_JUMPSUIT) + if(ITEM_SLOT_JUMPSUIT) w_uniform = I update_inv_w_uniform() - if(SLOT_HUD_LEFT_STORE) + if(ITEM_SLOT_LEFT_POCKET) l_store = I update_inv_pockets() - if(SLOT_HUD_RIGHT_STORE) + if(ITEM_SLOT_RIGHT_POCKET) r_store = I update_inv_pockets() - if(SLOT_HUD_SUIT_STORE) + if(ITEM_SLOT_SUIT_STORE) s_store = I update_inv_s_store() - if(SLOT_HUD_IN_BACKPACK) + if(ITEM_SLOT_IN_BACKPACK) if(get_active_hand() == I) unEquip(I) if(ismodcontrol(back)) @@ -313,12 +334,14 @@ I.forceMove(C.bag) else I.forceMove(back) - if(SLOT_HUD_TIE) + if(ITEM_SLOT_ACCESSORY) var/obj/item/clothing/under/uniform = src.w_uniform uniform.attackby(I, src) else to_chat(src, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!") + I.screen_loc = null + /mob/living/carbon/human/put_in_hands(obj/item/I) if(!I) return FALSE @@ -337,48 +360,92 @@ // Return the item currently in the slot ID /mob/living/carbon/human/get_item_by_slot(slot_id) switch(slot_id) - if(SLOT_HUD_BACK) + if(ITEM_SLOT_BACK) return back - if(SLOT_HUD_WEAR_MASK) + if(ITEM_SLOT_MASK) return wear_mask - if(SLOT_HUD_HANDCUFFED) + if(ITEM_SLOT_NECK) + return neck + if(ITEM_SLOT_HANDCUFFED) return handcuffed - if(SLOT_HUD_LEGCUFFED) + if(ITEM_SLOT_LEGCUFFED) return legcuffed - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) return l_hand - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) return r_hand - if(SLOT_HUD_BELT) + if(ITEM_SLOT_BELT) return belt - if(SLOT_HUD_WEAR_ID) + if(ITEM_SLOT_ID) return wear_id - if(SLOT_HUD_WEAR_PDA) + if(ITEM_SLOT_PDA) return wear_pda - if(SLOT_HUD_LEFT_EAR) + if(ITEM_SLOT_LEFT_EAR) return l_ear - if(SLOT_HUD_RIGHT_EAR) + if(ITEM_SLOT_RIGHT_EAR) return r_ear - if(SLOT_HUD_GLASSES) + if(ITEM_SLOT_EYES) return glasses - if(SLOT_HUD_GLOVES) + if(ITEM_SLOT_GLOVES) return gloves - if(SLOT_HUD_HEAD) + if(ITEM_SLOT_HEAD) return head - if(SLOT_HUD_SHOES) + if(ITEM_SLOT_SHOES) return shoes - if(SLOT_HUD_OUTER_SUIT) + if(ITEM_SLOT_OUTER_SUIT) return wear_suit - if(SLOT_HUD_JUMPSUIT) + if(ITEM_SLOT_JUMPSUIT) return w_uniform - if(SLOT_HUD_LEFT_STORE) + if(ITEM_SLOT_LEFT_POCKET) return l_store - if(SLOT_HUD_RIGHT_STORE) + if(ITEM_SLOT_RIGHT_POCKET) return r_store - if(SLOT_HUD_SUIT_STORE) + if(ITEM_SLOT_SUIT_STORE) return s_store return null +/mob/living/carbon/human/get_slot_by_item(obj/item/looking_for) + if(looking_for == belt) + return ITEM_SLOT_BELT + + if(looking_for == wear_id) + return ITEM_SLOT_ID + + if(looking_for == l_ear) + return ITEM_SLOT_LEFT_EAR + + if(looking_for == r_ear) + return ITEM_SLOT_RIGHT_EAR + + if(looking_for == glasses) + return ITEM_SLOT_EYES + + if(looking_for == gloves) + return ITEM_SLOT_GLOVES + + if(looking_for == head) + return ITEM_SLOT_HEAD + + if(looking_for == shoes) + return ITEM_SLOT_SHOES + + if(looking_for == wear_suit) + return ITEM_SLOT_OUTER_SUIT + + if(looking_for == w_uniform) + return ITEM_SLOT_JUMPSUIT + + if(looking_for == r_store) + return ITEM_SLOT_BOTH_POCKETS + + if(looking_for == l_store) + return ITEM_SLOT_BOTH_POCKETS + + // if(looking_for == s_store) + // return ITEM_SLOT_SUIT_STORE + + return ..() + /mob/living/carbon/human/get_all_slots() . = get_body_slots() | get_head_slots() diff --git a/code/modules/mob/living/carbon/human/human_life.dm b/code/modules/mob/living/carbon/human/human_life.dm index 4bf4fb59467c7..5c3ed44d754a1 100644 --- a/code/modules/mob/living/carbon/human/human_life.dm +++ b/code/modules/mob/living/carbon/human/human_life.dm @@ -403,6 +403,9 @@ if(gloves) if(gloves.max_heat_protection_temperature && gloves.max_heat_protection_temperature >= temperature) thermal_protection_flags |= gloves.heat_protection + if(neck) + if(neck.max_heat_protection_temperature && neck.max_heat_protection_temperature >= temperature) + thermal_protection_flags |= neck.heat_protection if(wear_mask) if(wear_mask.max_heat_protection_temperature && wear_mask.max_heat_protection_temperature >= temperature) thermal_protection_flags |= wear_mask.heat_protection @@ -464,6 +467,9 @@ if(gloves) if(gloves.min_cold_protection_temperature && gloves.min_cold_protection_temperature <= temperature) thermal_protection_flags |= gloves.cold_protection + if(neck) + if(neck.min_cold_protection_temperature && neck.min_cold_protection_temperature <= temperature) + thermal_protection_flags |= neck.cold_protection if(wear_mask) if(wear_mask.min_cold_protection_temperature && wear_mask.min_cold_protection_temperature <= temperature) thermal_protection_flags |= wear_mask.cold_protection @@ -578,6 +584,8 @@ covered |= shoes.body_parts_covered if(gloves) covered |= gloves.body_parts_covered + if(neck) + covered |= neck.body_parts_covered if(wear_mask) covered |= wear_mask.body_parts_covered diff --git a/code/modules/mob/living/carbon/human/human_mob.dm b/code/modules/mob/living/carbon/human/human_mob.dm index 3a60dd0fa12b5..f8350cd3adb75 100644 --- a/code/modules/mob/living/carbon/human/human_mob.dm +++ b/code/modules/mob/living/carbon/human/human_mob.dm @@ -805,7 +805,7 @@ xylophone=0 return -/mob/living/carbon/human/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE, piercing = FALSE) +/mob/living/carbon/human/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE, penetrate_everything = FALSE) . = TRUE if(!target_zone) @@ -815,12 +815,6 @@ else target_zone = user.zone_selected - if(HAS_TRAIT(src, TRAIT_PIERCEIMMUNE)) - . = FALSE - - if(wear_suit && HAS_TRAIT(wear_suit, TRAIT_RSG_IMMUNE)) - return FALSE - var/obj/item/organ/external/affecting = get_organ(target_zone) var/fail_msg if(!affecting) @@ -830,9 +824,16 @@ . = FALSE fail_msg = "That limb is robotic." - if(piercing) + // If there is flesh, inject. + if(penetrate_everything) return TRUE + if(HAS_TRAIT(src, TRAIT_PIERCEIMMUNE)) + . = FALSE + + if(wear_suit && HAS_TRAIT(wear_suit, TRAIT_RSG_IMMUNE)) + . = FALSE + if(target_zone == "head") if((head?.flags & THICKMATERIAL) && !penetrate_thick) . = FALSE @@ -844,30 +845,34 @@ fail_msg = "There is no exposed flesh or thin material [target_zone == "head" ? "on [p_their()] head" : "on [p_their()] body"] to inject into." to_chat(user, "[fail_msg]") +/// +/** + * Gets the obscured ITEM_SLOTs on a human + * + * Returns: + * * A bitfield containing the ITEM_SLOTS bitflags that are obscured. + */ /mob/living/carbon/human/proc/check_obscured_slots() - var/list/obscured = list() + var/obscured = NONE if(wear_suit) if(wear_suit.flags_inv & HIDEGLOVES) - obscured |= SLOT_HUD_GLOVES + obscured |= ITEM_SLOT_GLOVES if(wear_suit.flags_inv & HIDEJUMPSUIT) - obscured |= SLOT_HUD_JUMPSUIT + obscured |= ITEM_SLOT_JUMPSUIT if(wear_suit.flags_inv & HIDESHOES) - obscured |= SLOT_HUD_SHOES + obscured |= ITEM_SLOT_SHOES if(head) if(head.flags_inv & HIDEMASK) - obscured |= SLOT_HUD_WEAR_MASK + obscured |= ITEM_SLOT_MASK if(head.flags_inv & HIDEEYES) - obscured |= SLOT_HUD_GLASSES + obscured |= ITEM_SLOT_EYES if(head.flags_inv & HIDEEARS) - obscured |= SLOT_HUD_RIGHT_EAR - obscured |= SLOT_HUD_LEFT_EAR + obscured |= ITEM_SLOT_BOTH_EARS - if(length(obscured) > 0) + if(obscured) return obscured - else - return null /mob/living/carbon/human/proc/check_has_mouth() // Todo, check stomach organ when implemented. @@ -877,9 +882,8 @@ return TRUE /mob/living/carbon/human/proc/get_visible_gender() - var/list/obscured = check_obscured_slots() var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) - if((SLOT_HUD_JUMPSUIT in obscured) && skipface) + if(skipface && (check_obscured_slots() & ITEM_SLOT_JUMPSUIT)) return PLURAL return gender @@ -928,7 +932,7 @@ if(!(organ in types_of_int_organs)) //If the mob is missing this particular organ... var/obj/item/organ/internal/I = new organ(temp_holder) //Create the organ inside our holder so we can check it before implantation. if(H.get_organ_slot(I.slot)) //Check to see if the user already has an organ in the slot the 'missing organ' belongs to. If they do, skip implantation. - continue //In an example, this will prevent duplication of the mob's eyes if the mob is a Human and they have Nucleation eyes, since, + continue //In an example, this will prevent duplication of the mob's eyes if the mob is a Human and they have Nian eyes, since, //while the organ in the eyes slot may not be listed in the mob's species' organs definition, it is still viable and fits in the appropriate organ slot. else I = new organ(H) //Create the organ inside the player. @@ -1107,7 +1111,7 @@ if(!(dna.species.bodyflags & HAS_SKIN_TONE)) s_tone = 0 - var/list/thing_to_check = list(SLOT_HUD_WEAR_MASK, SLOT_HUD_HEAD, SLOT_HUD_SHOES, SLOT_HUD_GLOVES, SLOT_HUD_LEFT_EAR, SLOT_HUD_RIGHT_EAR, SLOT_HUD_GLASSES, SLOT_HUD_LEFT_HAND, SLOT_HUD_RIGHT_HAND) + var/list/thing_to_check = list(ITEM_SLOT_MASK, ITEM_SLOT_HEAD, ITEM_SLOT_SHOES, ITEM_SLOT_GLOVES, ITEM_SLOT_LEFT_EAR, ITEM_SLOT_RIGHT_EAR, ITEM_SLOT_EYES, ITEM_SLOT_LEFT_HAND, ITEM_SLOT_RIGHT_HAND, ITEM_SLOT_NECK) var/list/kept_items[0] var/list/item_flags[0] for(var/thing in thing_to_check) @@ -1777,8 +1781,8 @@ Eyes need to have significantly high darksight to shine unless the mob has the X organs_list[O.name] = O.serialize() // Equipment - equip_list.len = SLOT_HUD_AMOUNT - for(var/i = 1, i < SLOT_HUD_AMOUNT, i++) + equip_list.len = ITEM_SLOT_AMOUNT + for(var/i = 1, i < ITEM_SLOT_AMOUNT, i++) var/obj/item/thing = get_item_by_slot(i) if(thing != null) equip_list[i] = thing.serialize() @@ -1837,16 +1841,16 @@ Eyes need to have significantly high darksight to shine unless the mob has the X // #1: Jumpsuit // #2: Outer suit // #3+: Everything else - if(islist(equip_list[SLOT_HUD_JUMPSUIT])) - var/obj/item/clothing/C = list_to_object(equip_list[SLOT_HUD_JUMPSUIT], T) - equip_to_slot_if_possible(C, SLOT_HUD_JUMPSUIT) + if(islist(equip_list[ITEM_SLOT_JUMPSUIT])) + var/obj/item/clothing/C = list_to_object(equip_list[ITEM_SLOT_JUMPSUIT], T) + equip_to_slot_if_possible(C, ITEM_SLOT_JUMPSUIT) - if(islist(equip_list[SLOT_HUD_OUTER_SUIT])) - var/obj/item/clothing/C = list_to_object(equip_list[SLOT_HUD_OUTER_SUIT], T) - equip_to_slot_if_possible(C, SLOT_HUD_OUTER_SUIT) + if(islist(equip_list[ITEM_SLOT_OUTER_SUIT])) + var/obj/item/clothing/C = list_to_object(equip_list[ITEM_SLOT_OUTER_SUIT], T) + equip_to_slot_if_possible(C, ITEM_SLOT_OUTER_SUIT) - for(var/i = 1, i < SLOT_HUD_AMOUNT, i++) - if(i == SLOT_HUD_JUMPSUIT || i == SLOT_HUD_OUTER_SUIT) + for(var/i = 1, i < ITEM_SLOT_AMOUNT, i++) + if(i == ITEM_SLOT_JUMPSUIT || i == ITEM_SLOT_OUTER_SUIT) continue if(islist(equip_list[i])) var/obj/item/clothing/C = list_to_object(equip_list[i], T) diff --git a/code/modules/mob/living/carbon/human/human_stripping.dm b/code/modules/mob/living/carbon/human/human_stripping.dm index 1e159ce42c688..83e5084757f18 100644 --- a/code/modules/mob/living/carbon/human/human_stripping.dm +++ b/code/modules/mob/living/carbon/human/human_stripping.dm @@ -5,6 +5,7 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( /datum/strippable_item/mob_item_slot/head, /datum/strippable_item/mob_item_slot/back, /datum/strippable_item/mob_item_slot/mask, + /datum/strippable_item/mob_item_slot/neck, /datum/strippable_item/mob_item_slot/eyes, /datum/strippable_item/mob_item_slot/left_ear, /datum/strippable_item/mob_item_slot/right_ear, @@ -26,11 +27,11 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( /datum/strippable_item/mob_item_slot/eyes key = STRIPPABLE_ITEM_EYES - item_slot = SLOT_HUD_GLASSES + item_slot = ITEM_SLOT_EYES /datum/strippable_item/mob_item_slot/jumpsuit key = STRIPPABLE_ITEM_JUMPSUIT - item_slot = SLOT_HUD_JUMPSUIT + item_slot = ITEM_SLOT_JUMPSUIT /datum/strippable_item/mob_item_slot/jumpsuit/get_alternate_actions(atom/source, mob/user) var/list/multiple_options = list() @@ -74,27 +75,27 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( /datum/strippable_item/mob_item_slot/left_ear key = STRIPPABLE_ITEM_L_EAR - item_slot = SLOT_HUD_LEFT_EAR + item_slot = ITEM_SLOT_LEFT_EAR /datum/strippable_item/mob_item_slot/right_ear key = STRIPPABLE_ITEM_R_EAR - item_slot = SLOT_HUD_RIGHT_EAR + item_slot = ITEM_SLOT_RIGHT_EAR /datum/strippable_item/mob_item_slot/suit key = STRIPPABLE_ITEM_SUIT - item_slot = SLOT_HUD_OUTER_SUIT + item_slot = ITEM_SLOT_OUTER_SUIT /datum/strippable_item/mob_item_slot/gloves key = STRIPPABLE_ITEM_GLOVES - item_slot = SLOT_HUD_GLOVES + item_slot = ITEM_SLOT_GLOVES /datum/strippable_item/mob_item_slot/feet key = STRIPPABLE_ITEM_FEET - item_slot = SLOT_HUD_SHOES + item_slot = ITEM_SLOT_SHOES /datum/strippable_item/mob_item_slot/suit_storage key = STRIPPABLE_ITEM_SUIT_STORAGE - item_slot = SLOT_HUD_SUIT_STORE + item_slot = ITEM_SLOT_SUIT_STORE /datum/strippable_item/mob_item_slot/suit_storage/get_alternate_actions(atom/source, mob/user) return get_strippable_alternate_action_internals(get_item(source), source) @@ -106,11 +107,11 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( /datum/strippable_item/mob_item_slot/id key = STRIPPABLE_ITEM_ID - item_slot = SLOT_HUD_WEAR_ID + item_slot = ITEM_SLOT_ID /datum/strippable_item/mob_item_slot/pda key = STRIPPABLE_ITEM_PDA - item_slot = SLOT_HUD_WEAR_PDA + item_slot = ITEM_SLOT_PDA /datum/strippable_item/mob_item_slot/pda/get_obscuring(atom/source) return isnull(get_item(source)) \ @@ -119,7 +120,7 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( /datum/strippable_item/mob_item_slot/belt key = STRIPPABLE_ITEM_BELT - item_slot = SLOT_HUD_BELT + item_slot = ITEM_SLOT_BELT /datum/strippable_item/mob_item_slot/belt/get_alternate_actions(atom/source, mob/user) return get_strippable_alternate_action_internals(get_item(source), source) @@ -168,12 +169,12 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( /datum/strippable_item/mob_item_slot/pocket/left key = STRIPPABLE_ITEM_LPOCKET - item_slot = SLOT_HUD_LEFT_STORE + item_slot = ITEM_SLOT_LEFT_POCKET pocket_side = "left" /datum/strippable_item/mob_item_slot/pocket/right key = STRIPPABLE_ITEM_RPOCKET - item_slot = SLOT_HUD_RIGHT_STORE + item_slot = ITEM_SLOT_RIGHT_POCKET pocket_side = "right" /proc/get_strippable_alternate_action_internals(obj/item/item, atom/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 52db0245ce1c0..b28bf42d048d2 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -539,6 +539,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) update_inv_w_uniform() update_inv_wear_id() update_inv_gloves() + update_inv_neck() update_inv_glasses() update_inv_ears() update_inv_shoes() @@ -574,45 +575,47 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_w_uniform() remove_overlay(UNIFORM_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_JUMPSUIT] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_JUMPSUIT)] if(inv) inv.update_icon() if(w_uniform && istype(w_uniform, /obj/item/clothing/under)) update_hud_uniform(w_uniform) - var/t_color = w_uniform.item_color - if(!t_color) - t_color = icon_state + if(!wear_suit || !(wear_suit.flags_inv & HIDEJUMPSUIT)) - var/mutable_appearance/standing = mutable_appearance('icons/mob/clothing/under/misc.dmi', "[t_color]_s", layer = -UNIFORM_LAYER) + var/t_color = w_uniform.item_color + if(!t_color) + t_color = icon_state - if(w_uniform.icon_override) - standing.icon = w_uniform.icon_override - if(w_uniform.sprite_sheets) - standing.icon = w_uniform.sprite_sheets["Human"] - if(w_uniform.sprite_sheets[dna.species.sprite_sheet_name] && icon_exists(w_uniform.sprite_sheets[dna.species.sprite_sheet_name], "[t_color]_s")) - standing.icon = w_uniform.sprite_sheets[dna.species.sprite_sheet_name] + var/mutable_appearance/standing = mutable_appearance('icons/mob/clothing/under/misc.dmi', "[t_color]_s", layer = -UNIFORM_LAYER) - if(w_uniform.blood_DNA) - var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "uniformblood") - bloodsies.color = w_uniform.blood_color - standing.overlays += bloodsies + if(w_uniform.icon_override) + standing.icon = w_uniform.icon_override + if(w_uniform.sprite_sheets) + standing.icon = w_uniform.sprite_sheets["Human"] + if(w_uniform.sprite_sheets[dna.species.sprite_sheet_name] && icon_exists(w_uniform.sprite_sheets[dna.species.sprite_sheet_name], "[t_color]_s")) + standing.icon = w_uniform.sprite_sheets[dna.species.sprite_sheet_name] - if(length(w_uniform.accessories)) //WE CHECKED THE TYPE ABOVE. THIS REALLY SHOULD BE FINE. // oh my god kys whoever made this if statement jfc :gun: - for(var/obj/item/clothing/accessory/A in w_uniform:accessories) - var/tie_color = A.item_color - if(!tie_color) - tie_color = A.icon_state - if(A.icon_override) - standing.overlays += image("icon" = A.icon_override, "icon_state" = "[A.icon_state]") - else if(A.sprite_sheets && A.sprite_sheets[dna.species.sprite_sheet_name]) - standing.overlays += image("icon" = A.sprite_sheets[dna.species.sprite_sheet_name], "icon_state" = "[A.icon_state]") - else - standing.overlays += image("icon" = 'icons/mob/ties.dmi', "icon_state" = "[tie_color]") - standing.alpha = w_uniform.alpha - standing.color = w_uniform.color - overlays_standing[UNIFORM_LAYER] = standing + if(w_uniform.blood_DNA) + var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "uniformblood") + bloodsies.color = w_uniform.blood_color + standing.overlays += bloodsies + + if(length(w_uniform.accessories)) //WE CHECKED THE TYPE ABOVE. THIS REALLY SHOULD BE FINE. // oh my god kys whoever made this if statement jfc :gun: + for(var/obj/item/clothing/accessory/A in w_uniform:accessories) + var/tie_color = A.item_color + if(!tie_color) + tie_color = A.icon_state + if(A.icon_override) + standing.overlays += image("icon" = A.icon_override, "icon_state" = "[A.icon_state]") + else if(A.sprite_sheets && A.sprite_sheets[dna.species.sprite_sheet_name]) + standing.overlays += image("icon" = A.sprite_sheets[dna.species.sprite_sheet_name], "icon_state" = "[A.icon_state]") + else + standing.overlays += image("icon" = 'icons/mob/ties.dmi', "icon_state" = "[tie_color]") + standing.alpha = w_uniform.alpha + standing.color = w_uniform.color + overlays_standing[UNIFORM_LAYER] = standing else if(!dna.species.nojumpsuit) var/list/uniform_slots = list() @@ -648,7 +651,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_wear_id() remove_overlay(ID_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_ID] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_ID)] if(inv) inv.update_icon() @@ -664,29 +667,31 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) remove_overlay(L_HAND_BLOOD_LAYER) remove_overlay(R_HAND_BLOOD_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_GLOVES] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_GLOVES)] if(inv) inv.update_icon() if(gloves) update_hud_gloves(gloves) - var/t_state = gloves.item_state - if(!t_state) t_state = gloves.icon_state + if(!wear_suit || !(wear_suit.flags_inv & HIDEGLOVES)) - var/mutable_appearance/standing - if(gloves.icon_override) - standing = mutable_appearance(gloves.icon_override, "[gloves.icon_state]", layer = -GLOVES_LAYER) - else if(gloves.sprite_sheets && gloves.sprite_sheets[dna.species.sprite_sheet_name]) - standing = mutable_appearance(gloves.sprite_sheets[dna.species.sprite_sheet_name], "[t_state]", layer = -GLOVES_LAYER) - else - standing = mutable_appearance('icons/mob/clothing/hands.dmi', "[t_state]", layer = -GLOVES_LAYER) + var/t_state = gloves.item_state + if(!t_state) t_state = gloves.icon_state - if(gloves.blood_DNA) // No need to check for hands here because we won't have gloves on. - var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "bloodyhands") - bloodsies.color = gloves.blood_color - standing.overlays += bloodsies - overlays_standing[GLOVES_LAYER] = standing + var/mutable_appearance/standing + if(gloves.icon_override) + standing = mutable_appearance(gloves.icon_override, "[gloves.icon_state]", layer = -GLOVES_LAYER) + else if(gloves.sprite_sheets && gloves.sprite_sheets[dna.species.sprite_sheet_name]) + standing = mutable_appearance(gloves.sprite_sheets[dna.species.sprite_sheet_name], "[t_state]", layer = -GLOVES_LAYER) + else + standing = mutable_appearance('icons/mob/clothing/hands.dmi', "[t_state]", layer = -GLOVES_LAYER) + + if(gloves.blood_DNA) // No need to check for hands here because we won't have gloves on. + var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "bloodyhands") + bloodsies.color = gloves.blood_color + standing.overlays += bloodsies + overlays_standing[GLOVES_LAYER] = standing else if(blood_DNA) // Checks for hands to make sure we don't get mysterious floating blood. if(get_organ("l_hand")) @@ -708,7 +713,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) remove_overlay(OVER_MASK_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_GLASSES] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_EYES)] if(inv) inv.update_icon() @@ -745,8 +750,8 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) remove_overlay(RIGHT_EAR_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/left_ear_inv = hud_used.inv_slots[SLOT_HUD_LEFT_EAR] - var/atom/movable/screen/inventory/right_ear_inv = hud_used.inv_slots[SLOT_HUD_RIGHT_EAR] + var/atom/movable/screen/inventory/left_ear_inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_LEFT_EAR)] + var/atom/movable/screen/inventory/right_ear_inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_RIGHT_EAR)] if(left_ear_inv) left_ear_inv.update_icon() if(right_ear_inv) @@ -755,28 +760,32 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(l_ear) update_hud_l_ear(l_ear) - var/left_ear_item_state = l_ear.item_state ? l_ear.item_state : l_ear.icon_state - var/left_ear_icon = 'icons/mob/clothing/ears.dmi' - if(l_ear.sprite_sheets && l_ear.sprite_sheets[dna.species.sprite_sheet_name]) - left_ear_icon = l_ear.sprite_sheets[dna.species.sprite_sheet_name] - if(l_ear.icon_override) - left_ear_item_state = "[left_ear_item_state]_l" - left_ear_icon = l_ear.icon_override + if((!head || !(head.flags_inv & HIDEEARS)) && (!wear_mask || !(wear_mask.flags_inv & HIDEEARS))) - overlays_standing[LEFT_EAR_LAYER] = mutable_appearance(left_ear_icon, left_ear_item_state, layer = -LEFT_EAR_LAYER) + var/left_ear_item_state = l_ear.item_state ? l_ear.item_state : l_ear.icon_state + var/left_ear_icon = 'icons/mob/clothing/ears.dmi' + if(l_ear.sprite_sheets && l_ear.sprite_sheets[dna.species.sprite_sheet_name]) + left_ear_icon = l_ear.sprite_sheets[dna.species.sprite_sheet_name] + if(l_ear.icon_override) + left_ear_item_state = "[left_ear_item_state]_l" + left_ear_icon = l_ear.icon_override + + overlays_standing[LEFT_EAR_LAYER] = mutable_appearance(left_ear_icon, left_ear_item_state, layer = -LEFT_EAR_LAYER) if(r_ear) update_hud_r_ear(r_ear) - var/right_ear_item_state = r_ear.item_state ? r_ear.item_state : r_ear.icon_state - var/right_ear_icon = 'icons/mob/clothing/ears.dmi' - if(r_ear.sprite_sheets && r_ear.sprite_sheets[dna.species.sprite_sheet_name]) - right_ear_icon = r_ear.sprite_sheets[dna.species.sprite_sheet_name] - if(r_ear.icon_override) - right_ear_icon = "[right_ear_item_state]_l" - right_ear_icon = r_ear.icon_override + if((!head || !(head.flags_inv & HIDEEARS)) && (!wear_mask || !(wear_mask.flags_inv & HIDEEARS))) + + var/right_ear_item_state = r_ear.item_state ? r_ear.item_state : r_ear.icon_state + var/right_ear_icon = 'icons/mob/clothing/ears.dmi' + if(r_ear.sprite_sheets && r_ear.sprite_sheets[dna.species.sprite_sheet_name]) + right_ear_icon = r_ear.sprite_sheets[dna.species.sprite_sheet_name] + if(r_ear.icon_override) + right_ear_icon = "[right_ear_item_state]_l" + right_ear_icon = r_ear.icon_override - overlays_standing[RIGHT_EAR_LAYER] = mutable_appearance(right_ear_icon, right_ear_item_state, layer = -RIGHT_EAR_LAYER) + overlays_standing[RIGHT_EAR_LAYER] = mutable_appearance(right_ear_icon, right_ear_item_state, layer = -RIGHT_EAR_LAYER) apply_overlay(LEFT_EAR_LAYER) apply_overlay(RIGHT_EAR_LAYER) @@ -786,7 +795,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) remove_overlay(L_FOOT_BLOOD_LAYER) remove_overlay(R_FOOT_BLOOD_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_SHOES] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_SHOES)] if(inv) inv.update_icon() @@ -826,7 +835,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_s_store() remove_overlay(SUIT_STORE_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_SUIT_STORE] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_SUIT_STORE)] if(inv) inv.update_icon() @@ -846,7 +855,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) ..() remove_overlay(HEAD_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_HEAD] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_HEAD)] if(inv) inv.update_icon() @@ -900,7 +909,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) - /obj/item/claymore/.. */ if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_BELT] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_BELT)] if(inv) inv.update_icon() @@ -939,7 +948,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_wear_suit() remove_overlay(SUIT_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_OUTER_SUIT] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_OUTER_SUIT)] if(inv) inv.update_icon() @@ -982,11 +991,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(client && hud_used) var/atom/movable/screen/inventory/inv - inv = hud_used.inv_slots[SLOT_HUD_LEFT_STORE] + inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_LEFT_POCKET)] if(inv) inv.update_icon() - inv = hud_used.inv_slots[SLOT_HUD_RIGHT_STORE] + inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_RIGHT_POCKET)] if(inv) inv.update_icon() @@ -1006,7 +1015,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_wear_pda() if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_PDA] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_PDA)] if(inv) inv.update_icon() @@ -1017,12 +1026,12 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) ..() remove_overlay(FACEMASK_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_MASK] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_MASK)] if(inv) inv.update_icon() if(wear_mask && (istype(wear_mask, /obj/item/clothing/mask) || istype(wear_mask, /obj/item/clothing/accessory))) update_hud_wear_mask(wear_mask) - if(!(SLOT_HUD_WEAR_MASK in check_obscured_slots())) + if(!(check_obscured_slots() & ITEM_SLOT_MASK)) var/obj/item/organ/external/head/head_organ = get_organ("head") if(!istype(head_organ)) return // Nothing to update here @@ -1051,6 +1060,22 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) overlays_standing[FACEMASK_LAYER] = standing apply_overlay(FACEMASK_LAYER) +/mob/living/carbon/human/update_inv_neck() + remove_overlay(NECK_LAYER) + if(client && hud_used) + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_NECK)] + if(inv) + inv.update_icon() + + if(neck) + update_hud_neck(neck) + if(neck.icon_override) + overlays_standing[NECK_LAYER] = mutable_appearance(neck.icon_override, "[neck.icon_state]", layer = -NECK_LAYER) + else if(neck.sprite_sheets && neck.sprite_sheets[dna.species.sprite_sheet_name]) + overlays_standing[NECK_LAYER] = mutable_appearance(neck.sprite_sheets[dna.species.sprite_sheet_name], "[neck.icon_state]", layer = -NECK_LAYER) + else + overlays_standing[NECK_LAYER] = mutable_appearance('icons/mob/clothing/neck.dmi', "[neck.icon_state]", layer = -NECK_LAYER) + apply_overlay(NECK_LAYER) /mob/living/carbon/human/update_inv_back() ..() @@ -1224,6 +1249,12 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) client.screen += worn_item update_observer_view(worn_item, TRUE) +/mob/living/carbon/human/proc/update_hud_neck(obj/item/worn_item) + worn_item.screen_loc = ui_neck + if((client && hud_used && hud_used.hud_version == HUD_STYLE_STANDARD) && (hud_used.inventory_shown && hud_used.hud_shown)) + client.screen += worn_item + update_observer_view(worn_item, TRUE) + /mob/living/carbon/human/update_hud_back(obj/item/worn_item) worn_item.screen_loc = ui_back if(client && hud_used?.hud_shown && hud_used.hud_version == HUD_STYLE_STANDARD) diff --git a/code/modules/mob/living/carbon/human/npcs.dm b/code/modules/mob/living/carbon/human/npcs.dm index 6974075c918fb..9aab8fc08f5fd 100644 --- a/code/modules/mob/living/carbon/human/npcs.dm +++ b/code/modules/mob/living/carbon/human/npcs.dm @@ -13,7 +13,7 @@ . = ..() name = "Pun Pun" real_name = name - equip_to_slot(new /obj/item/clothing/under/punpun(src), SLOT_HUD_JUMPSUIT) + equip_to_slot(new /obj/item/clothing/under/punpun(src), ITEM_SLOT_JUMPSUIT) /mob/living/carbon/human/monkey/teeny/Initialize(mapload) . = ..() @@ -40,7 +40,7 @@ update_transform() real_name = name - equip_to_slot_or_del(new headwear(src), SLOT_HUD_HEAD) + equip_to_slot_or_del(new headwear(src), ITEM_SLOT_HEAD) RegisterSignal(src, list(COMSIG_HUMAN_ATTACKED, COMSIG_HOSTILE_ATTACKINGTARGET), PROC_REF(ouch)) for(var/trait in list(TRAIT_RESISTHEAT, TRAIT_NOBREATH, TRAIT_RESISTCOLD, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE)) diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 687230a2031a7..ef8aff912d720 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -91,7 +91,7 @@ var/exotic_blood var/own_species_blood = FALSE // Can it only use blood from it's species? var/skinned_type - var/list/no_equip = list() // slots the race can't equip stuff to + var/no_equip // bitflags of slots the race can't equip stuff to var/nojumpsuit = 0 // this is sorta... weird. it basically lets you equip stuff that usually needs jumpsuits without one, like belts and pockets and ids var/can_craft = TRUE // Can this mob using crafting or not? @@ -358,7 +358,11 @@ #undef SLOWDOWN_MULTIPLIER /datum/species/proc/on_species_gain(mob/living/carbon/human/H) //Handles anything not already covered by basic species assignment. - for(var/slot_id in no_equip) + for(var/slot_id in GLOB.bitflags) // Iterate through all bitflags + if(slot_id > ITEM_SLOT_AMOUNT_FLAG) // If the slot_id bitflag is larger than the largest ITEM_SLOT flag we're done + break + if(!(slot_id & no_equip)) // If the slot_id bitflag isn't in the no_equip flag, check the next bitflag + continue var/obj/item/thing = H.get_item_by_slot(slot_id) if(thing && (!thing.species_exception || !is_type_in_list(src, thing.species_exception))) H.unEquip(thing) @@ -747,7 +751,7 @@ return copy /datum/species/proc/can_equip(obj/item/I, slot, disable_warning = FALSE, mob/living/carbon/human/H) - if(slot in no_equip) + if(slot & no_equip) if(!I.species_exception || !is_type_in_list(src, I.species_exception)) return FALSE @@ -755,21 +759,23 @@ return FALSE switch(slot) - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) return !H.l_hand && !H.incapacitated() - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) return !H.r_hand && !H.incapacitated() - if(SLOT_HUD_WEAR_MASK) - return !H.wear_mask && (I.slot_flags & SLOT_FLAG_MASK) - if(SLOT_HUD_BACK) - return !H.back && (I.slot_flags & SLOT_FLAG_BACK) - if(SLOT_HUD_OUTER_SUIT) - return !H.wear_suit && (I.slot_flags & SLOT_FLAG_OCLOTHING) - if(SLOT_HUD_GLOVES) - return !H.gloves && (I.slot_flags & SLOT_FLAG_GLOVES) - if(SLOT_HUD_SHOES) - return !H.shoes && (I.slot_flags & SLOT_FLAG_FEET) - if(SLOT_HUD_BELT) + if(ITEM_SLOT_MASK) + return !H.wear_mask && (I.slot_flags & ITEM_SLOT_MASK) + if(ITEM_SLOT_BACK) + return !H.back && (I.slot_flags & ITEM_SLOT_BACK) + if(ITEM_SLOT_OUTER_SUIT) + return !H.wear_suit && (I.slot_flags & ITEM_SLOT_OUTER_SUIT) + if(ITEM_SLOT_GLOVES) + return !H.gloves && (I.slot_flags & ITEM_SLOT_GLOVES) + if(ITEM_SLOT_SHOES) + return !H.shoes && (I.slot_flags & ITEM_SLOT_SHOES) + if(ITEM_SLOT_NECK) + return !H.neck && (I.slot_flags & ITEM_SLOT_NECK) + if(ITEM_SLOT_BELT) if(H.belt) return FALSE var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST) @@ -778,20 +784,20 @@ if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [I.name].") return FALSE - if(!(I.slot_flags & SLOT_FLAG_BELT)) + if(!(I.slot_flags & ITEM_SLOT_BELT)) return return TRUE - if(SLOT_HUD_GLASSES) - return !H.glasses && (I.slot_flags & SLOT_FLAG_EYES) - if(SLOT_HUD_HEAD) - return !H.head && (I.slot_flags & SLOT_FLAG_HEAD) - if(SLOT_HUD_LEFT_EAR) - return !H.l_ear && (I.slot_flags & SLOT_FLAG_EARS) && !((I.slot_flags & SLOT_FLAG_TWOEARS) && H.r_ear) - if(SLOT_HUD_RIGHT_EAR) - return !H.r_ear && (I.slot_flags & SLOT_FLAG_EARS) && !((I.slot_flags & SLOT_FLAG_TWOEARS) && H.l_ear) - if(SLOT_HUD_JUMPSUIT) - return !H.w_uniform && (I.slot_flags & SLOT_FLAG_ICLOTHING) - if(SLOT_HUD_WEAR_ID) + if(ITEM_SLOT_EYES) + return !H.glasses && (I.slot_flags & ITEM_SLOT_EYES) + if(ITEM_SLOT_HEAD) + return !H.head && (I.slot_flags & ITEM_SLOT_HEAD) + if(ITEM_SLOT_LEFT_EAR) + return !H.l_ear && (I.slot_flags & ITEM_SLOT_LEFT_EAR) + if(ITEM_SLOT_RIGHT_EAR) + return !H.r_ear && (I.slot_flags & ITEM_SLOT_RIGHT_EAR) + if(ITEM_SLOT_JUMPSUIT) + return !H.w_uniform && (I.slot_flags & ITEM_SLOT_JUMPSUIT) + if(ITEM_SLOT_ID) if(H.wear_id) return FALSE var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST) @@ -800,10 +806,10 @@ if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [I.name].") return FALSE - if(!(I.slot_flags & SLOT_FLAG_ID)) + if(!(I.slot_flags & ITEM_SLOT_ID)) return FALSE return TRUE - if(SLOT_HUD_WEAR_PDA) + if(ITEM_SLOT_PDA) if(H.wear_pda) return FALSE var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST) @@ -812,10 +818,10 @@ if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [I.name].") return FALSE - if(!(I.slot_flags & SLOT_FLAG_PDA)) + if(!(I.slot_flags & ITEM_SLOT_PDA)) return FALSE return TRUE - if(SLOT_HUD_LEFT_STORE) + if(ITEM_SLOT_LEFT_POCKET) if(I.flags & NODROP) //Pockets aren't visible, so you can't move NODROP items into them. return FALSE if(H.l_store) @@ -826,9 +832,9 @@ if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [I.name].") return FALSE - if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & SLOT_FLAG_POCKET)) + if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & ITEM_SLOT_BOTH_POCKETS)) return TRUE - if(SLOT_HUD_RIGHT_STORE) + if(ITEM_SLOT_RIGHT_POCKET) if(I.flags & NODROP) return FALSE if(H.r_store) @@ -839,10 +845,10 @@ if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [I.name].") return FALSE - if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & SLOT_FLAG_POCKET)) + if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & ITEM_SLOT_BOTH_POCKETS)) return TRUE return FALSE - if(SLOT_HUD_SUIT_STORE) + if(ITEM_SLOT_SUIT_STORE) if(I.flags & NODROP) //Suit storage NODROP items drop if you take a suit off, this is to prevent people exploiting this. return FALSE if(H.s_store) @@ -862,11 +868,11 @@ if(istype(I, /obj/item/pda) || is_pen(I) || is_type_in_list(I, H.wear_suit.allowed)) return TRUE return FALSE - if(SLOT_HUD_HANDCUFFED) + if(ITEM_SLOT_HANDCUFFED) return !H.handcuffed && istype(I, /obj/item/restraints/handcuffs) - if(SLOT_HUD_LEGCUFFED) + if(ITEM_SLOT_LEGCUFFED) return !H.legcuffed && istype(I, /obj/item/restraints/legcuffs) - if(SLOT_HUD_IN_BACKPACK) + if(ITEM_SLOT_IN_BACKPACK) if(H.back && istype(H.back, /obj/item/storage/backpack)) var/obj/item/storage/backpack/B = H.back if(length(B.contents) < B.storage_slots && I.w_class <= B.max_w_class) @@ -878,7 +884,7 @@ if(length(B.contents) < B.storage_slots && I.w_class <= B.max_w_class) return TRUE return FALSE - if(SLOT_HUD_TIE) + if(ITEM_SLOT_ACCESSORY) if(!istype(I, /obj/item/clothing/accessory)) return FALSE var/obj/item/clothing/under/uniform = H.w_uniform @@ -890,7 +896,7 @@ if(!disable_warning) to_chat(H, "You already have an accessory of this type attached to your [uniform].") return FALSE - if(!(I.slot_flags & SLOT_FLAG_TIE)) + if(!(I.slot_flags & ITEM_SLOT_ACCESSORY)) return FALSE return TRUE diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm index 5c04aef279538..abb29f946ebed 100644 --- a/code/modules/mob/living/carbon/human/species/golem.dm +++ b/code/modules/mob/living/carbon/human/species/golem.dm @@ -15,7 +15,7 @@ punchdamagelow = 5 punchdamagehigh = 14 punchstunthreshold = 11 //about 40% chance to stun - no_equip = list(SLOT_HUD_WEAR_MASK, SLOT_HUD_OUTER_SUIT, SLOT_HUD_GLOVES, SLOT_HUD_SHOES, SLOT_HUD_JUMPSUIT, SLOT_HUD_SUIT_STORE) + no_equip = ITEM_SLOT_MASK | ITEM_SLOT_OUTER_SUIT | ITEM_SLOT_GLOVES | ITEM_SLOT_SHOES | ITEM_SLOT_JUMPSUIT | ITEM_SLOT_SUIT_STORE nojumpsuit = TRUE dietflags = DIET_OMNI //golems can eat anything because they are magic or something @@ -572,8 +572,8 @@ ..() last_banana = world.time last_honk = world.time - H.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/bottle/bottleofbanana(H), SLOT_HUD_RIGHT_STORE) - H.equip_to_slot_or_del(new /obj/item/bikehorn(H), SLOT_HUD_LEFT_STORE) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/bottle/bottleofbanana(H), ITEM_SLOT_RIGHT_POCKET) + H.equip_to_slot_or_del(new /obj/item/bikehorn(H), ITEM_SLOT_LEFT_POCKET) H.AddElement(/datum/element/waddling) /datum/species/golem/bananium/on_species_loss(mob/living/carbon/C) @@ -650,9 +650,9 @@ /datum/species/golem/tranquillite/on_species_gain(mob/living/carbon/human/H) ..() - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), SLOT_HUD_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/bottle/bottleofnothing(H), SLOT_HUD_RIGHT_STORE) - H.equip_to_slot_or_del(new /obj/item/cane(H), SLOT_HUD_LEFT_HAND) + H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), ITEM_SLOT_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/bottle/bottleofnothing(H), ITEM_SLOT_RIGHT_POCKET) + H.equip_to_slot_or_del(new /obj/item/cane(H), ITEM_SLOT_LEFT_HAND) if(H.mind) H.mind.AddSpell(new /datum/spell/aoe/conjure/build/mime_wall(null)) H.mind.AddSpell(new /datum/spell/mime/speak(null)) diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm index cbb59cf0f0406..431e2bee1b194 100644 --- a/code/modules/mob/living/carbon/human/species/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/monkey.dm @@ -13,7 +13,7 @@ species_traits = list(NOT_SELECTABLE) skinned_type = /obj/item/stack/sheet/animalhide/monkey greater_form = /datum/species/human - no_equip = list(SLOT_HUD_BELT, SLOT_HUD_WEAR_ID, SLOT_HUD_LEFT_EAR, SLOT_HUD_RIGHT_EAR, SLOT_HUD_GLASSES, SLOT_HUD_GLOVES, SLOT_HUD_SHOES, SLOT_HUD_OUTER_SUIT, SLOT_HUD_JUMPSUIT, SLOT_HUD_LEFT_STORE, SLOT_HUD_RIGHT_STORE, SLOT_HUD_SUIT_STORE, SLOT_HUD_WEAR_PDA) + no_equip = ITEM_SLOT_BELT | ITEM_SLOT_ID | ITEM_SLOT_LEFT_EAR | ITEM_SLOT_RIGHT_EAR | ITEM_SLOT_EYES | ITEM_SLOT_GLOVES | ITEM_SLOT_SHOES | ITEM_SLOT_OUTER_SUIT | ITEM_SLOT_JUMPSUIT | ITEM_SLOT_LEFT_POCKET | ITEM_SLOT_RIGHT_POCKET | ITEM_SLOT_SUIT_STORE | ITEM_SLOT_PDA | ITEM_SLOT_NECK inherent_factions = list("jungle", "monkey") can_craft = FALSE is_small = 1 diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index c05571cbc460b..db8528ff3f1fc 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -189,7 +189,7 @@ if(!H.mind || !H.mind.assigned_role || H.mind.assigned_role != "Clown" && H.mind.assigned_role != "Mime") H.unEquip(H.wear_mask) - H.equip_or_collect(new /obj/item/clothing/mask/breath(H), SLOT_HUD_WEAR_MASK) + H.equip_or_collect(new /obj/item/clothing/mask/breath(H), ITEM_SLOT_MASK) var/tank_pref = H.client && H.client.prefs ? H.client.prefs.active_character.speciesprefs : null var/obj/item/tank/internal_tank if(tank_pref) //Diseasel, here you go @@ -198,7 +198,7 @@ internal_tank = new /obj/item/tank/internals/plasmaman/belt/full(H) if(!H.equip_to_appropriate_slot(internal_tank) && !H.put_in_any_hand_if_possible(internal_tank)) H.unEquip(H.l_hand) - H.equip_or_collect(internal_tank, SLOT_HUD_LEFT_HAND) + H.equip_or_collect(internal_tank, ITEM_SLOT_LEFT_HAND) to_chat(H, "Could not find an empty slot for internals! Please report this as a bug.") stack_trace("Failed to equip plasmaman with a tank, with the job [J.type]") H.internal = internal_tank diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm index baddea088f24f..ba9d4e89481ad 100644 --- a/code/modules/mob/living/carbon/human/species/vox.dm +++ b/code/modules/mob/living/carbon/human/species/vox.dm @@ -79,7 +79,7 @@ if(!H.mind || !H.mind.assigned_role || H.mind.assigned_role != "Clown" && H.mind.assigned_role != "Mime") H.unEquip(H.wear_mask) - H.equip_or_collect(new /obj/item/clothing/mask/breath/vox/respirator(H), SLOT_HUD_WEAR_MASK) + H.equip_or_collect(new /obj/item/clothing/mask/breath/vox/respirator(H), ITEM_SLOT_MASK) var/tank_pref = H.client && H.client.prefs ? H.client.prefs.active_character.speciesprefs : null var/obj/item/tank/internal_tank if(tank_pref)//Diseasel, here you go @@ -89,7 +89,7 @@ if(!H.equip_to_appropriate_slot(internal_tank)) if(!H.put_in_any_hand_if_possible(internal_tank)) H.unEquip(H.l_hand) - H.equip_or_collect(internal_tank, SLOT_HUD_LEFT_HAND) + H.equip_or_collect(internal_tank, ITEM_SLOT_LEFT_HAND) to_chat(H, "Could not find an empty slot for internals! Please report this as a bug") H.internal = internal_tank to_chat(H, "You are now running on nitrogen internals from [internal_tank]. Your species finds oxygen toxic, so you must breathe nitrogen only.") diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm index 3c317c8688e3b..8b9218bac336e 100644 --- a/code/modules/mob/living/carbon/superheroes.dm +++ b/code/modules/mob/living/carbon/superheroes.dm @@ -16,7 +16,7 @@ H.rename_character(H.real_name, name) for(var/obj/item/W in H.get_all_slots()) H.unEquip(W) - H.equip_to_slot_or_del(new /obj/item/radio/headset(H), SLOT_HUD_LEFT_EAR) + H.equip_to_slot_or_del(new /obj/item/radio/headset(H), ITEM_SLOT_LEFT_EAR) /datum/superheroes/proc/fixflags(mob/living/carbon/human/H) for(var/obj/item/W in H.get_all_slots()) @@ -52,7 +52,7 @@ W.SetOwnerInfo(H) W.UpdateName() W.flags |= NODROP - H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + H.equip_to_slot_or_del(W, ITEM_SLOT_ID) H.regenerate_icons() to_chat(H, desc) @@ -67,12 +67,12 @@ /datum/superheroes/owlman/equip(mob/living/carbon/human/H) ..() - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/owl(H), SLOT_HUD_JUMPSUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings(H), SLOT_HUD_OUTER_SUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/owl_mask/super_hero(H), SLOT_HUD_WEAR_MASK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/bluespace/owlman(H), SLOT_HUD_BELT) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(H), SLOT_HUD_GLASSES) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(H), ITEM_SLOT_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/owl(H), ITEM_SLOT_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings(H), ITEM_SLOT_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/owl_mask/super_hero(H), ITEM_SLOT_MASK) + H.equip_to_slot_or_del(new /obj/item/storage/belt/bluespace/owlman(H), ITEM_SLOT_BELT) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(H), ITEM_SLOT_EYES) /datum/superheroes/griffin @@ -86,10 +86,10 @@ /datum/superheroes/griffin/equip(mob/living/carbon/human/H) ..() - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/griffin(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/griffin(H), SLOT_HUD_JUMPSUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings/griffinwings(H), SLOT_HUD_OUTER_SUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/head/griffin/(H), SLOT_HUD_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/griffin(H), ITEM_SLOT_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/griffin(H), ITEM_SLOT_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings/griffinwings(H), ITEM_SLOT_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/head/griffin/(H), ITEM_SLOT_HEAD) var/obj/item/bio_chip/freedom/L = new/obj/item/bio_chip/freedom(H) L.implant(H) @@ -106,12 +106,12 @@ /datum/superheroes/lightnian/equip(mob/living/carbon/human/H) ..() - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/brown(H), SLOT_HUD_JUMPSUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit/super_hero(H), SLOT_HUD_OUTER_SUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi/super_hero(H), SLOT_HUD_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(H), SLOT_HUD_GLOVES) - H.equip_to_slot_or_del(new /obj/item/bedsheet/orange(H), SLOT_HUD_BACK) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), ITEM_SLOT_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/brown(H), ITEM_SLOT_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit/super_hero(H), ITEM_SLOT_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi/super_hero(H), ITEM_SLOT_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(H), ITEM_SLOT_GLOVES) + H.equip_to_slot_or_del(new /obj/item/bedsheet/orange(H), ITEM_SLOT_BACK) /datum/superheroes/electro @@ -125,11 +125,11 @@ /datum/superheroes/electro/equip(mob/living/carbon/human/H) ..() - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), SLOT_HUD_JUMPSUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit/super_hero/en(H), SLOT_HUD_OUTER_SUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi/super_hero/en(H), SLOT_HUD_HEAD) - H.equip_to_slot_or_del(new /obj/item/bedsheet/cult(H), SLOT_HUD_BACK) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(H), ITEM_SLOT_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), ITEM_SLOT_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit/super_hero/en(H), ITEM_SLOT_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi/super_hero/en(H), ITEM_SLOT_HEAD) + H.equip_to_slot_or_del(new /obj/item/bedsheet/cult(H), ITEM_SLOT_BACK) @@ -223,10 +223,10 @@ for(var/obj/item/W in target.get_all_slots()) target.unEquip(W) target.rename_character(target.real_name, "Generic Henchman ([rand(1, 1000)])") - target.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/greytide(target), SLOT_HUD_JUMPSUIT) - target.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(target), SLOT_HUD_SHOES) - target.equip_to_slot_or_del(new /obj/item/storage/toolbox/mechanical/greytide(target), SLOT_HUD_LEFT_HAND) - target.equip_to_slot_or_del(new /obj/item/radio/headset(target), SLOT_HUD_LEFT_EAR) + target.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/greytide(target), ITEM_SLOT_JUMPSUIT) + target.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(target), ITEM_SLOT_SHOES) + target.equip_to_slot_or_del(new /obj/item/storage/toolbox/mechanical/greytide(target), ITEM_SLOT_LEFT_HAND) + target.equip_to_slot_or_del(new /obj/item/radio/headset(target), ITEM_SLOT_LEFT_EAR) var/obj/item/card/id/syndicate/W = new(target) W.icon_state = "lifetimeid" W.access = list(ACCESS_MAINT_TUNNELS) @@ -235,5 +235,5 @@ W.flags |= NODROP W.SetOwnerInfo(target) W.UpdateName() - target.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + target.equip_to_slot_or_del(W, ITEM_SLOT_ID) target.regenerate_icons() diff --git a/code/modules/mob/living/init_signals.dm b/code/modules/mob/living/init_signals.dm index 081b4cdd86ae6..b2fd6735f89bd 100644 --- a/code/modules/mob/living/init_signals.dm +++ b/code/modules/mob/living/init_signals.dm @@ -1,4 +1,4 @@ -/// Called on [/mob/living/Initialize(mapload)], for the mob to register to relevant signals. +/// Called on [/mob/living/proc/Initialize], for the mob to register to relevant signals. /mob/living/proc/register_init_signals() RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_KNOCKEDOUT), PROC_REF(on_knockedout_trait_gain)) RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_KNOCKEDOUT), PROC_REF(on_knockedout_trait_loss)) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index c39e6d73ef8ca..3607507af6ce1 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1188,3 +1188,4 @@ /// Can a mob interact with the apc remotely like a pulse demon, cyborg, or AI? /mob/living/proc/can_remote_apc_interface(obj/machinery/power/apc/ourapc) return FALSE + diff --git a/code/modules/mob/living/living_status_procs.dm b/code/modules/mob/living/living_status_procs.dm index 2afbf16a72730..35a56aa0ae62e 100644 --- a/code/modules/mob/living/living_status_procs.dm +++ b/code/modules/mob/living/living_status_procs.dm @@ -118,7 +118,6 @@ STATUS EFFECTS layer = BLASTDOOR_LAYER else layer = LYING_MOB_LAYER //so mob lying always appear behind standing mobs - pixel_y = PIXEL_Y_OFFSET_LYING ADD_TRAIT(src, TRAIT_UI_BLOCKED, LYING_DOWN_TRAIT) ADD_TRAIT(src, TRAIT_CANNOT_PULL, LYING_DOWN_TRAIT) RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(orient_crawling)) diff --git a/code/modules/mob/living/silicon/ai/ai_mob.dm b/code/modules/mob/living/silicon/ai/ai_mob.dm index add52499b123b..421b82e5d6b7e 100644 --- a/code/modules/mob/living/silicon/ai/ai_mob.dm +++ b/code/modules/mob/living/silicon/ai/ai_mob.dm @@ -200,7 +200,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( add_language("Galactic Common", 1) add_language("Sol Common", 1) add_language("Tradeband", 1) - add_language("Neo-Russkiya", 1) + add_language("Neo-Russkiya", 1) // SS220 EDIT - Zvezhan -> Neo-Russkiya add_language("Gutter", 1) add_language("Sinta'unathi", 1) add_language("Siik'tajr", 1) diff --git a/code/modules/mob/living/silicon/pai/software/pai_toggles.dm b/code/modules/mob/living/silicon/pai/software/pai_toggles.dm index 7b69e43929393..194786f6c296c 100644 --- a/code/modules/mob/living/silicon/pai/software/pai_toggles.dm +++ b/code/modules/mob/living/silicon/pai/software/pai_toggles.dm @@ -76,7 +76,7 @@ user.add_language("Bubblish") user.add_language("Orluum") user.add_language("Clownish") - user.add_language("Neo-Russkiya") + user.add_language("Neo-Russkiya") // SS220 EDIT - Zvezhan -> Neo-Russkiya user.add_language("Tkachi") else user.remove_language("Sinta'unathi") @@ -89,7 +89,7 @@ user.remove_language("Bubblish") user.remove_language("Orluum") user.remove_language("Clownish") - user.remove_language("Neo-Russkiya") + user.remove_language("Neo-Russkiya") // SS220 EDIT - Zvezhan -> Neo-Russkiya user.remove_language("Tkachi") /datum/pai_software/translator/is_active(mob/living/silicon/pai/user) diff --git a/code/modules/mob/living/silicon/robot/robot_mob.dm b/code/modules/mob/living/silicon/robot/robot_mob.dm index 88f56dd98b9c1..e6b2c59c5bba6 100644 --- a/code/modules/mob/living/silicon/robot/robot_mob.dm +++ b/code/modules/mob/living/silicon/robot/robot_mob.dm @@ -56,7 +56,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( /// Does the robot have a non-default sprite for an open service panel? var/custom_panel = null /// Robot skins with non-default sprites for an open service panel. - var/list/custom_panel_names = list("Cricket") + var/list/custom_panel_names = list("Cricket", "Rover") /// Robot skins with multiple variants for different modules. They require special handling to make their eyes display. var/list/custom_eye_names = list("Cricket", "Standard") /// Has the robot been emagged? @@ -84,6 +84,10 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( var/list/force_modules /// Can a robot rename itself with the Namepick verb? var/allow_rename = TRUE + /// Can a robot change it's looks after the module is initialized? Used by syndicate combat borgs. + var/allow_resprite = FALSE + /// Has the robot done its one allowed resprite? + var/done_resprite = FALSE /// Setting to TRUE unlocks a borg's Safety Override modules. var/weapons_unlock = FALSE var/static_radio_channels = FALSE @@ -298,6 +302,25 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( return 0 rename_self(braintype, 1) +/mob/living/silicon/robot/verb/Lookpick() + set category = "Robot Commands" + set name = "Change module look" + if(!modtype) + return FALSE + if(done_resprite) + to_chat(src, "You have already selected your look, you can not change it again.") + return FALSE + if(!allow_resprite) + to_chat(src, "Changing the look of the module is not enabled on this unit.") + return FALSE + // Pick a sprite + var/module_sprites = get_module_sprites(modtype) + var/selected_sprite = show_radial_menu(src, src, module_sprites, radius = 42) + if(!selected_sprite) + return FALSE + done_resprite = TRUE + initialize_sprites(selected_sprite, module_sprites) + /mob/living/silicon/robot/proc/sync() if(lawupdate && connected_ai) lawsync() @@ -418,6 +441,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( "Landmate" = image('icons/mob/robots.dmi', "landmate"), "Standard" = image('icons/mob/robots.dmi', "Standard-Engi"), "Noble-ENG" = image('icons/mob/robots.dmi', "Noble-ENG"), + "Rover" = image('icons/mob/robots.dmi', "Rover-Engi"), "Cricket" = image('icons/mob/robots.dmi', "Cricket-ENGI") ) if("Janitor") @@ -428,6 +452,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( "Standard" = image('icons/mob/robots.dmi', "Standard-Jani"), "Noble-CLN" = image('icons/mob/robots.dmi', "Noble-CLN"), "Cricket" = image('icons/mob/robots.dmi', "Cricket-JANI"), + "Rover" = image('icons/mob/robots.dmi', "Rover-Jani"), "Custodiborg" = image('icons/mob/robots.dmi', "custodiborg") ) if("Medical") @@ -479,6 +504,12 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( "Cricket" = image('icons/mob/robots.dmi', "Cricket-SEC"), "Heavy" = image('icons/mob/robots.dmi', "heavySec") ) + if("Syndicate") + module_sprites = list( + "Spider" = image('icons/mob/robots.dmi', "spidersyndi"), + "Bloodhound" = image('icons/mob/robots.dmi', "syndie_bloodhound"), + "Heavy" = image('icons/mob/robots.dmi', "syndieheavy") + ) if("Destroyer") //for Adminbus presumably module_sprites = list( "Destroyer" = image('icons/mob/robots.dmi', "droidcombat") @@ -502,7 +533,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( */ /mob/living/silicon/robot/proc/robot_module_hat_offset(module) switch(module) - if("Engineering", "Miner_old", "JanBot2", "Medbot", "engineerrobot", "maximillion", "secborg", "Hydrobot") + if("Engineering", "Miner_old", "JanBot2", "Medbot", "engineerrobot", "maximillion", "secborg", "Rover-Jani", "Rover-Engi", "Hydrobot") can_be_hatted = FALSE // Their base sprite already comes with a hat hat_offset_y = -1 if("Noble-CLN", "Noble-SRV", "Noble-DIG", "Noble-MED", "Noble-SEC", "Noble-ENG", "Noble-STD") @@ -638,7 +669,13 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( if(!static_radio_channels) radio.config(module.channels) rename_character(real_name, get_default_name()) + initialize_sprites(selected_sprite, module_sprites) + if(client.stat_tab == "Status") + SSstatpanels.set_status_tab(client) + SSblackbox.record_feedback("tally", "cyborg_modtype", 1, "[lowertext(selected_module)]") + notify_ai(2) +/mob/living/silicon/robot/proc/initialize_sprites(selected_sprite, list/module_sprites) var/image/sprite_image = module_sprites[selected_sprite] var/list/names = splittext(selected_sprite, "-") icon = sprite_image.icon @@ -648,10 +685,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( update_module_icon() robot_module_hat_offset(icon_state) update_icons() - if(client.stat_tab == "Status") - SSstatpanels.set_status_tab(client) - SSblackbox.record_feedback("tally", "cyborg_modtype", 1, "[lowertext(selected_module)]") - notify_ai(2) + /// Take the borg's upgrades and spill them on the floor /mob/living/silicon/robot/proc/spill_upgrades() for(var/obj/item/borg/upgrade/U in contents) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 7ab9a7379a5ed..298f709ddc17b 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -1,7 +1,7 @@ /obj/item/robot_module name = "robot module" icon = 'icons/obj/module.dmi' - icon_state = "std_module" + icon_state = "std_mod" w_class = 100 item_state = "electronic" flags = CONDUCT @@ -281,7 +281,7 @@ R.add_language("Sol Common", 1) R.add_language("Tradeband", 1) R.add_language("Gutter", 0) - R.add_language("Neo-Russkiya", 0) + R.add_language("Neo-Russkiya", 0) // SS220 EDIT - Zvezhan -> Neo-Russkiya R.add_language("Sinta'unathi", 0) R.add_language("Siik'tajr", 0) R.add_language("Canilunzt", 0) @@ -687,7 +687,7 @@ R.add_language("Chittin", 1) R.add_language("Bubblish", 1) R.add_language("Clownish",1) - R.add_language("Neo-Russkiya", 1) + R.add_language("Neo-Russkiya", 1) // SS220 EDIT - Zvezhan -> Neo-Russkiya R.add_language("Tkachi", 1) // Mining diff --git a/code/modules/mob/living/silicon/robot/syndicate_robot.dm b/code/modules/mob/living/silicon/robot/syndicate_robot.dm index 17801c1a2e3ba..d88415375b6e4 100644 --- a/code/modules/mob/living/silicon/robot/syndicate_robot.dm +++ b/code/modules/mob/living/silicon/robot/syndicate_robot.dm @@ -1,6 +1,6 @@ /mob/living/silicon/robot/syndicate - base_icon = "syndie_bloodhound" - icon_state = "syndie_bloodhound" + base_icon = "spidersyndi" + icon_state = "spidersyndi" lawupdate = FALSE scrambledcodes = TRUE has_camera = FALSE @@ -9,6 +9,7 @@ bubble_icon = "syndibot" designation = "Syndicate Assault" modtype = "Syndicate" + allow_resprite = TRUE req_access = list(ACCESS_SYNDICATE) ionpulse = TRUE damage_protection = 5 diff --git a/code/modules/mob/living/simple_animal/bot/bot_construction.dm b/code/modules/mob/living/simple_animal/bot/bot_construction.dm index ade672f368643..3974ef55abedf 100644 --- a/code/modules/mob/living/simple_animal/bot/bot_construction.dm +++ b/code/modules/mob/living/simple_animal/bot/bot_construction.dm @@ -401,7 +401,7 @@ qdel(I) build_step++ to_chat(user, "You add the health sensor to [src].") - update_appearance(UPDATE_NAME) + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) if(1) if(isprox(I)) diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 78496dbe6117f..fc0b9ac4bb5dd 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -114,6 +114,22 @@ name = "Corpse of a Ranged Soviet" suit = /obj/item/clothing/suit/sovietcoat +/obj/effect/mob_spawn/human/corpse/soviet_nian + name = "Soviet Nian" + mob_name = "Soviet Nian" + mob_species = /datum/species/moth + hair_style = "bald" + facial_hair_style = "shaved" + outfit = /datum/outfit/soviet_nian + +/datum/outfit/soviet_nian + name = "Soviet Nian" + uniform = /obj/item/clothing/under/new_soviet + gloves = /obj/item/clothing/gloves/color/black + shoes = /obj/item/clothing/shoes/jackboots + head = /obj/item/clothing/head/ushanka + r_pocket = /obj/item/reagent_containers/drinks/drinkingglass/shotglass + l_pocket = /obj/item/reagent_containers/drinks/bottle/vodka /obj/effect/mob_spawn/human/corpse/wizard name = "Corpse of a Space Wizard" diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm index e928fd850a838..70268a03723f8 100644 --- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm +++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm @@ -24,8 +24,8 @@ gold_core_spawnable = FRIENDLY_SPAWN initial_traits = list(TRAIT_FLYING, TRAIT_EDIBLE_BUG) -/mob/living/simple_animal/butterfly/New() - ..() +/mob/living/simple_animal/butterfly/Initialize(mapload) + . = ..() color = rgb(rand(0, 255), rand(0, 255), rand(0, 255)) /mob/living/simple_animal/butterfly/npc_safe(mob/user) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index b716622e685ab..0a36ef2f09b76 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -42,9 +42,9 @@ var/list/family = list() var/list/children = list() //Actual mob instances of children -/mob/living/simple_animal/pet/cat/Runtime/New() +/mob/living/simple_animal/pet/cat/Runtime/Initialize(mapload) + . = ..() SSpersistent_data.register(src) - ..() /mob/living/simple_animal/pet/cat/Runtime/Destroy() SSpersistent_data.registered_atoms -= src diff --git a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm index 77c8b8aeb0acf..2043aa8e15d0f 100644 --- a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm +++ b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm @@ -81,8 +81,9 @@ var/mob/living/simple_animal/diona/user = owner user.steal_blood() -/mob/living/simple_animal/diona/New() - ..() +/mob/living/simple_animal/diona/Initialize(mapload) + . = ..() + if(name == initial(name)) //To stop Pun-Pun becoming generic. name = "[name] ([rand(1, 1000)])" real_name = name 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 04f71eb695950..32aace078b5a4 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -221,8 +221,9 @@ gold_core_spawnable = FRIENDLY_SPAWN footstep_type = FOOTSTEP_MOB_CLAW -/mob/living/simple_animal/chick/New() - ..() +/mob/living/simple_animal/chick/Initialize(mapload) + . = ..() + pixel_x = rand(-6, 6) pixel_y = rand(0, 10) @@ -294,8 +295,8 @@ GLOBAL_VAR_INIT(chicken_count, 0) gold_core_spawnable = FRIENDLY_SPAWN footstep_type = FOOTSTEP_MOB_CLAW -/mob/living/simple_animal/chicken/New() - ..() +/mob/living/simple_animal/chicken/Initialize(mapload) + . = ..() if(!body_color) body_color = pick(validColors) icon_state = "[icon_prefix]_[body_color]" @@ -303,6 +304,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) icon_dead = "[icon_prefix]_[body_color]_dead" pixel_x = rand(-6, 6) pixel_y = rand(0, 10) + update_appearance(UPDATE_ICON_STATE) GLOB.chicken_count += 1 /mob/living/simple_animal/chicken/death(gibbed) diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 73232630370d9..ed87da7cc89ef 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -75,15 +75,16 @@ else if(prob(0.5)) lay_down() -/mob/living/simple_animal/mouse/New() - ..() +/mob/living/simple_animal/mouse/Initialize(mapload) + . = ..() + if(!mouse_color) - mouse_color = pick( list("brown","gray","white") ) + mouse_color = pick("brown", "gray", "white") icon_state = "mouse_[mouse_color]" icon_living = "mouse_[mouse_color]" icon_dead = "mouse_[mouse_color]_dead" icon_resting = "mouse_[mouse_color]_sleep" - update_appearance(UPDATE_DESC) + update_appearance(UPDATE_ICON_STATE|UPDATE_DESC) /mob/living/simple_animal/mouse/update_desc() . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index a1f660f974021..a4ddaf327b03a 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -33,7 +33,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 maxbodytemp = 1500 - faction = list("carp") + faction = list("carp", "mining") pressure_resistance = 200 gold_core_spawnable = HOSTILE_SPAWN diff --git a/code/modules/mob/living/simple_animal/hostile/drakehound.dm b/code/modules/mob/living/simple_animal/hostile/drakehound.dm new file mode 100644 index 0000000000000..61c8a2778c59e --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/drakehound.dm @@ -0,0 +1,57 @@ +/mob/living/simple_animal/hostile/drakehound_breacher + name = "Drakehound Breacher" + desc = "A unathi raider with a viscious streak." + icon = 'icons/mob/simple_human.dmi' + icon_state = "drakehound" + icon_living = "drakehound" + icon_dead = "drakehound_dead" // Does not actually exist. del_on_death. + mob_biotypes = MOB_ORGANIC | MOB_HUMANOID + speak_chance = 1 + turns_per_move = 3 + response_help = "pushes the" + response_disarm = "shoves" + response_harm = "slashes" + speed = 0 + maxHealth = 100 + health = 100 + + harm_intent_damage = 5 + obj_damage = 60 + melee_damage_lower = 30 + melee_damage_upper = 30 + attacktext = "slashes" + attack_sound = 'sound/weapons/bladeslice.ogg' + minbodytemp = 0 + + 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) + speak_emote = list("hisses") + loot = list( + /obj/effect/decal/cleanable/blood/innards, + /obj/effect/decal/cleanable/blood, + /obj/effect/gibspawner/generic, + /obj/effect/gibspawner/generic) + del_on_death = TRUE + faction = list("pirate") + sentience_type = SENTIENCE_OTHER + footstep_type = FOOTSTEP_MOB_SHOE + +/mob/living/simple_animal/hostile/drakehound_breacher/Initialize(mapload) + . = ..() + if(prob(50)) + loot = list( + /obj/item/salvage/loot/pirate, + /obj/effect/decal/cleanable/blood/innards, + /obj/effect/decal/cleanable/blood, + /obj/effect/gibspawner/generic, + /obj/effect/gibspawner/generic) + +/mob/living/simple_animal/hostile/drakehound_breacher/Process_Spacemove(movement_dir = 0) + return TRUE + +/mob/living/simple_animal/hostile/drakehound_breacher/ListTargetsLazy() + return ListTargets() + +/mob/living/simple_animal/hostile/drakehound_breacher/Aggro() + . = ..() + if(target) + playsound(loc, 'sound/effects/unathihiss.ogg', 70, TRUE) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index b94de5402a048..ecf791c723cbb 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -472,6 +472,9 @@ A.attack_animal(src)//Bang on it till we get out /mob/living/simple_animal/hostile/proc/FindHidden() + if(QDELETED(target)) + LoseTarget() + return if(istype(target.loc, /obj/structure/closet) || istype(target.loc, /obj/machinery/disposal) || istype(target.loc, /obj/machinery/sleeper) || istype(target.loc, /obj/machinery/bodyscanner) || istype(target.loc, /obj/machinery/recharge_station)) var/atom/A = target.loc Goto(A,move_to_delay,minimum_distance) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index e87e4cbfea061..323508edfe160 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -560,6 +560,7 @@ Difficulty: Hard /obj/effect/temp_visual/bubblegum_hands icon = 'icons/effects/bubblegum.dmi' + icon_state = null duration = 9 /obj/effect/temp_visual/bubblegum_hands/rightthumb 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 29f5fb0803906..b01e6a895670e 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -47,6 +47,7 @@ /mob/living/simple_animal/hostile/megafauna/Initialize(mapload) . = ..() + GLOB.alive_megafauna_list |= UID() if(internal_gps && true_spawn) internal_gps = new internal_gps(src) for(var/action_type in attack_action_types) @@ -57,6 +58,7 @@ /mob/living/simple_animal/hostile/megafauna/Destroy() QDEL_NULL(internal_gps) UnregisterSignal(src, COMSIG_HOSTILE_FOUND_TARGET) + GLOB.alive_megafauna_list -= UID() return ..() /mob/living/simple_animal/hostile/megafauna/Moved() @@ -75,6 +77,7 @@ return ..() && health <= 0 /mob/living/simple_animal/hostile/megafauna/death(gibbed) + GLOB.alive_megafauna_list -= UID() // this happens before the parent call because `del_on_death` may be set if(can_die() && !admin_spawned) var/datum/status_effect/crusher_damage/C = has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING) 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 fee84e4083bfa..6404381fbd7fe 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 @@ -40,7 +40,7 @@ mouse_opacity = MOUSE_OPACITY_ICON death_sound = 'sound/misc/demon_dies.ogg' deathmessage = "begins to shudder as it becomes transparent..." - loot_drop = /obj/item/clothing/accessory/necklace/herald_cloak + loot_drop = /obj/item/clothing/neck/cloak/herald_cloak attack_action_types = list(/datum/action/innate/elite_attack/herald_trishot, @@ -257,22 +257,21 @@ //Herald's loot: Cloak of the Prophet -/obj/item/clothing/accessory/necklace/herald_cloak +/obj/item/clothing/neck/cloak/herald_cloak name = "cloak of the prophet" desc = "A cloak which lts you travel through a perfect reflection of the world." icon = 'icons/obj/lavaland/elite_trophies.dmi' icon_state = "herald_cloak" item_state = "herald_cloak" item_color = "herald_cloak" - slot_flags = SLOT_FLAG_TIE - allow_duplicates = FALSE - actions_types = list(/datum/action/item_action/accessory/herald) + actions_types = list(/datum/action/item_action/herald) -/obj/item/clothing/accessory/necklace/herald_cloak/attack_self() - if(has_suit) - mirror_walk() -/obj/item/clothing/accessory/necklace/herald_cloak/proc/mirror_walk() +/obj/item/clothing/neck/cloak/herald_cloak/item_action_slot_check(slot) + if(slot == ITEM_SLOT_NECK) + return TRUE + +/obj/item/clothing/neck/cloak/herald_cloak/ui_action_click() var/found_mirror = FALSE var/list/mirrors_to_use = list() var/list/areaindex = list() diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm index d0c6b420a9df9..c9450b56f572a 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm @@ -206,7 +206,7 @@ icon_state = "hope" item_state = "hope" item_color = "hope" - slot_flags = SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_ACCESSORY allow_duplicates = FALSE resistance_flags = FIRE_PROOF 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 a16ab19c13684..91e135c65c5d2 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm @@ -402,7 +402,7 @@ if(prob(10)) belt = pick(/obj/item/storage/belt/mining/vendor, /obj/item/storage/belt/utility/full) if(prob(50)) - back = /obj/item/bedsheet/rd/royal_cape + neck = /obj/item/bedsheet/rd/royal_cape if(prob(10)) l_pocket = pick(/obj/item/crowbar/power, /obj/item/wrench/power, /obj/item/weldingtool/experimental) if("YeOlde") diff --git a/code/modules/mob/living/simple_animal/hostile/soviet.dm b/code/modules/mob/living/simple_animal/hostile/soviet.dm index def10ae15fc2b..19d745c6ddc75 100644 --- a/code/modules/mob/living/simple_animal/hostile/soviet.dm +++ b/code/modules/mob/living/simple_animal/hostile/soviet.dm @@ -46,3 +46,36 @@ /obj/item/gun/projectile/shotgun/boltaction, /obj/item/salvage/loot/soviet) casingtype = /obj/item/ammo_casing/a762 + +/mob/living/simple_animal/hostile/soviet_nian + name = "Soviet Nian" + desc = "Buzz!" + icon = 'icons/mob/simple_human.dmi' + icon_state = "sovietnian" + icon_living = "sovietnian" + turns_per_move = 5 + response_help = "pokes the" + response_disarm = "shoves the" + response_harm = "hits the" + speed = 0 + maxHealth = 100 + health = 100 + harm_intent_damage = 5 + obj_damage = 60 + melee_damage_lower = 30 + melee_damage_upper = 30 + attacktext = "slashes" + attack_sound = 'sound/weapons/blade1.ogg' + minbodytemp = 0 + a_intent = INTENT_HARM + unsuitable_atmos_damage = 15 + faction = list("soviet") + status_flags = CANPUSH + loot = list( + /obj/effect/mob_spawn/human/corpse/soviet_nian, + /obj/item/melee/energy/sword/pirate, + /obj/item/salvage/loot/soviet + ) + del_on_death = TRUE + sentience_type = SENTIENCE_OTHER + footstep_type = FOOTSTEP_MOB_SHOE diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 5d4473b67937c..ba2db92144df7 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -67,8 +67,8 @@ var/parrot_speed = 5 //"Delay in world ticks between movement." according to byond. Yeah, that's BS but it does directly affect movement. Higher number = slower. var/parrot_been_shot = 0 //Parrots get a speed bonus after being shot. This will deincrement every process_ai() and at 0 the parrot will return to regular speed. - var/list/speech_buffer - var/list/available_channels + var/list/speech_buffer = list() + var/list/available_channels = list() //Headset for Poly to yell at engineers :) var/obj/item/radio/headset/ears = null @@ -80,35 +80,43 @@ //Parrots will generally sit on their pertch unless something catches their eye. //These vars store their preffered perch and if they dont have one, what they can use as a perch var/obj/parrot_perch = null - var/obj/desired_perches = null + var/list/desired_perches //Parrots are kleptomaniacs. This variable ... stores the item a parrot is holding. var/obj/item/held_item = null initial_traits = list(TRAIT_FLYING) gold_core_spawnable = FRIENDLY_SPAWN -/mob/living/simple_animal/parrot/New() - ..() - speech_buffer = list() - available_channels = list() +/mob/living/simple_animal/parrot/Initialize(mapload) + . = ..() + GLOB.hear_radio_list += src update_speak() parrot_sleep_dur = parrot_sleep_max //In case someone decides to change the max without changing the duration var - verbs.Add(/mob/living/simple_animal/parrot/proc/steal_from_ground, \ - /mob/living/simple_animal/parrot/proc/steal_from_mob, \ - /mob/living/simple_animal/parrot/verb/drop_held_item_player, \ - /mob/living/simple_animal/parrot/proc/perch_player) - - desired_perches = typecacheof(list(/obj/structure/computerframe, /obj/structure/displaycase, \ - /obj/structure/filingcabinet, /obj/machinery/teleport, \ - /obj/machinery/suit_storage_unit,/obj/machinery/clonepod, \ - /obj/machinery/dna_scannernew, /obj/machinery/tcomms, \ - /obj/machinery/nuclearbomb, /obj/machinery/particle_accelerator, \ - /obj/machinery/recharge_station, /obj/machinery/smartfridge, \ - /obj/machinery/computer)) - + verbs.Add(list( + /mob/living/simple_animal/parrot/proc/steal_from_ground, + /mob/living/simple_animal/parrot/proc/steal_from_mob, + /mob/living/simple_animal/parrot/verb/drop_held_item_player, + /mob/living/simple_animal/parrot/proc/perch_player + )) + + desired_perches = typecacheof(list( + /obj/machinery/clonepod, + /obj/machinery/computer, + /obj/machinery/dna_scannernew, + /obj/machinery/nuclearbomb, + /obj/machinery/particle_accelerator, + /obj/machinery/recharge_station, + /obj/machinery/smartfridge, + /obj/machinery/suit_storage_unit, + /obj/machinery/tcomms, + /obj/machinery/teleport, + /obj/structure/computerframe, + /obj/structure/displaycase, + /obj/structure/filingcabinet + )) /mob/living/simple_animal/parrot/add_strippable_element() AddElement(/datum/element/strippable, GLOB.strippable_parrot_items) @@ -669,12 +677,13 @@ ) unique_pet = TRUE gold_core_spawnable = NO_SPAWN + available_channels = list(":e") + +/mob/living/simple_animal/parrot/Poly/Initialize(mapload) + . = ..() -/mob/living/simple_animal/parrot/Poly/New() ears = new /obj/item/radio/headset/headset_eng(src) - available_channels = list(":e") clean_speak += "Опасность! Нарушение целостности гиперструктуры кристалла! Целостность: [rand(75, 99)]%" // Has to be here cause of the `rand()`. - ..() /mob/living/simple_animal/parrot/Poly/npc_safe(mob/user) // Hello yes, I have universal speak and I follow people around and shout out antags return FALSE diff --git a/code/modules/mob/living/simple_animal/posessed_object.dm b/code/modules/mob/living/simple_animal/posessed_object.dm index c437c30957e97..7505d6ec02e2d 100644 --- a/code/modules/mob/living/simple_animal/posessed_object.dm +++ b/code/modules/mob/living/simple_animal/posessed_object.dm @@ -91,8 +91,8 @@ to_chat(src, "Your spirit has entered [src] and possessed it.
You are able to do most things a humanoid would be able to do with a [src] in their hands.
If you want to end your ghostly possession, use the 'ghost' verb, it won't penalize your ability to respawn.") -/mob/living/simple_animal/possessed_object/New(atom/loc as obj) - ..() +/mob/living/simple_animal/possessed_object/Initialize(mapload) + . = ..() if(!isitem(loc)) // Some silly motherfucker spawned us directly via the game panel. message_admins("Possessed object improperly spawned, deleting.") // So silly admins with debug off will see the message too and not spam these things. diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 8ce7b533a7dda..88ddc6189a2fc 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -474,14 +474,14 @@ /mob/living/simple_animal/get_item_by_slot(slot_id) switch(slot_id) - if(SLOT_HUD_COLLAR) + if(ITEM_SLOT_COLLAR) return pcollar . = ..() /mob/living/simple_animal/can_equip(obj/item/I, slot, disable_warning = 0) // . = ..() // Do not call parent. We do not want animals using their hand slots. switch(slot) - if(SLOT_HUD_COLLAR) + if(ITEM_SLOT_COLLAR) if(pcollar) return FALSE if(!can_collar) @@ -501,7 +501,7 @@ W.plane = ABOVE_HUD_PLANE switch(slot) - if(SLOT_HUD_COLLAR) + if(ITEM_SLOT_COLLAR) add_collar(W) /mob/living/simple_animal/unEquip(obj/item/I, force, silent = FALSE) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index bd29fb43c5fde..144f5c43fd74b 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -241,9 +241,9 @@ src:update_fhair() /mob/proc/put_in_any_hand_if_possible(obj/item/W as obj, del_on_fail = 0, disable_warning = 1) - if(equip_to_slot_if_possible(W, SLOT_HUD_LEFT_HAND, del_on_fail, disable_warning)) + if(equip_to_slot_if_possible(W, ITEM_SLOT_LEFT_HAND, del_on_fail, disable_warning)) return 1 - else if(equip_to_slot_if_possible(W, SLOT_HUD_RIGHT_HAND, del_on_fail, disable_warning)) + else if(equip_to_slot_if_possible(W, ITEM_SLOT_RIGHT_HAND, del_on_fail, disable_warning)) return 1 return 0 @@ -303,23 +303,24 @@ //The list of slots by priority. equip_to_appropriate_slot() uses this list. Doesn't matter if a mob type doesn't have a slot. GLOBAL_LIST_INIT(slot_equipment_priority, list( \ - SLOT_HUD_BACK,\ - SLOT_HUD_WEAR_PDA,\ - SLOT_HUD_WEAR_ID,\ - SLOT_HUD_JUMPSUIT,\ - SLOT_HUD_OUTER_SUIT,\ - SLOT_HUD_WEAR_MASK,\ - SLOT_HUD_HEAD,\ - SLOT_HUD_SHOES,\ - SLOT_HUD_GLOVES,\ - SLOT_HUD_LEFT_EAR,\ - SLOT_HUD_RIGHT_EAR,\ - SLOT_HUD_GLASSES,\ - SLOT_HUD_BELT,\ - SLOT_HUD_SUIT_STORE,\ - SLOT_HUD_TIE,\ - SLOT_HUD_LEFT_STORE,\ - SLOT_HUD_RIGHT_STORE\ + ITEM_SLOT_BACK,\ + ITEM_SLOT_PDA,\ + ITEM_SLOT_ID,\ + ITEM_SLOT_JUMPSUIT,\ + ITEM_SLOT_OUTER_SUIT,\ + ITEM_SLOT_MASK,\ + ITEM_SLOT_NECK,\ + ITEM_SLOT_HEAD,\ + ITEM_SLOT_SHOES,\ + ITEM_SLOT_GLOVES,\ + ITEM_SLOT_LEFT_EAR,\ + ITEM_SLOT_RIGHT_EAR,\ + ITEM_SLOT_EYES,\ + ITEM_SLOT_BELT,\ + ITEM_SLOT_SUIT_STORE,\ + ITEM_SLOT_ACCESSORY,\ + ITEM_SLOT_LEFT_POCKET,\ + ITEM_SLOT_RIGHT_POCKET\ )) //puts the item "W" into an appropriate slot in a human's inventory @@ -328,7 +329,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ if(!istype(W)) return 0 for(var/slot in GLOB.slot_equipment_priority) - if(isstorage(W) && slot == SLOT_HUD_HEAD) // Storage items should be put on the belt before the head + if(isstorage(W) && slot == ITEM_SLOT_HEAD) // Storage items should be put on the belt before the head continue if(equip_to_slot_if_possible(W, slot, FALSE, TRUE)) //del_on_fail = 0; disable_warning = 0 return 1 @@ -352,22 +353,22 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ var/mob/living/carbon/human/H = M switch(slot) - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) if(H.l_hand) return 0 return 1 - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) if(H.r_hand) return 0 return 1 - if(SLOT_HUD_WEAR_MASK) - if(!(slot_flags & SLOT_FLAG_MASK)) + if(ITEM_SLOT_MASK) + if(!(slot_flags & ITEM_SLOT_MASK)) return 0 if(H.wear_mask) return 0 return 1 - if(SLOT_HUD_BACK) - if(!(slot_flags & SLOT_FLAG_BACK)) + if(ITEM_SLOT_BACK) + if(!(slot_flags & ITEM_SLOT_BACK)) return 0 if(H.back) if(!(H.back.flags & NODROP)) @@ -375,8 +376,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_OUTER_SUIT) - if(!(slot_flags & SLOT_FLAG_OCLOTHING)) + if(ITEM_SLOT_OUTER_SUIT) + if(!(slot_flags & ITEM_SLOT_OUTER_SUIT)) return 0 if(H.wear_suit) if(!(H.wear_suit.flags & NODROP)) @@ -384,8 +385,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_GLOVES) - if(!(slot_flags & SLOT_FLAG_GLOVES)) + if(ITEM_SLOT_GLOVES) + if(!(slot_flags & ITEM_SLOT_GLOVES)) return 0 if(H.gloves) if(!(H.gloves.flags & NODROP)) @@ -393,8 +394,17 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_SHOES) - if(!(slot_flags & SLOT_FLAG_FEET)) + if(ITEM_SLOT_NECK) + if(!(slot_flags & ITEM_SLOT_NECK)) + return 0 + if(H.neck) + if(!(H.neck.flags & NODROP)) + return 2 + else + return 0 + return 1 + if(ITEM_SLOT_SHOES) + if(!(slot_flags & ITEM_SLOT_SHOES)) return 0 if(H.shoes) if(!(H.shoes.flags & NODROP)) @@ -402,12 +412,12 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_BELT) + if(ITEM_SLOT_BELT) if(!H.w_uniform) if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [name].") return 0 - if(!(slot_flags & SLOT_FLAG_BELT)) + if(!(slot_flags & ITEM_SLOT_BELT)) return 0 if(H.belt) if(!(H.belt.flags & NODROP)) @@ -415,8 +425,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_GLASSES) - if(!(slot_flags & SLOT_FLAG_EYES)) + if(ITEM_SLOT_EYES) + if(!(slot_flags & ITEM_SLOT_EYES)) return 0 if(H.glasses) if(!(H.glasses.flags & NODROP)) @@ -424,8 +434,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_HEAD) - if(!(slot_flags & SLOT_FLAG_HEAD)) + if(ITEM_SLOT_HEAD) + if(!(slot_flags & ITEM_SLOT_HEAD)) return 0 if(H.head) if(!(H.head.flags & NODROP)) @@ -433,8 +443,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_LEFT_EAR) - if(!(slot_flags & SLOT_HUD_LEFT_EAR)) + if(ITEM_SLOT_LEFT_EAR) + if(!(slot_flags & ITEM_SLOT_LEFT_EAR)) return 0 if(H.l_ear) if(!(H.l_ear.flags & NODROP)) @@ -442,8 +452,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_RIGHT_EAR) - if(!(slot_flags & SLOT_HUD_RIGHT_EAR)) + if(ITEM_SLOT_RIGHT_EAR) + if(!(slot_flags & ITEM_SLOT_RIGHT_EAR)) return 0 if(H.r_ear) if(!(H.r_ear.flags & NODROP)) @@ -451,8 +461,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_JUMPSUIT) - if(!(slot_flags & SLOT_FLAG_ICLOTHING)) + if(ITEM_SLOT_JUMPSUIT) + if(!(slot_flags & ITEM_SLOT_JUMPSUIT)) return 0 if(H.w_uniform) if(!(H.w_uniform.flags & NODROP)) @@ -460,12 +470,12 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_WEAR_ID) + if(ITEM_SLOT_ID) if(!H.w_uniform) if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [name].") return 0 - if(!(slot_flags & SLOT_FLAG_ID)) + if(!(slot_flags & ITEM_SLOT_ID)) return 0 if(H.wear_id) if(!(H.wear_id.flags & NODROP)) @@ -473,26 +483,26 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_LEFT_STORE) + if(ITEM_SLOT_LEFT_POCKET) if(H.l_store) return 0 if(!H.w_uniform) if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [name].") return 0 - if(w_class <= WEIGHT_CLASS_SMALL || (slot_flags & SLOT_FLAG_POCKET)) + if(w_class <= WEIGHT_CLASS_SMALL || (slot_flags & ITEM_SLOT_BOTH_POCKETS)) return 1 - if(SLOT_HUD_RIGHT_STORE) + if(ITEM_SLOT_RIGHT_POCKET) if(H.r_store) return 0 if(!H.w_uniform) if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [name].") return 0 - if(w_class <= WEIGHT_CLASS_SMALL || (slot_flags & SLOT_FLAG_POCKET)) + if(w_class <= WEIGHT_CLASS_SMALL || (slot_flags & ITEM_SLOT_BOTH_POCKETS)) return 1 return 0 - if(SLOT_HUD_SUIT_STORE) + if(ITEM_SLOT_SUIT_STORE) if(!H.wear_suit) if(!disable_warning) to_chat(H, "You need a suit before you can attach this [name].") @@ -514,15 +524,15 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 1 return 0 - if(SLOT_HUD_HANDCUFFED) + if(ITEM_SLOT_HANDCUFFED) if(H.handcuffed) return 0 return istype(src, /obj/item/restraints/handcuffs) - if(SLOT_HUD_LEGCUFFED) + if(ITEM_SLOT_LEGCUFFED) if(H.legcuffed) return 0 return istype(src, /obj/item/restraints/legcuffs) - if(SLOT_HUD_IN_BACKPACK) + if(ITEM_SLOT_IN_BACKPACK) if(H.back && istype(H.back, /obj/item/storage/backpack)) var/obj/item/storage/backpack/B = H.back if(length(B.contents) < B.storage_slots && w_class <= B.max_w_class) @@ -613,6 +623,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, PROC_REF(run_examinate), A)) /mob/proc/run_examinate(atom/A) + if(QDELETED(A)) + return if(A.invisibility > see_invisible) A = get_turf(A) if(!has_vision(information_only = TRUE) && !isobserver(src)) diff --git a/code/modules/mob/mob_holder.dm b/code/modules/mob/mob_holder.dm index 566296c5af7fb..f99b8229166eb 100644 --- a/code/modules/mob/mob_holder.dm +++ b/code/modules/mob/mob_holder.dm @@ -3,7 +3,7 @@ name = "holder" desc = "You shouldn't ever see this." icon = 'icons/obj/objects.dmi' - slot_flags = SLOT_FLAG_HEAD|SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_HEAD|ITEM_SLOT_BOTH_EARS /obj/item/holder/New() ..() @@ -98,7 +98,7 @@ name = "nian caterpillar" desc = "It's a tiny little itty bitty critter." icon_state = "mothroach" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD /obj/item/holder/drone/emagged name = "maintenance drone" @@ -107,7 +107,7 @@ /obj/item/holder/pai name = "pAI" desc = "It's a little robot." - icon_state = "pai" + icon_state = null /obj/item/holder/mouse name = "mouse" diff --git a/code/modules/mob/mob_misc_procs.dm b/code/modules/mob/mob_misc_procs.dm index e1d45290d01ef..01270b0f5f93e 100644 --- a/code/modules/mob/mob_misc_procs.dm +++ b/code/modules/mob/mob_misc_procs.dm @@ -523,7 +523,7 @@ //Direct dead say used both by emote and say //It is somewhat messy. I don't know what to do. //I know you can't see the change, but I rewrote the name code. It is significantly less messy now -/proc/say_dead_direct(message, mob/subject = null) +/proc/say_dead_direct(message, mob/subject, raw_message) var/name var/keyname if(subject && subject.client) @@ -544,12 +544,14 @@ for(var/obj/item/radio/deadsay_radio_system as anything in GLOB.deadsay_radio_systems) deadsay_radio_system.attempt_send_deadsay_message(subject, message) + var/should_show_runechat = (subject && raw_message && !subject.orbiting_uid) + for(var/mob/M in GLOB.player_list) - if(M.client && ((!isnewplayer(M) && M.stat == DEAD) || check_rights(R_ADMIN|R_MOD,0,M)) && M.get_preference(PREFTOGGLE_CHAT_DEAD)) + if(M.client && ((!isnewplayer(M) && M.stat == DEAD) || check_rights(R_ADMIN|R_MOD,0,M) || istype(M, /mob/living/simple_animal/revenant)) && M.get_preference(PREFTOGGLE_CHAT_DEAD)) var/follow var/lname if(subject) - if(subject != M) + if(subject != M && M.stat == DEAD) follow = "([ghost_follow_link(subject, ghost=M)]) " if(M.stat != DEAD && check_rights(R_ADMIN|R_MOD,0,M)) follow = "([admin_jump_link(subject)]) " @@ -568,6 +570,8 @@ lname = name lname = "[lname] " to_chat(M, "[lname][follow][message]") + if(should_show_runechat && (M.client?.prefs.toggles2 & PREFTOGGLE_2_RUNECHAT) && M.see_invisible >= subject.invisibility) + M.create_chat_message(subject, raw_message, symbol = RUNECHAT_SYMBOL_DEAD) /proc/notify_ghosts(message, ghost_sound = null, enter_link = null, title = null, atom/source = null, image/alert_overlay = null, flashwindow = TRUE, action = NOTIFY_JUMP, role = null) //Easy notification of ghosts. for(var/mob/O in GLOB.player_list) diff --git a/code/modules/mob/mob_say_base.dm b/code/modules/mob/mob_say_base.dm index 6b193b3fe9620..ddb279e0ac990 100644 --- a/code/modules/mob/mob_say_base.dm +++ b/code/modules/mob/mob_say_base.dm @@ -65,13 +65,13 @@ create_log(DEADCHAT_LOG, message) return - say_dead_direct("[pick("complains", "moans", "whines", "laments", "blubbers", "salts", "copes", "seethes", "malds")], \"[message]\"", src) + say_dead_direct("[pick("complains", "moans", "whines", "laments", "blubbers", "salts", "copes", "seethes", "malds")], \"[message]\"", src, raw_message=message) create_log(DEADCHAT_LOG, message) log_ghostsay(message, src) /** * Checks if the mob can understand the other speaker - * + * * If it return FALSE, then the message will have some letters replaced with stars from the heard message */ /mob/proc/say_understands(atom/movable/other, datum/language/speaking = null) diff --git a/code/modules/mob/mob_update_icons_base.dm b/code/modules/mob/mob_update_icons_base.dm index 0efe10b40cf52..67d79a89c70be 100644 --- a/code/modules/mob/mob_update_icons_base.dm +++ b/code/modules/mob/mob_update_icons_base.dm @@ -40,6 +40,9 @@ /mob/proc/update_inv_gloves() return +/mob/proc/update_inv_neck() + return + /mob/proc/update_mutations() return diff --git a/code/modules/mod/mod_activation.dm b/code/modules/mod/mod_activation.dm index 5dd2e207e1067..915d02d123cba 100644 --- a/code/modules/mod/mod_activation.dm +++ b/code/modules/mod/mod_activation.dm @@ -74,13 +74,13 @@ to_chat(user, "[part.name] already deployed!") playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) if(part in overslotting_parts) - var/obj/item/overslot = wearer.get_item_by_slot(slot_bitfield_to_slot(part.slot_flags)) + var/obj/item/overslot = wearer.get_item_by_slot(part.slot_flags) if(overslot) wearer.unEquip(overslot, TRUE) overslotting_parts[part] = overslot overslot.forceMove(part) RegisterSignal(part, COMSIG_ATOM_EXITED, PROC_REF(on_overslot_exit)) - if(wearer.equip_to_slot_if_possible(part, slot_bitfield_to_slot(part.slot_flags), disable_warning = TRUE)) + if(wearer.equip_to_slot_if_possible(part, part.slot_flags, disable_warning = TRUE)) part.flags |= NODROP if(mass) return TRUE @@ -109,7 +109,7 @@ if(overslotting_parts[part]) UnregisterSignal(part, COMSIG_ATOM_EXITED) var/obj/item/overslot = overslotting_parts[part] - if(!wearer.equip_to_slot_if_possible(overslot, slot_bitfield_to_slot(overslot.slot_flags), disable_warning = TRUE)) + if(!wearer.equip_to_slot_if_possible(overslot, overslot.slot_flags, disable_warning = TRUE)) overslot.forceMove(get_turf(wearer)) overslotting_parts[part] = null if(mass) diff --git a/code/modules/mod/mod_construction.dm b/code/modules/mod/mod_construction.dm index d526ae37a71b6..e74d76e3a35da 100644 --- a/code/modules/mod/mod_construction.dm +++ b/code/modules/mod/mod_construction.dm @@ -1,7 +1,6 @@ /obj/item/mod/construction desc = "A part used in MOD construction. You could insert it into a MOD shell." icon = 'icons/obj/clothing/modsuit/mod_construction.dmi' - icon_state = "rack_parts" /obj/item/mod/construction/helmet name = "MOD helmet" diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 4f5b79b684fd8..f20cada75cf5a 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -8,11 +8,11 @@ /obj/item/mod/control name = "MOD control unit" desc = "The control unit of a Modular Outerwear Device, a powered suit that protects against various environments." - icon_state = "mod_control" + icon_state = null item_state = "mod_control" base_icon_state = "control" w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK strip_delay = 10 SECONDS armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) actions_types = list( @@ -231,14 +231,14 @@ /obj/item/mod/control/equipped(mob/user, slot) ..() - if(slot == SLOT_HUD_BACK) + if(slot == ITEM_SLOT_BACK) set_wearer(user) else if(wearer) unset_wearer() /obj/item/mod/control/item_action_slot_check(slot) - if(slot == SLOT_HUD_BACK) + if(slot == ITEM_SLOT_BACK) return TRUE /obj/item/mod/control/on_mob_move(direction, mob/user) diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index 635b99e03d140..a78287e26c026 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -10,17 +10,17 @@ /// Theme name for the MOD. var/name = "BASE" /// Description added to the MOD. - var/desc = "A civilian class suit by Cybersun Industries, doesn't offer much other than slightly quicker movement." + var/desc = "A basic civilian modsuit by Cybersun Industries. Environmentally sealed but doesn't offer much in the way of protection." /// Extended description on examine_more - var/extended_desc = "A third-generation, modular civilian class suit by Cybersun Industries, \ - this suit is a staple across the galaxy for civilian applications. These suits are oxygenated, \ - spaceworthy, resistant to fire and chemical threats, and are immunized against everything between \ - a sneeze and a bioweapon. However, their combat applications are incredibly minimal due to the amount of \ - armor plating being installed by default, and their actuators only lead to slightly greater speed than industrial suits." + var/extended_desc = "Easily the most common civilian modsuit in the Sector today, the Cybersun Industries CS-11 'Wanderer' is a cheap, reliable, and lightweight EVA unit suited for all manner \ + of standard extravehicular tasks. As little more than a hard-shelled space suit, the Wanderer offers little in the way of remarkable features. Its thin armor panelling is rated for micrometeoroids and little \ + else, easily faltering before any dedicated melee, projectile, or energy weapon. Its mass-produced servo systems, while quite efficient, are also underpowered, leading to mildly reduced movement, \ + though this is somewhat offset by the suit's lightweight design. Today, the Wanderer is found nearly everywhere space travel occurs, as its low price tag and ease of use make it \ + perfect for small-time traders, frontier colonies, and other civilian spacecraft." /// Default skin of the MOD. var/default_skin = "standard" /// The slot this mod theme fits on - var/slot_flags = SLOT_FLAG_BACK + var/slot_flags = ITEM_SLOT_BACK /// Armor shared across the MOD parts. var/obj/item/mod/armor/armor_type_1 = /obj/item/mod/armor/mod_theme /// the actual armor object placed in a datum as I am tired and I just want this to work @@ -58,7 +58,7 @@ UNSEALED_LAYER = COLLAR_LAYER, SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCKHAIR, - SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -82,7 +82,7 @@ UNSEALED_LAYER = null, UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, - UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS |HIDEEYES, UNSEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -105,7 +105,7 @@ /// We don't want the civilian skin to apply to all modsuits, that causes issues. /datum/mod_theme/standard - name = "standard" + name = "'Wanderer' standard" /datum/mod_theme/New() @@ -116,13 +116,12 @@ armor = list(MELEE = 15, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 0, RAD = 25, FIRE = 33, ACID = 33) /datum/mod_theme/engineering - name = "engineering" - desc = "An engineer-fit suit with heat and shock resistance. Cybersun Industries's classic." - extended_desc = "A classic by Cybersun Industries, and surely their claim to fame. This model is an \ - improvement upon the first-generation prototype models from before the Void War, boasting an array of features. \ - The modular flexibility of the base design has been combined with a blast-dampening insulated inner layer and \ - a shock-resistant outer layer, making the suit nigh-invulnerable against even the extremes of high-voltage electricity. \ - However, the capacity for modification remains the same as civilian-grade suits." + name = "'Spark' engineering" + desc = "A standard industrial modsuit. Fire-resistant, shockproof, and fitted with lead insulation for additional radiation protection." + extended_desc = "The flagship product of Cybersun Industries's industrial modsuit lineup, the CS-15 'Spark' is an EVA-capable engineering suit designed to provide personal protection in all manner of hostile work environments. \ + The double-insulated carapace renders the user immune to most electrical hazards, while an additional layer of lead plating massively reduces (but does not eliminate) radiation exposure from high-intensity sources, permitting work to be performed in \ + active radiological zones as long as exposure is properly managed. An inner layer of nomex provides some protection against exposure to the radiant heat of active fires, \ + but is not rated for full fire engulfment. It also offers some minor protection against low-grade explosive detonations." default_skin = "engineering" armor_type_1 = /obj/item/mod/armor/mod_theme_engineering resistance_flags = FIRE_PROOF @@ -141,7 +140,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -166,13 +165,12 @@ armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 30, RAD = 150, FIRE = INFINITY, ACID = 150) //Bomb armor bumped up a bit, as the modsuit describes it with blast-dampening /datum/mod_theme/atmospheric - name = "atmospheric" - desc = "An atmospheric-resistant suit by Cybersun Industries, offering extreme heat resistance compared to the engineer suit." - extended_desc = "A modified version of the Cybersun Industries industrial model. This one has been \ - augmented with the latest in heat-resistant alloys, paired with a series of advanced heatsinks. \ - Additionally, the materials used to construct this suit have rendered it extremely hardy against \ - corrosive gasses and liquids, useful in the world of pipes. \ - However, the capacity for modification remains the same as civilian-grade suits." + name = "'Canary' atmospheric" + desc = "A reinforced atmospherics modsuit meant for extreme environments. Completely fireproof, but somewhat lacking in modification potential and power efficiency." + extended_desc = "Developed from the popular 'Spark' chassis, the CS-16 'Canary' utility modsuit is specialised for use by atmospherics specialists. The outer carapace is made of highly insulating thermally-reflective composites \ + underlain with multiple layers of insulating fiberglass, which, in combination with a high-powered thermal regulation system, provides the user complete protection from even full engulfment inside a raging plasma fire. \ + The helmet contains integrated filtration systems that protect the user from sudden releases of harmful gasses, - a feature not present in the 'Spark' suit. \ + Cybersun Industries reminds users that this model features minimal radiation shielding - it is not suitable PPE for use in radiological hazard zones." default_skin = "atmospheric" armor_type_1 = /obj/item/mod/armor/mod_theme_atmospheric resistance_flags = FIRE_PROOF @@ -196,7 +194,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, UNSEALED_COVER = HEADCOVERSMOUTH, SEALED_COVER = HEADCOVERSEYES, ), @@ -222,13 +220,13 @@ armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 15, FIRE = INFINITY, ACID = 150) /datum/mod_theme/advanced - name = "advanced" - desc = "An advanced version of Cybersun Industries's classic suit, shining with a white, acid and fire resistant polish." - extended_desc = "The flagship version of the Cybersun Industrie industrial model, and their latest product. \ - Combining all the features of their other industrial model suits inside, with blast resistance almost approaching \ - some EOD suits, the outside has been coated with a white polish rumored to be a corporate secret. \ - The paint used is almost entirely immune to corrosives, and certainly looks damn fine. \ - These come pre-installed with magnetic boots, using an advanced system to toggle them on or off as the user walks." + name = "'Daedalus' advanced" + desc = "A highly advanced competitor to the standard engineering modsuit. Completely resistant to radiation, fire, and electricity, with improved conventional armor to boot. The paint gleams like freshly fallen snow." + extended_desc = "A product of the bloated generosity of several prominent Nanotrasen executives and their desire to upstage Cybersun at their own game, the NA-20 'Daedalus' represents the peak of powered industrial protection. The thick, double-insulated plastitanium composite carapace offers complete protection from most electrical hazards \ + in addition to enhanced resistance against heavy impacts, mid-grade explosive detonations, and a slight resistance to directed energy blasts. An underlayer of lead overlain with depleted uranium offers unparalleled protection from even \ + the most intense radiation exposure, whilst the advanced thermal control system and thermally-reflective surface coating allows the suit to withstand full flame engulfment. The built-in magboots also feature advanced predictive algorithms \ + so that they can activate and deactivate as the user moves their feet, removing the heavy slogging motion caused by standard magboots. This entire package is supported by a combination of custom joint motors and pseudo-muscle bundles \ + that are capable of supporting the full weight of the suit and moving it just as fast as the user inside could without any encumbrance, making it so unobtrusive that many users feel absolutely no need to remove the suit, even at times when there's really no point in wearing it." default_skin = "advanced" armor_type_1 = /obj/item/mod/armor/mod_theme_advanced resistance_flags = FIRE_PROOF @@ -258,7 +256,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -283,22 +281,14 @@ armor = list(MELEE = 35, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 50, RAD = INFINITY, FIRE = INFINITY, ACID = 150) /datum/mod_theme/mining - name = "mining" - desc = "A Nanotrasen mining suit for on-site operations, fit with accreting ash armor and a sphere form." - extended_desc = "A high-powered Nanotrasen-designed suit, based off the work of Cybersun Industries. \ - While initial designs were built for the rigors of asteroid mining, given blast resistance through inbuilt ceramics, \ - mining teams have since heavily tweaked the suit themselves with assistance from devices crafted by \ - destructive analysis of unknown technologies discovered on the Indecipheres mining sites, patterned off \ - their typical non-EVA exploration suits. The visor has been expanded to a system of seven arachnid-like cameras, \ - offering full view of the land and its soon-to-be-dead inhabitants. The armor plating has been trimmed down to \ - the bare essentials, geared far more for environmental hazards than combat against fauna; however, \ - this gives way to incredible protection against corrosives and thermal protection good enough for \ - traversing the hostile climate of scorching hot barren planets, molten, and volcanic worlds like Epsilon Eridanii II. \ - Instead, the suit is capable of using its' anomalous properties to attract and \ - carefully distribute layers of ash or ice across the surface; these layers are ablative, but incredibly strong. \ - However, all of this has proven to be straining on all Nanotrasen-approved cells, \ - so much so that it comes default fueled by equally-enigmatic plasma fuel rather than a simple recharge. \ - Additionally, the systems have been put to near their maximum load, allowing for far less customization than others." + name = "'Pioneer' mining" + desc = "A Nanotrasen mining suit for extracting resources in even the harshest of environments. Highly mobile with decent protection against fire and melee attackers. Its external ports have been replaced by an opening on the upper chest which accepts plasma sheets to recharge its specialized plasma energy core." + extended_desc = "A fairly recent innovation from Nanotrasen's research division, the NA-10 'Pioneer' is a rugged and reliable mining suit specialized for extraction operations in extreme conditions. \ + Incorporating a durable kevlar bodysuit under strategically placed armor panels, the Pioneer offers sound protection against melee attacks, while additional attachment points allow for specialized armor to be \ + attached at user discretion. As an extra protective measure against the vicious ash storms of Lavaland, an experimental ash accretion system has also been integrated, protecting the wearer with a shell of ablative ash. \ + This particular variant of the Pioneer has also been fitted with a specialized plasma-fueled energy core, allowing for surface miners to quickly recharge \ + even on long-term excursions, though this comes at the cost of greatly decreased maximum operating time. Today, this suit is most often used by Nanotrasen's extraction division in their endless quest for Plasma, though \ + several other prominent mining companies have purchased large stocks of the suit for their own operations." default_skin = "mining" armor_type_1 = /obj/item/mod/armor/mod_theme_mining resistance_flags = FIRE_PROOF | LAVA_PROOF @@ -326,7 +316,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCKHAIR, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -351,7 +341,7 @@ UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -376,17 +366,14 @@ armor = list(MELEE = 30, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, RAD = 50, FIRE = 50, ACID = 50) /datum/mod_theme/loader - name = "loader" - desc = "An unsealed experimental motorized harness manufactured by Scarborough Arms for quick and efficient munition supplies." - extended_desc = "This powered suit is an experimental spinoff of in-atmosphere Engineering suits. \ - This fully articulated titanium exoskeleton is Scarborough Arms' suit of choice for their munition delivery men, \ - and what it lacks in EVA protection, it makes up for in strength and flexibility. The primary feature of \ - this suit are the two manipulator arms, carefully synchronized with the user's thoughts and \ - duplicating their motions almost exactly. These are driven by myomer, an artificial analog of muscles, \ - requiring large amounts of voltage to function; occasionally sparking under load with the sheer power of a \ - suit capable of lifting 250 tons. Even the legs in the suit have been tuned to incredible capacity, \ - the user being able to run at greater speeds for much longer distances and times than an unsuited equivalent. \ - A lot of people would say loading cargo is a dull job. You could not disagree more." + name = "'Heracles' loader" + desc = "An unsealed industrial exoframe developed by Aussec Armory for munitions loading and heavy equipment transport. Incredible carrying capacity, but lackluster armor and modability." + extended_desc = "Aussec Armory's first foray into the field of powered modsuits, the AX-05 'Heracles' was designed from the ground-up for transporting heavy equipment and munitions. Incorporating a suite \ + of exceptionally powerful hydraulic systems and myomer synth-muscle, the Heracles's two massive lifting arms are capable of carrying loads up to 250 tons without hampering mobility. \ + High-grade servomotors round out the package, ensuring complete freedom of movement even when transporting the largest of crates or artillery shells. Unfortunately, the Heracles is severely lacking \ + in the protection department, with only a simple steel outer shell that may deflect a crude melee weapon at most. The suit also entirely lacks environmental sealing, a point Aussec makes very clear \ + in their user agreement, while the immense space demands of the hydraulics drastically cut the suit's modification potential. Despite these shortcomings, the Heracles was a breakout success, and now \ + sees extensive use within the Trans-Solar Federation's logistics corps, and in loading bays across the Sector." default_skin = "loader" armor_type_1 = /obj/item/mod/armor/mod_theme_loader max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT @@ -403,7 +390,7 @@ UNSEALED_LAYER = null, UNSEALED_CLOTHING = THICKMATERIAL | BLOCKHAIR, - SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -424,14 +411,14 @@ armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 25, ACID = 25) /datum/mod_theme/medical - name = "medical" - desc = "A lightweight suit by DeForest Medical Corporation, allows for easier movement." - extended_desc = "A lightweight suit produced by the DeForest Medical Corporation and BioTech Solutions, based off the work of \ - Cybersun Industries. The latest in technology has been employed in this suit to render it immunized against \ - allergens, airborne toxins, and regular pathogens. The primary asset of this suit is the speed, \ - fusing high-powered servos and actuators with a carbon-fiber construction. While there's very little armor used, \ - it is incredibly acid-resistant. It is slightly more demanding of power than civilian-grade models, \ - and weak against fingers tapping the glass." + name = "'Apollo' medical" + desc = "A lightweight medical modsuit. Environmentally sealed and acid-resistant but offering little else in the way of armor. Thankfully, the light materials and motors keep mobility high." + extended_desc = "A lightweight medical suit produced by the DeForest Medical Corporation, the D-101 'Apollo' is a simple powered medical suit intended for recovering and treating \ + patients in environmentally risky zones, such as space stations, chemical facilities, and disease outbreak sites. Composed of a lightweight aluminum frame supporting a polymer & carbon fiber \ + outer shell, the Apollo maintains a surprisingly light weight that allows its underpowered and inefficient servomotors to easily keep the wearer operating at maximum speed. \ + This comes at a cost in protection, however, as while the Apollo's treated paneling offers excellent defense against biological and chemical agents, it is entirely ineffective against \ + any form of conventional attack or weapon. Today, the Apollo is an exceptionally common suit seen in medical bays across the Orion Arm, and is well-loved by EMTs and virologists \ + alike for its ease of use and movement." default_skin = "medical" armor_type_1 = /obj/item/mod/armor/mod_theme_medical charge_drain = DEFAULT_CHARGE_DRAIN * 2 @@ -457,7 +444,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -482,7 +469,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -507,14 +494,14 @@ armor = list(MELEE = 10, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 75, ACID = 150) /datum/mod_theme/rescue - name = "rescue" - desc = "An advanced version of DeForest Medical Corporation's medical suit, designed for quick rescue of bodies from the most dangerous environments." - extended_desc = "An upgraded, overtuned version of DeForest Medical Corporation's medical suit, with BioTech Solutions making heavy modifications. \ - designed for quick rescue of bodies from the most dangerous environments. The same advanced leg servos \ - as the base version are seen here, giving paramedics incredible speed, but the same servos are also in the arms. \ - Users are capable of quickly hauling even the heaviest crewmembers using this suit, \ - all while being entirely immune against chemical and thermal threats. \ - It is slightly more demanding of power than civilian-grade models, and weak against fingers tapping the glass." + name = "'Valkyrie' rescue" + desc = "A next-generation medical suit for casualty care in even the most hostile of conditions. Fast, chemically sealed, and decently armored to boot." + extended_desc = "A direct upgrade to the older Apollo line, the D-112 'Valkyrie' is an advanced medical modsuit produced by the DeForest Medical Corporation. Offering iterative improvement over earlier lines, \ + the Valkyrie uses improved servo systems and drive motors to deliver faster movement speed than the Apollo line, and it comes standard with a high-efficiency energy core which helps offset its otherwise outsized power draw. \ + The suit's armor has also seen large improvement, incorporating ballistic polymer impact panels in key areas, offering moderate protection against melee and projectile attacks, while a chemically-treated \ + aramid bodysuit provides near-complete safety against fire and caustic chemicals. For added protection in chemical and biological hazard zones, the helmet incorporates an integrated CBRN filtration system rated \ + to halt even the most virulent of chemical weapons or infectious diseases. Today, the Valkyrie is a mainstay of numerous corporate and governmental medical units across the Sector, though the high price tag means \ + that many less-funded medical practices continue to operate the Apollo series." default_skin = "rescue" armor_type_1 = /obj/item/mod/armor/mod_theme_rescue resistance_flags = FIRE_PROOF | ACID_PROOF @@ -544,7 +531,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -569,15 +556,14 @@ armor = list(MELEE = 20, BULLET = 20, LASER = 5, ENERGY = 5, BOMB = 10, RAD = 50, FIRE = 150, ACID = 150) //Extra melee / bullet armor for if they get caught in a fight. Of course, no laser armor. /datum/mod_theme/research - name = "research" - desc = "A private military EOD suit by Aussec Armory, intended for explosive research. Bulky, but expansive." - extended_desc = "A private military EOD suit by Aussec Armory, based off the work of Cybersun Industries. \ - This suit is intended for explosive research, built incredibly bulky and well-covering. \ - Featuring an inbuilt chemical scanning array, this suit uses two layers of plastitanium armor, \ - sandwiching an inert layer to dissipate kinetic energy into the suit and away from the user; \ - outperforming even the best conventional EOD suits. However, despite its immunity against even \ - missiles and artillery, all the explosive resistance is mostly working to keep the user intact, \ - not alive. The user will also find narrow doorframes nigh-impossible to surmount." + name = "'Minerva' research" + desc = "A powered EOD suit produced by Aussec Armory. Absolutely unmatched explosive and acid protection, along with heavy conventional armor and high modding potential." + extended_desc = "Developed following the surprising success of the 'Heracles' powerloader suit, the AX-1-0 'Minerva' was originally intended as a competitor to ongoing TSF trials for a new generation \ + of bomb-disposal armor. While the original design would fail to meet Federation maintenance standards, Aussec's board of directors saw sufficient potential in the suit to market it instead as a \ + heavy-duty research platform. Equipped with double-layered blast foam paneling encased in a durable plasteel outer carapace, the AX-1-0 offers outstanding protection against explosives and industrial chemicals, \ + and will even deflect some low-caliber ballistic rounds and melee weaponry. Unfortunately, underperforming heat dissipation materials mean that the suit offers little in the way of directed energy \ + protection. Today, the Minerva is most often seen in high-profile research laboratories, given its high price tag and maintenance requirements. Notably, Nanotrasen has purchased a significant number of the suits \ + for high-ranking science personnel, shipping most to the advanced testing labs of Epsilon Eridani." default_skin = "research" armor_type_1 = /obj/item/mod/armor/mod_theme_research resistance_flags = FIRE_PROOF | ACID_PROOF @@ -601,7 +587,7 @@ UNSEALED_LAYER = null, UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, - UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, UNSEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -626,14 +612,14 @@ armor = list(MELEE = 30, BULLET = 30, LASER = 5, ENERGY = 5, BOMB = INFINITY, RAD = 75, FIRE = 75, ACID = 150) //Slow balistic / explosive testing armor. Not laser testing however! /datum/mod_theme/security - name = "security" - desc = "A Shellguard Munitions security suit, offering quicker speed at the cost of carrying capacity." - extended_desc = "A Shellguard Munitions classic, this model of MODsuit has been designed for quick response to \ - hostile situations. These suits have been layered with plating worthy enough for fires or corrosive environments, \ - and come with composite cushioning and an advanced honeycomb structure underneath the hull to ensure protection \ - against broken bones or possible avulsions. The suit's legs have been given more rugged actuators, \ - allowing the suit to do more work in carrying the weight. However, the systems used in these suits are more than \ - a few years out of date, leading to an overall lower capacity for modules." + name = "'Takabara' security" + desc = "An older-model Shellguard Munitions combat modsuit intended for corporate security forces. Decently armored and highly mobile, but somewhat lackluster in modification potential." + extended_desc = "A fairly average private security modsuit, the SA-330 'Takabara' is a Shellguard Munitions workhorse, and a recognizable symbol of Nanotrasen corporate security. \ + Equipped with kevlar paneling in vital areas and ceramic strike plates in the chest and back, the Takabara offers sufficient protection to deter most petty criminals and improvised melee weapons, \ + though it stands little match in the face of gunfire or advanced melee weapons. An unconventional nomex underlayer and chemically treated plating provides deceptively high fire \ + and acid protection. While the suit is quite easy to maintain, the limitations of its last-gen design have gradually become more apparent, with easily-taxed servos and restrictive hardware that limits its modification potential. \ + Despite these flaws, the Takabara continues to see immense success in the private security market across the Sector largely due to its low price and ease of operation. In particular, Nanotrasen \ + remains a primary customer thanks to their deep ties with Shellguard and extensive security infrastructure." default_skin = "security" armor_type_1 = /obj/item/mod/armor/mod_theme_security complexity_max = DEFAULT_MAX_COMPLEXITY - 3 @@ -656,7 +642,7 @@ UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, UNSEALED_COVER = HEADCOVERSMOUTH, SEALED_COVER = HEADCOVERSEYES, ), @@ -682,14 +668,14 @@ armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 25, RAD = 0, FIRE = 150, ACID = 150) /datum/mod_theme/safeguard - name = "safeguard" - desc = "A Shellguard Munitions advanced security suit, offering greater speed and fire protection than the standard security model." - extended_desc = "A Shellguard Munitions advanced security suit, and their latest model. This variant has \ - ditched the presence of a reinforced glass visor entirely, replacing it with a 'blast visor' utilizing a \ - small camera on the left side to display the outside to the user. The plating on the suit has been \ - dramatically increased, especially in the pauldrons, giving the wearer an imposing silhouette. \ - Heatsinks line the sides of the suit, and greater technology has been used in insulating it against \ - both corrosive environments and sudden impacts to the user's joints." + name = "'Safeguard' bulwark" + desc = "A current-gen suit of powered armor by Shellguard Munitions. Offers substantially improved protection over the base security modsuit, and is completely fireproof." + extended_desc = "A fairly recent development by Shellguard Munitions, the SA-350 'Safeguard' modsuit is a largely iterative powered armor suit that builds off of and offers improvement \ + over the older Takabara series of corporate security suits. Expanding the ceramic and steel plating further provides significantly improved conventional defenses, while the addition of \ + an advanced temperature regulation system makes the Safeguard completely immune to extreme heat. The suit's internals were also enhanced, with improved servo systems for added mobility, \ + while the suit's updated computer hardware improves its overall modification potential. The most striking development, however, is the suit's overall bulkier and more intimidating appearance, incorporating \ + pronounced armored pauldrons and replacing the traditional eyeholes with a camera-equipped blank faceplate. Today, the Safeguard is most commonly seen in well-funded corporate security units, most \ + notably the Nanotrasen Corporation, which has purchased a large stock of the suits for high-ranking security personnel." default_skin = "safeguard" armor_type_1 = /obj/item/mod/armor/mod_theme_safeguard resistance_flags = FIRE_PROOF @@ -712,7 +698,7 @@ UNSEALED_LAYER = null, UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, - UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, UNSEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -737,17 +723,13 @@ armor = list(MELEE = 30, BULLET = 25, LASER = 25, ENERGY = 15, BOMB = 40, RAD = 25, FIRE = INFINITY, ACID = 150) /datum/mod_theme/magnate - name = "magnate" - desc = "A fancy, very protective suit for Nanotrasen's captains. Shock, fire and acid-proof while also having a large capacity and high speed." - extended_desc = "They say it costs four hundred thousand credits to run this MODsuit... for twelve seconds. \ - The Magnate suit is designed for protection, comfort, and luxury for Nanotrasen Captains. \ - The onboard air filters have been preprogrammed with an additional five hundred different fragrances that can \ - be pumped into the helmet, all of highly-endangered flowers. A bespoke Tralex mechanical clock has been placed \ - in the wrist, and the Magnate package comes with carbon-fibre cufflinks to wear underneath. \ - My God, it even has a granite trim. The double-classified paint that's been painstakingly applied to the hull \ - provides protection against shock, fire, and the strongest acids. Onboard systems employ meta-positronic learning \ - and bluespace processing to allow for a wide array of onboard modules to be supported, and only the best actuators \ - have been employed for speed. The resemblance to a Gorlex Marauder helmet is *purely* coincidental." + name = "'Magnate' command" + desc = "An advanced command modsuit developed by Nanotrasen for high-ranking corporate officers. Heavily armored, highly mobile, and plenty of space for modifications." + extended_desc = "An in-house design by Nanotrasen R&D, the Magnate encases the user inside a shell of plastitanum alloy with an ablative surface coating, giving robust protection against ballistic and energy-based threats in equal measure, and granting respectable protection from corrosive substances as well. \ + An under-layer of ultra low-conductivity ceramic provides protection against the heat of raging fires and high intensity electrical discharges.\ + The use of custom articulation first utilized in the NA-20 'Daedalus' means that the Magnate will not encumber the user under most circumstances, allowing them to move freely despite the mass of the suit. \ + The over-engineered electrical and hydraulic systems also give it exceptional capacity for modification, allowing endless choice in how exactly a captain may wish to drain the resources of their robotics department. \ + Overall, the Magnate provides protection rivalled only by the 'Jaeger' MODsuit of Syndicate infamy. Nanotrasen's public relations department maintains that any resemblance to designs used by Gorlex are purely coincidental." default_skin = "magnate" armor_type_1 = /obj/item/mod/armor/mod_theme_magnate resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF // Theft targets should be hard to destroy @@ -771,7 +753,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -796,15 +778,13 @@ armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 15, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = 450) //On one hand this is quite strong, on the other hand energy hole / antagonists need to steal, and thus by extention use this. /datum/mod_theme/praetorian - name = "praetorian" - desc = "A prototype of the Magnate-class suit issued to station Blueshields, still boasting exceptional protection worthy of an honor guard." - extended_desc = "A prototype of the Magnate-class suit issued for use with the station Blueshields, \ - it boasts most of the exceptional protection of it's successor, while sacrificing some of the module capacity.\ - Most of the protection of the Magnate, with none of the comfort! The visor uses blue-light to obscure \ - the face of it's wearer, adding to it's imposing figure. Compared to the sleek and luxurious design \ - that came after it, this suit does nothing to hide it's purpose, the reinforced plating layered \ - over the insulated inner armor granting it protection against corrosive liquids, explosive blasts, \ - fires, electrical shocks, and contempt from the rest of the crew." + name = "'Praetorian' escort" + desc = "A Nanotrasen refit of the Takabara modsuit line. Offers higher mobility than the base model, and comes with a snazzy blue-and-black paint job." + extended_desc = "A licensed copy of the Shellguard Munitions 'Takabara' modsuit, the NA-35 'Praetorian' is specially issued to Nanotrasen Asset Protection's Blueshield Corps: \ + elite bodyguards charged with protecting Nanotrasen VIPs. As such, the suit's motor and weight distribution systems have seen a measure of improvement, to allow for the \ + Blueshields to more effectively respond to threats facing their charges. Beyond this and its stylish blue & black paint job, however, the Praetorian differs little \ + from its Shellguard roots, retaining its middling armor ratings and restrictive hardware. Even so, Nanotrasen is more than happy with the design, and has proceeded \ + with a full rollout of the suit to Blueshields across their corporate empire." default_skin = "praetorian" armor_type_1 = /obj/item/mod/armor/praetorian resistance_flags = FIRE_PROOF | ACID_PROOF @@ -830,7 +810,7 @@ UNSEALED_LAYER = COLLAR_LAYER, SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -855,8 +835,8 @@ armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 25, RAD = 0, FIRE = 150, ACID = 150) //Equivalent armor to Security MODsuits /datum/mod_theme/cosmohonk - name = "cosmohonk" - desc = "A suit by Honk Ltd. Protects against low humor environments. Most of the tech went to lower the power cost." + name = "'Cosmohonk' entertainer" + desc = "A highly specialized modsuit for use by clowns across the Sector. Excellent power efficiency, godawful everything else." extended_desc = "The Cosmohonk MODsuit was originally designed for interstellar comedy in low-humor environments. \ It utilizes tungsten electro-ceramic casing and chromium bipolars, coated in zirconium-boron paint underneath \ a dermatiraelian subspace alloy. Despite the glaringly obvious optronic vacuum drive pedals, \ @@ -880,7 +860,7 @@ UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, - SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -905,15 +885,15 @@ armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5, RAD = 0, FIRE = 75, ACID = 50) /datum/mod_theme/syndicate - name = "syndicate" - desc = "A suit designed by Gorlex Marauders, offering armor ruled illegal in most of Spinward Stellar." - extended_desc = "An advanced combat suit adorned in a sinister crimson red color scheme, produced and manufactured \ - for special mercenary operations. The build is a streamlined layering consisting of shaped Plasteel, \ - and composite ceramic, while the under suit is lined with a lightweight Kevlar and durathread hybrid weave \ - to provide ample protection to the user where the plating doesn't, with an illegal onboard electric powered \ - ablative shield module to provide resistance against conventional energy firearms. \ - A small tag hangs off of it reading; 'Property of the Gorlex Marauders, with assistance from Cybersun Industries. \ - All rights reserved, tampering with suit will void warranty." + name = "'Raider' blood-red syndicate" + desc = "An intimidating suit of powered armor in Gorlex blood-red & black, primarily used by the Syndicate. Offers substantial protection in all areas, and looks great while doing so." + extended_desc = "One of the Syndicate's most recognizable symbols, the CSC-22 'Raider' was commissioned by the Gorlex Marauders in conjunction with an unknown benefactor \ + some suspect to be Cybersun Industries, though the company vigorously denies this claim. The suit itself is purpose-built for fast-paced, high-intensity combat, and is armored to match. \ + Though offering substantial conventional armor with a durathread-kevlar underlayer overlaid with steel armor panels and ceramic strike plates, the Raider's most notable armor comes from its advanced Armor Booster in-built module. \ + Consisting of a miniaturized electromagnetic defense system and combat servomotors, the module allows the user to switch to 'Combat Mode' at the press of a button, massively improving movement speed and defense capability. \ + Unfortunately, doing so requires sacrificing EVA capability, as power is diverted from the environmental regulation systems, while auxiliary vents open to keep the EM defenses' motor cooled. \ + Today, the Raider is used almost exclusively by the Syndicate, and is the standard combat suit for their Nuclear Strike Teams. In particular, the Gorlex Marauders use the Raider as their standard assault suit, \ + and the mere sight of its blood-red plating is known to induce terror in most indepedent merchantmen." default_skin = "syndicate" armor_type_1 = /obj/item/mod/armor/mod_theme_syndicate flag_2_flags = RAD_PROTECT_CONTENTS_2 @@ -940,7 +920,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -965,7 +945,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -993,14 +973,14 @@ //laser = 20 with booster //energy = //20 with booster, energy has always been an armor hole. /datum/mod_theme/elite - name = "elite" - desc = "An elite suit upgraded by Cybersun Industries, offering upgraded armor values." - extended_desc = "An evolution of the syndicate suit, featuring a bulkier build and a matte black color scheme, \ - this suit is only produced for high ranking Syndicate officers and elite strike teams. \ - It comes built with a secondary layering of ceramic and Kevlar into the plating providing it with \ - exceptionally better protection along with fire and acid proofing. A small tag hangs off of it reading; \ - 'Property of the Gorlex Marauders, with assistance from Cybersun Industries. \ - All rights reserved, tampering with suit will void life expectancy.'" + name = "'Jaeger' elite syndicate" + desc = "A terrifying, jet-black suit of advanced power armor, used by the Syndicate's elite forces. Completely fireproof, and offers phenomenal protection in all areas." + extended_desc = "Following the incredible success of the Raider-series combat modsuit, several other prominent mercenary and pirate groups began to look into procuring their own personal combat modsuits, most notably the mysterious Inner Circle PMC. \ + The resulting design, known as the CSC-25 'Jaeger', is one of the finest suits of powered armor ever devised, and a herald of imminent death for any opposed to the Inner Circle and the Syndicate. \ + Replacing the earlier steel and ceramic armor panels with a reinforced plastitanium-alloy carapace and strengthened sorbothane impact absorption panels over the traditional kevlar weave undersuit, the Jaeger offers massively improved \ + protection over the Raider, including complete immunity to extreme heat. The Armor Booster subsystem has seen similar improvements, increasing protection to such an extent that only armor-piercing rifle rounds can reliably penetrate the armor. \ + Even the suit's helmet has seen massive changes, replacing the iconic quad-camera faceplate with a polarized plasmaglass visor, and incorporating an advanced filtration system to counteract chemical attacks. \ + Altogether, the Jaeger offers some of the best personal protection in the Sector, and has a price tag to match. Only the wealthiest of Syndicate clients can even hope to purchase one of these suits, let alone outfit an entire company with them." default_skin = "elite" armor_type_1 = /obj/item/mod/armor/mod_theme_elite resistance_flags = FIRE_PROOF | ACID_PROOF @@ -1028,7 +1008,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -1057,15 +1037,14 @@ //energy = 15 // 25 /datum/mod_theme/prototype - name = "prototype" - desc = "A prototype modular suit powered by locomotives. While it is comfortable and has a big capacity, it remains very bulky and power-inefficient." - extended_desc = "This is a prototype powered exoskeleton, a design not seen in hundreds of years, the first \ - post-void war era modular suit to ever be safely utilized by an operator. This ancient clunker is still functional, \ - though it's missing several modern-day luxuries from updated Cybersun Industries designs. \ - Primarily, the suit's myoelectric suit layer is entirely non-existant, and the servos do very little to \ - help distribute the weight evenly across the wearer's body, making it slow and bulky to move in. \ - The internal heads-up display is rendered in nearly unreadable cyan, as the visor suggests, \ - leaving the user unable to see long distances. However, the way the helmet retracts is pretty cool." + name = "'Ogre' prototype" + desc = "A prototype modular suit developed many years ago. Incredibly heavy, power inefficient, and lacking in protection. At the very least, it's easy to modify." + extended_desc = "Quite possibly the first true modsuit ever created, the 'Ogre', as its mostly-faded ID label calls it, is a positively ancient mechanized suit that represents the very beginning of \ + the Sector's foray into powered modsuits. Naturally, such an elderly design lacks virtually all of the quality of life features seen in modsuits today. \ + The first-generation servodrives are woefully underpowered and exceptionally inefficient, leading to a ponderous top speed and an average battery life entirely \ + unsuited to extended EVA usage. As a technology testbed, the Ogre is also sorely lacking in armor protection, possessing little more than a steel carapace \ + more suited to deflecting micrometeoroids than any dedicated weaponry, though the treated underlayer does offer effective fire and chemical protection, at the cost of greatly \ + increased cancer risks after several hours of sustained use." default_skin = "prototype" armor_type_1 = /obj/item/mod/armor/mod_theme_prototype resistance_flags = FIRE_PROOF @@ -1088,7 +1067,7 @@ UNSEALED_LAYER = null, UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, - UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, UNSEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -1146,7 +1125,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -1170,7 +1149,7 @@ UNSEALED_LAYER = null, UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, - UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + UNSEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, UNSEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -1196,14 +1175,15 @@ armor = list(MELEE = 40, BULLET = 25, LASER = 25, ENERGY = 20, BOMB = 25, RAD = INFINITY, FIRE = 200, ACID = 200) /datum/mod_theme/apocryphal - name = "apocryphal" - desc = "A high-tech, only technically legal, armored suit created by a collaboration effort between Nanotrasen and Shellguard Munitions." - extended_desc = "A bulky and only legal by technicality suit, this ominous black and red MODsuit is only worn by \ - Nanotrasen Black Ops teams. If you can see this suit, you fucked up. A collaborative joint effort between \ - Shellguard and Nanotrasen, the construction and modules gives the user robust protection against \ - anything that can be thrown at it, along with acute combat awareness tools for it's wearer. \ - Whether the wearer uses it or not is up to them. \ - There seems to be a little inscription on the wrist that reads; \'squiddie', d'aww." + name = "'Charon' absolver" + desc = "A highly classified suit of powered armor used by {REDACTED}. Offers absolutely unmatched protection in all areas." + extended_desc = "Developed in absolute secrecy via judicious use of black budgets and compartmentalized production, the NA-000 \ + 'Charon' represents the absolute pinnacle of Nanotrasen armor development, and is easily one of the most powerful suits in the entire Sector. \ + Incorporating a durable plasteel-alloy outer shell overlaying a duraweave-nanomesh bodysuit, all protected by a prototype EM defense system, the \ + Charon offers physical protection that is unmatched by nearly every other modsuit existing in the Sector today. Despite this weight, advanced \ + servo and weight distribution systems allow the wearer to move as if unencumbered, while a custom-tuned high-efficiency power distribution system \ + means that the NA-000 has better mileage than most civilian modsuits. Today, less than a hundred of these mighty war machines exist, all of which \ + reside deep in the secure armories of Nanotrasen Asset Protection." default_skin = "apocryphal" armor_type_1 = /obj/item/mod/armor/mod_theme_apocryphal resistance_flags = FIRE_PROOF | ACID_PROOF @@ -1229,7 +1209,7 @@ UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, - SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEYES, + SEALED_INVISIBILITY = HIDEFACE | HIDEMASK | HIDEEARS | HIDEEYES, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -1255,7 +1235,7 @@ /datum/mod_theme/corporate name = "corporate" - desc = "A fancy, high-tech suit for Nanotrasen's high ranking officers." + desc = "A rare, extremely expensive modsuit used exclusively by Nanotrasen executives. Very few will get to see this suit, and fewer still will actually wear it." extended_desc = "An even more costly version of the Magnate model, the corporate suit is a thermally insulated, \ anti-corrosion coated suit for high-ranking CentCom Officers, deploying pristine protective armor and \ advanced actuators, feeling practically weightless when turned on. Scraping the paint of this suit is \ @@ -1284,7 +1264,7 @@ UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -1310,10 +1290,8 @@ /datum/mod_theme/debug name = "debug" - desc = "Strangely nostalgic." - extended_desc = "An advanced suit that has dual ion engines powerful enough to grant a humanoid flight. \ - Contains an internal self-recharging high-current capacitor for short, powerful bo- \ - Oh wait, this is not actually a flight suit. Fuck." + desc = "An admin-only modsuit that's strictly worse than the already existent administrative suit. Why does this even exist?" + extended_desc = "nyoom" default_skin = "debug" armor_type_1 = /obj/item/mod/armor/mod_theme_debug resistance_flags = FIRE_PROOF | ACID_PROOF @@ -1333,7 +1311,7 @@ UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, UNSEALED_COVER = HEADCOVERSMOUTH, SEALED_COVER = HEADCOVERSEYES, ), @@ -1361,11 +1339,8 @@ /datum/mod_theme/administrative name = "administrative" - desc = "A suit made of adminium. Who comes up with these stupid mineral names?" - extended_desc = "Yeah, okay, I guess you can call that an event. What I consider an event is something actually \ - fun and engaging for the players- instead, most were sitting out, dead or gibbed, while the lucky few got to \ - have all the fun. If this continues to be a pattern for your \"events\" (Admin Abuse) \ - there will be an admin complaint. You have been warned." + desc = "A completely game-breaking suit made of compressed admin abuse. Naturally, it's got bullshit stats, doesn't drain any power at all and... for fuck's sake, does it really need a thousand module slots?!" + extended_desc = "someone go get the intern to write something here" default_skin = "debug" armor_type_1 = /obj/item/mod/armor/mod_theme_administrative resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF @@ -1385,7 +1360,7 @@ UNSEALED_LAYER = null, UNSEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, UNSEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( diff --git a/code/modules/mod/modules/module_pathfinder.dm b/code/modules/mod/modules/module_pathfinder.dm index 9bb73673b9990..c99b4989b09d5 100644 --- a/code/modules/mod/modules/module_pathfinder.dm +++ b/code/modules/mod/modules/module_pathfinder.dm @@ -51,9 +51,9 @@ if(!ishuman(user)) return var/mob/living/carbon/human/human_user = user - if(human_user.get_item_by_slot(SLOT_HUD_BACK) && !human_user.unEquip(human_user.get_item_by_slot(SLOT_HUD_BACK))) + if(human_user.get_item_by_slot(ITEM_SLOT_BACK) && !human_user.unEquip(human_user.get_item_by_slot(ITEM_SLOT_BACK))) return - if(!human_user.equip_to_slot_if_possible(mod, SLOT_HUD_BACK, disable_warning = TRUE)) + if(!human_user.equip_to_slot_if_possible(mod, ITEM_SLOT_BACK, disable_warning = TRUE)) return mod.quick_deploy(user) human_user.update_action_buttons(TRUE) diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm index daf0c88324512..e6696f3954943 100644 --- a/code/modules/mod/modules/modules_supply.dm +++ b/code/modules/mod/modules/modules_supply.dm @@ -550,7 +550,7 @@ mineral_turf.gets_drilled(firer) for(var/mob/living/mob in range(power, src)) mob.apply_damage(damage * (ishostile(mob) ? fauna_boost : 1), BRUTE, spread_damage = TRUE) - if(!ishostile(mob) || !firer) + if(!ishostile(mob) || !firer || mob.stat != CONSCIOUS) continue var/mob/living/simple_animal/hostile/hostile_mob = mob hostile_mob.GiveTarget(firer) diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index 964478af72298..e160887fe6ff1 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -54,7 +54,7 @@ if(user.put_in_hands(src)) msg = "Your Energy Katana teleports into your hand!" - else if(user.equip_to_slot_if_possible(src, SLOT_HUD_BELT, FALSE, TRUE)) + else if(user.equip_to_slot_if_possible(src, ITEM_SLOT_BELT, FALSE, TRUE)) msg = "Your Energy Katana teleports back to you, sheathing itself as it does so!" else loc = get_turf(user) diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 347f05a16831a..620fb395ddf35 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -11,7 +11,7 @@ throw_speed = 3 var/obj/item/pen/containedpen var/obj/item/toppaper - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT resistance_flags = FLAMMABLE /obj/item/clipboard/New() diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index c4d24a058a6b1..dbf896b8bb63c 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -14,7 +14,7 @@ throw_range = 1 throw_speed = 1 pressure_resistance = 0 - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD body_parts_covered = HEAD resistance_flags = FLAMMABLE max_integrity = 50 @@ -39,6 +39,7 @@ var/contact_poison // Reagent ID to transfer on contact var/contact_poison_volume = 0 var/contact_poison_poisoner = null + /// Width of the window that opens var/paper_width = 600 /// Height of the window that opens @@ -546,11 +547,6 @@ name = "A Crash Course in Legal SOP on SS13" info = "Roles:
\nThe Detective is basically the investigator and prosecutor.
\nThe Staff Assistant can perform these functions with written authority from the Detective.
\nThe Captain/HoP/Warden is ct as the judicial authority.
\nThe Security Officers are responsible for executing warrants, security during trial, and prisoner transport.
\n
\nInvestigative Phase:
\nAfter the crime has been committed the Detective's job is to gather evidence and try to ascertain not only who did it but what happened. He must take special care to catalogue everything and don't leave anything out. Write out all the evidence on paper. Make sure you take an appropriate number of fingerprints. IF he must ask someone questions he has permission to confront them. If the person refuses he can ask a judicial authority to write a subpoena for questioning. If again he fails to respond then that person is to be jailed as insubordinate and obstructing justice. Said person will be released after he cooperates.
\n
\nONCE the FT has a clear idea as to who the criminal is he is to write an arrest warrant on the piece of paper. IT MUST LIST THE CHARGES. The FT is to then go to the judicial authority and explain a small version of his case. If the case is moderately acceptable the authority should sign it. Security must then execute said warrant.
\n
\nPre-Pre-Trial Phase:
\nNow a legal representative must be presented to the defendant if said defendant requests one. That person and the defendant are then to be given time to meet (in the jail IS ACCEPTABLE). The defendant and his lawyer are then to be given a copy of all the evidence that will be presented at trial (rewriting it all on paper is fine). THIS IS CALLED THE DISCOVERY PACK. With a few exceptions, THIS IS THE ONLY EVIDENCE BOTH SIDES MAY USE AT TRIAL. IF the prosecution will be seeking the death penalty it MUST be stated at this time. ALSO if the defense will be seeking not guilty by mental defect it must state this at this time to allow ample time for examination.
\nNow at this time each side is to compile a list of witnesses. By default, the defendant is on both lists regardless of anything else. Also the defense and prosecution can compile more evidence beforehand BUT in order for it to be used the evidence MUST also be given to the other side.\nThe defense has time to compile motions against some evidence here.
\nPossible Motions:
\n1. Invalidate Evidence- Something with the evidence is wrong and the evidence is to be thrown out. This includes irrelevance or corrupt security.
\n2. Free Movement- Basically the defendant is to be kept uncuffed before and during the trial.
\n3. Subpoena Witness- If the defense presents god reasons for needing a witness but said person fails to cooperate then a subpoena is issued.
\n4. Drop the Charges- Not enough evidence is there for a trial so the charges are to be dropped. The FT CAN RETRY but the judicial authority must carefully reexamine the new evidence.
\n5. Declare Incompetent- Basically the defendant is insane. Once this is granted a medical official is to examine the patient. If he is indeed insane he is to be placed under care of the medical staff until he is deemed competent to stand trial.
\n
\nALL SIDES MOVE TO A COURTROOM
\nPre-Trial Hearings:
\nA judicial authority and the 2 sides are to meet in the trial room. NO ONE ELSE BESIDES A SECURITY DETAIL IS TO BE PRESENT. The defense submits a plea. If the plea is guilty then proceed directly to sentencing phase. Now the sides each present their motions to the judicial authority. He rules on them. Each side can debate each motion. Then the judicial authority gets a list of crew members. He first gets a chance to look at them all and pick out acceptable and available jurors. Those jurors are then called over. Each side can ask a few questions and dismiss jurors they find too biased. HOWEVER before dismissal the judicial authority MUST agree to the reasoning.
\n
\nThe Trial:
\nThe trial has three phases.
\n1. Opening Arguments- Each side can give a short speech. They may not present ANY evidence.
\n2. Witness Calling/Evidence Presentation- The prosecution goes first and is able to call the witnesses on his approved list in any order. He can recall them if necessary. During the questioning the lawyer may use the evidence in the questions to help prove a point. After every witness the other side has a chance to cross-examine. After both sides are done questioning a witness the prosecution can present another or recall one (even the EXACT same one again!). After prosecution is done the defense can call witnesses. After the initial cases are presented both sides are free to call witnesses on either list.
\nFINALLY once both sides are done calling witnesses we move onto the next phase.
\n3. Closing Arguments- Same as opening.
\nThe jury then deliberates IN PRIVATE. THEY MUST ALL AGREE on a verdict. REMEMBER: They mix between some charges being guilty and others not guilty (IE if you supposedly killed someone with a gun and you unfortunately picked up a gun without authorization then you CAN be found not guilty of murder BUT guilty of possession of illegal weaponry.). Once they have agreed they present their verdict. If unable to reach a verdict and feel they will never they call a deadlocked jury and we restart at Pre-Trial phase with an entirely new set of jurors.
\n
\nSentencing Phase:
\nIf the death penalty was sought (you MUST have gone through a trial for death penalty) then skip to the second part.
\nI. Each side can present more evidence/witnesses in any order. There is NO ban on emotional aspects or anything. The prosecution is to submit a suggested penalty. After all the sides are done then the judicial authority is to give a sentence.
\nII. The jury stays and does the same thing as I. Their sole job is to determine if the death penalty is applicable. If NOT then the judge selects a sentence.
\n
\nTADA you're done. Security then executes the sentence and adds the applicable convictions to the person's record.
\n" -/obj/item/paper/flag - icon_state = "flag_neutral" - item_state = "paper" - anchored = TRUE - /obj/item/paper/jobs name = "Job Information" info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
\nThe data will be in the following form.
\nGenerally lower ranking positions come first in this list.
\n
\nJob Name general access>lab access-engine access-systems access (atmosphere control)
\n\tJob Description
\nJob Duties (in no particular order)
\nTips (where applicable)
\n
\nResearch Assistant 1>1-0-0
\n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
\n1. Assist the researchers.
\n2. Clean up the labs.
\n3. Prepare materials.
\n
\nStaff Assistant 2>0-0-0
\n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
\n1. Patrol ship/Guard key areas
\n2. Assist security officer
\n3. Perform other security duties.
\n
\nTechnical Assistant 1>0-0-1
\n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
\n1. Assist Station technician and Engineers.
\n2. Perform general maintenance of station.
\n3. Prepare materials.
\n
\nMedical Assistant 1>1-0-0
\n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
\n1. Assist the medical personnel.
\n2. Update medical files.
\n3. Prepare materials for medical operations.
\n
\nResearch Technician 2>3-0-0
\n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
\n1. Inform superiors of research.
\n2. Perform research alongside of official researchers.
\n
\nDetective 3>2-0-0
\n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
\n1. Perform crime-scene investigations/draw conclusions.
\n2. Store and catalogue evidence properly.
\n3. Testify to superiors/inquieries on findings.
\n
\nStation Technician 2>0-2-3
\n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
\n1. Maintain SS13 systems.
\n2. Repair equipment.
\n
\nAtmospheric Technician 3>0-0-4
\n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
\n1. Maintain atmosphere on SS13
\n2. Research atmospheres on the space station. (safely please!)
\n
\nEngineer 2>1-3-0
\n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
\n1. Upkeep the engine.
\n2. Prevent fires in the engine.
\n3. Maintain a safe orbit.
\n
\nMedical Researcher 2>5-0-0
\n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
\n1. Make sure the station is kept safe.
\n2. Research medical properties of materials studied of Space Station 13.
\n
\nScientist 2>5-0-0
\n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Plasma Technicians as plasma is the material they routinly handle.
\n1. Research plasma
\n2. Make sure all plasma is properly handled.
\n
\nMedical Doctor (Officer) 2>0-0-0
\n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
\n1. Heal wounded people.
\n2. Perform examinations of all personnel.
\n3. Moniter usage of medical equipment.
\n
\nSecurity Officer 3>0-0-0
\n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
\n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
\n1. Maintain order.
\n2. Assist others.
\n3. Repair structural problems.
\n
\nHead of Security 4>5-2-2
\n\tPeople assigned as Head of Security should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
\n1. Oversee security.
\n2. Assign patrol duties.
\n3. Protect the station and staff.
\n
\nHead of Personnel 4>4-2-2
\n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
\n1. Assign duties.
\n2. Moderate personnel.
\n3. Moderate research.
\n
\nCaptain 5>5-5-5 (unrestricted station wide access)
\n\tThis is the highest position you can acquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
\n1. Assign all positions on SS13
\n2. Inspect the station for any problems.
\n3. Perform administrative duties.
\n" @@ -703,6 +699,82 @@ header = "

" info = "" +/obj/item/paper/syndicate/listening_post + name = "mission briefing" + info = {"

Mission Details:

+

+ Greetings, agent. You have been assigned to a newly constructed listening post hidden in Nanotrasen-controlled space. + You are to monitor transmissions from the Nanotrasen space stations in the system, as well as those from potentially significant ships passing through the system. +

+ Urgent reports are to be relayed immeditely to your handler, otherwise, condense significant happenings into packets to be sent out at scheduled intervals, to minimise the chances your transmissions being detected. +

+ Accurate intelligence is crucial to the success of our operatives onboard. Do not fail us. +

+ Glory to the Syndicate!"} + +/obj/item/paper/listening_post_report_1 + name = "Report 01 - URGENT" + info = {"URGENT: Intercepted communications from the NAS Trurl have revealed that a shipment of nuclear fission warheads are being shipped into the system to replace aging inventory. +

+ The convoy is lightly defended and disguised as a regular freight carrying operation. They are not expecting, nor prepared to stop a determined attacker."} + +/obj/item/paper/listening_post_report_2 + name = "Report 02" + info = {"* Security across all shipping operations has been substantailly boosted, and the NAS Trurl has declared a heightened state of alert across all stations in the system. +

+ * The NSS Farragus is reporting heightened mineral output - extra shipping traffic likely. +

+ * The NSS Cyberiad's communications channels are flooded with garbled reports about a dangerous "floor cluwne" - exact details unclear."} + +/obj/item/paper/listening_post_report_3 + name = "Report 03" + info = {"* Now that several months have passed, the security situation is slowly cooling down - the NAS Trurl's heightened state of alert is no longer in effect. Routine shipping traffic escorts are beginning to thin. +

+ * The NSS Kerberos is reporting that mining output has dropped to zero. Morale has plummeted, engineers and roboticists are tearing apart old metal furnature and windows to secure materials. +

+ * The NSS Diagoras is reporting a major plasma fire, but it appears to be contained to an asteroid attached to the station. +

+ * Some form of pirate radio station appeared in the system and is broadcasting what appears to be Soviet state-made entertainment media - It is of highly doubious entertainment value, however. + These broadcasts are not on NT frequencies and therefore are not causing interferance."} + +/obj/item/paper/listening_post_report_4 + name = "Report 04" + info = {"* The NAS Trurl has ordered all stations to prepare for a potentiel visit from multiple VIPs. Details scarce, security levels elevted. +

+ * A USSP-operated station has been detected in the system. + It is intermittently communicating with the Soviet pirate radio station (which appears to be operated by the USSP as well). Both operations appear to be independent of each other. Will continue to monitor for developments. +

+ * A TSF destroyer "TSFN Oberon" jumped into the system and opened encrypted communications with the NAS Trurl, contents of transmission unknown. + Broadcast exchanges continued as the destroyer adopted a search pattern. After six hours, the destroyer jumped out of system. At no point did it approach near either of the USSP installations. +

+ * Nanotrasen plasma shipments have been disrupted by a massive migration of space carp, causing backlogs at shipping terminals."} + +/obj/item/paper/listening_post_report_5 + name = "Report 05" + info = {"* Intermittent hyperwave broadcasts have been detected from the USSP pirate radio station. Broadcasts are highly directional (which hindered detection), pointing towards USSP space. + These messages are highly encrypted. It appears likely that the USSP is conducting eavesdropping operations against Nanotrasen as well. +

+ * A terror spider outbreak was reported on the NSS Cerebron. Early discovery and an unusual lack of coordiation on the part of the spiders allowed the outbreak to be rapidly contained. +

+ * The NSS Farragus's communications are flooded with garbled reports about "Ei Nath" - + piecing together fragments of communications suggests that this "Ei Nath" is a highly dangerous individual whose mere pressence causes great fear among Nanotrasen personnel. Attempt recruitment?"} + +/obj/item/paper/listening_post_report_6 + name = "Report 06 - URGENT" + info = {"URGENT: An Aussec Armoury freighter has suffered an engine failure near the edge of the system, dropping out of hyperspace. +

+ Escorts will be absent until they can retrace path. Limited window to execute raiding operations."} + +/obj/item/paper/listening_post_report_7 + name = "Report 07" + info = {"* The USSP space station has gone silent on all frequencies for an extended period of time. USSP listening post continues to operate (the contents of the cover singal is not getting any better). +

+ * New signals are being detected from an old Nanotrasen communications satellite. Multiple Nanotrasen explorers attempting to investigate are MIA. +

+ * Vox skipjack detected in area, communications completely unintelligible. Likely preparing to launch shuttles to trade with or raid the stations in the area. +

+ * CAUTION: Nanotrasen exploration teams growing in size and are scouring much larger areas than before. They are now operating dangerously close to this installation, requesting additional security."} + /obj/item/paper/nanotrasen name = "paper" header = "

" diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index a1395f0f19a3d..0021507a6f148 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -15,7 +15,7 @@ icon = 'icons/obj/bureaucracy.dmi' icon_state = "pen" item_state = "pen" - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_EARS throwforce = 0 w_class = WEIGHT_CLASS_TINY throw_speed = 3 @@ -338,3 +338,17 @@ P.contact_poison_poisoner = user.name add_attack_logs(user, P, "Poison pen'ed") to_chat(user, "You apply the poison to [P].") + +// MARK: CHAMELEON PEN +/obj/item/pen/chameleon + var/forge_name + +/obj/item/pen/chameleon/attack_self(mob/living/user) + if(!iscarbon(user)) + return + + if(!Adjacent(user) || user.incapacitated()) + return + + forge_name = tgui_input_text(user, "Enter the name of the person whose signature you want to forge", "Forge name", max_length = MAX_NAME_LEN) + diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index de78f0566fbcc..42a3cb531e71e 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -172,7 +172,7 @@ icon_state = "camera" item_state = "electropack" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT var/list/matter = list("metal" = 2000) var/pictures_max = 10 // cameras historically were varedited to start with 30 shots despite @@ -633,7 +633,7 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor /obj/item/videocam/advanced name = "advanced video camera" desc = "This video camera allows you to send live feeds even when attached to a belt." - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT #undef CAMERA_STATE_COOLDOWN diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm index 12abe0f6cb18a..17e743196fe0c 100644 --- a/code/modules/pda/PDA.dm +++ b/code/modules/pda/PDA.dm @@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(PDAs) icon_state = "pda" item_state = "electronic" w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_FLAG_ID | SLOT_FLAG_BELT | SLOT_FLAG_PDA + slot_flags = ITEM_SLOT_ID | ITEM_SLOT_BELT | ITEM_SLOT_PDA armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 100) resistance_flags = FIRE_PROOF | ACID_PROOF origin_tech = "programming=2" @@ -63,7 +63,10 @@ GLOBAL_LIST_EMPTY(PDAs) new/datum/data/pda/app/manifest, new/datum/data/pda/app/nanobank, new/datum/data/pda/app/atmos_scanner, - new/datum/data/pda/utility/flashlight) + new/datum/data/pda/utility/flashlight, + new/datum/data/pda/app/games, + // Here our games go + new/datum/data/pda/app/game/minesweeper) var/list/shortcut_cache = list() var/list/shortcut_cat_order = list() var/list/notifying_programs = list() diff --git a/code/modules/pda/ai_pda.dm b/code/modules/pda/ai_pda.dm index d23a9b1e7c5a1..e6c603aa18780 100644 --- a/code/modules/pda/ai_pda.dm +++ b/code/modules/pda/ai_pda.dm @@ -1,6 +1,5 @@ // Special AI/pAI PDAs that cannot explode. /obj/item/pda/silicon - icon_state = "NONE" detonate = FALSE ttone = "data" diff --git a/code/modules/pda/games.dm b/code/modules/pda/games.dm new file mode 100644 index 0000000000000..3f49266d7b465 --- /dev/null +++ b/code/modules/pda/games.dm @@ -0,0 +1,31 @@ +// Games Hub + +/datum/data/pda/app/games + name = "Games" + icon = "gamepad" + template = "pda_games" + +/datum/data/pda/app/games/update_ui(mob/user, list/data) + var/list/games = list() + for(var/datum/data/pda/app/game/game in pda.programs) + games += list(game.get_game_info()) + data["games"] = games + +/datum/data/pda/app/games/ui_act(action, params) + if(..()) + return + + switch(action) + if("play") + var/datum/data/pda/app/game/game = locate(params["id"]) in pda.programs + pda.start_program(game) + +// Game-type App + +/datum/data/pda/app/game + name = "base game" + icon = "gamepad" + hidden = TRUE + +/datum/data/pda/app/game/proc/get_game_info() + return list(name = name, icon = icon, id = UID()) diff --git a/code/modules/pda/games/minesweeper.dm b/code/modules/pda/games/minesweeper.dm new file mode 100644 index 0000000000000..e273d3cf47620 --- /dev/null +++ b/code/modules/pda/games/minesweeper.dm @@ -0,0 +1,240 @@ +// Minesweeper + +#define MINESWEEPER_ROWS 16 +#define MINESWEEPER_COLUMNS 16 +#define MINESWEEPER_BOMBS 40 + +/datum/data/pda/app/game/minesweeper + name = "Minesweeper" + template = "pda_minesweeper" + update = PDA_APP_NOUPDATE + + /// Thing, to make first touch safety + var/first_touch = TRUE + // Win condition things + var/setted_flags = 0 + var/flagged_bombs = 0 + var/opened_cells = 0 + /// Decision to make interface untouchable in the momemnt of regenerating + var/ignore_touches = FALSE + /// Here we have all the minesweeper info + var/list/minesweeper_matrix = list() + // generations vars + var/generation_rows = MINESWEEPER_ROWS + var/generation_columns = MINESWEEPER_COLUMNS + var/generation_bombs = MINESWEEPER_BOMBS + + /// The moment then game was started for point count + var/start_time = 0 + + /// The leaderboard list + var/static/list/leaderboard = list() + +/datum/data/pda/app/game/minesweeper/start() + . = ..() + make_empty_matrix() + +/datum/data/pda/app/game/minesweeper/update_ui(mob/user, list/data) + data["matrix"] = minesweeper_matrix + data["flags"] = setted_flags + data["bombs"] = generation_bombs + data["leaderboard"] = leaderboard + +/datum/data/pda/app/game/minesweeper/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + if(..()) + return + + if(ignore_touches) + return + + switch(action) + if("Square") + switch(params["mode"]) + if("bomb") + if(first_touch) + generate_matrix(params["X"], params["Y"]) + open_cell(params["X"], params["Y"]) + + if(minesweeper_matrix[params["X"]][params["Y"]]["bomb"]) + on_loose(ui.user) + SStgui.update_uis(pda) + return + + if("flag") + if(first_touch || minesweeper_matrix[params["X"]][params["Y"]]["open"]) + return + + if(minesweeper_matrix[params["X"]][params["Y"]]["flag"]) + minesweeper_matrix[params["X"]][params["Y"]]["flag"] = FALSE + setted_flags -= 1 + if(minesweeper_matrix[params["X"]][params["Y"]]["bomb"]) + flagged_bombs -= 1 + else + minesweeper_matrix[params["X"]][params["Y"]]["flag"] = TRUE + setted_flags += 1 + if(minesweeper_matrix[params["X"]][params["Y"]]["bomb"]) + flagged_bombs += 1 + + check_win(ui.user) + SStgui.update_uis(pda) + +/datum/data/pda/app/game/minesweeper/proc/check_win(mob/user) + if(flagged_bombs == generation_bombs && \ + setted_flags == generation_bombs && \ + opened_cells == (generation_rows * generation_columns - generation_bombs)) + on_win(user) + +/datum/data/pda/app/game/minesweeper/proc/on_win(mob/user) + ignore_touches = TRUE + if(!pda.silent) + playsound(get_turf(pda), 'sound/machines/ping.ogg', 20, TRUE) + addtimer(CALLBACK(src, PROC_REF(make_empty_matrix)), 5 SECONDS) + add_into_leaders(user, world.time - start_time) + +/datum/data/pda/app/game/minesweeper/proc/add_into_leaders(mob/user, game_time) + var/nickname = tgui_input_text(user, "You finished the game in [game_time / 10] seconds.\n Write a nickname to save your result on the leaderboard.\n", "Minesweeper", "", 10) + if(!nickname) + return + + leaderboard += list(list("name" = nickname, "time" = "[game_time/10]")) + +/datum/data/pda/app/game/minesweeper/proc/on_loose(mob/user) + ignore_touches = TRUE + if(!pda.silent) + playsound(get_turf(pda), 'sound/effects/explosionfar.ogg', 50, TRUE) + addtimer(CALLBACK(src, PROC_REF(make_empty_matrix)), 3 SECONDS) + +/datum/data/pda/app/game/minesweeper/proc/make_empty_matrix(pay = TRUE) + minesweeper_matrix = list() + for(var/i in 1 to generation_rows) + var/list/new_row = list() + for(var/j in 1 to generation_columns) + new_row["[j]"] = list("open" = FALSE, "bomb" = FALSE, "flag" = FALSE, "around" = 0) + minesweeper_matrix["[i]"] = new_row + first_touch = TRUE + ignore_touches = FALSE + SStgui.update_uis(pda) + +/datum/data/pda/app/game/minesweeper/proc/generate_matrix(x, y) + flagged_bombs = 0 + setted_flags = 0 + opened_cells = 0 + var/list/possible_list = list() + var/num_x = text2num(x) + var/num_y = text2num(y) + var/count = 0 + + for(var/i in 1 to generation_rows) + for(var/j in 1 to generation_columns) + if((i in list(num_x - 1, num_x, num_x + 1)) && (j in list(num_y - 1, num_y, num_y + 1))) + continue + possible_list["[count]"] = list(i, j) + count++ + + for(var/bomb in 1 to generation_bombs) + var/cell = pick(possible_list) + var/coordinates = possible_list[cell] + possible_list -= cell + var/new_x = "[coordinates[1]]" + var/new_y = "[coordinates[2]]" + minesweeper_matrix[new_x][new_y]["bomb"] = TRUE + + if(new_x != "1") + minesweeper_matrix["[text2num(new_x)-1]"][new_y]["around"] += 1 + + if(new_y != "1") + minesweeper_matrix[new_x]["[text2num(new_y)-1]"]["around"] += 1 + + if(new_x != "1" && new_y != "1") + minesweeper_matrix["[text2num(new_x)-1]"]["[text2num(new_y)-1]"]["around"] += 1 + + if(new_x != "[generation_rows]") + minesweeper_matrix["[text2num(new_x)+1]"][new_y]["around"] += 1 + + if(new_y != "[generation_columns]") + minesweeper_matrix[new_x]["[text2num(new_y)+1]"]["around"] += 1 + + if(new_x != "[generation_rows]" && new_y != "[generation_columns]") + minesweeper_matrix["[text2num(new_x)+1]"]["[text2num(new_y)+1]"]["around"] += 1 + + if(new_x != "1" && new_y != "[generation_columns]") + minesweeper_matrix["[text2num(new_x)-1]"]["[text2num(new_y)+1]"]["around"] += 1 + + if(new_x != "[generation_rows]" && new_y != "1") + minesweeper_matrix["[text2num(new_x)+1]"]["[text2num(new_y)-1]"]["around"] += 1 + + first_touch = FALSE + start_time = world.time + +/datum/data/pda/app/game/minesweeper/proc/open_cell(x, y, start_cycle = TRUE) + . = list() + if(!minesweeper_matrix[x][y]["open"]) + minesweeper_matrix[x][y]["open"] = TRUE + opened_cells += 1 + + if(minesweeper_matrix[x][y]["flag"]) + minesweeper_matrix[x][y]["flag"] = FALSE + setted_flags -= 1 + if(minesweeper_matrix[x][y]["bomb"]) + flagged_bombs -= 1 + + if(minesweeper_matrix[x][y]["around"] == 0) + if(start_cycle) + update_zeros(x, y) + else + . = list(list(x, y)) + +/datum/data/pda/app/game/minesweeper/proc/update_zeros(x, y) + var/list/list_for_update = list(list(x, y)) + for(var/list/coordinates in list_for_update) + var/this_x = coordinates[1] + var/this_y = coordinates[2] + var/num_x = text2num(coordinates[1]) + var/num_y = text2num(coordinates[2]) + var/new_x + var/new_y + + if(num_x != 1) + new_x = "[num_x-1]" + list_for_update += open_cell(new_x, this_y) + + if(num_y != 1) + new_y = "[num_y-1]" + list_for_update += open_cell(this_x, new_y) + + if(num_x != generation_rows) + new_x = "[num_x+1]" + list_for_update += open_cell(new_x, this_y) + + if(num_y != generation_columns) + new_y = "[num_y+1]" + list_for_update += open_cell(this_x, new_y) + + if(num_x != 1 && num_y != 1) + new_x = "[num_x-1]" + new_y = "[num_y-1]" + if(minesweeper_matrix[new_x][this_y]["open"] && minesweeper_matrix[this_x][new_y]["open"]) + list_for_update += open_cell(new_x, new_y) + + if(num_x != generation_rows && num_y != generation_columns) + new_x = "[num_x+1]" + new_y = "[num_y+1]" + if(minesweeper_matrix[new_x][this_y]["open"] && minesweeper_matrix[this_x][new_y]["open"]) + list_for_update += open_cell(new_x, new_y) + + if(num_x != 1 && num_y != generation_columns) + new_x = "[num_x-1]" + new_y = "[num_y+1]" + if(minesweeper_matrix[new_x][this_y]["open"] && minesweeper_matrix[this_x][new_y]["open"]) + list_for_update += open_cell(new_x, new_y) + + if(num_x != generation_rows && num_y != 1) + new_x = "[num_x+1]" + new_y = "[num_y-1]" + if(minesweeper_matrix[new_x][this_y]["open"] && minesweeper_matrix[this_x][new_y]["open"]) + list_for_update += open_cell(new_x, new_y) + + +#undef MINESWEEPER_ROWS +#undef MINESWEEPER_COLUMNS +#undef MINESWEEPER_BOMBS diff --git a/code/modules/power/cables/cable.dm b/code/modules/power/cables/cable.dm index 685e1f8a97e06..befd0c7a1ad0c 100644 --- a/code/modules/power/cables/cable.dm +++ b/code/modules/power/cables/cable.dm @@ -120,9 +120,9 @@ By design, d1 is the smallest direction and d2 is the highest if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return if(powernet && (powernet.available_power > 0)) // is it powered? - to_chat(user, "Total power: [DisplayPower(powernet.available_power)]\nLoad: [DisplayPower(powernet.power_demand)]\nExcess power: [DisplayPower(get_surplus())]") + to_chat(user, chat_box_examine("Total power: [DisplayPower(powernet.available_power)]\nLoad: [DisplayPower(powernet.power_demand)]\nExcess power: [DisplayPower(get_surplus())]")) else - to_chat(user, "The cable is not powered.") + to_chat(user, "The cable is not powered.") shock(user, 5, 0.2) /obj/structure/cable/wirecutter_act(mob/user, obj/item/I) diff --git a/code/modules/power/cables/cable_coil.dm b/code/modules/power/cables/cable_coil.dm index 6303624dce41a..9b651bb913353 100644 --- a/code/modules/power/cables/cable_coil.dm +++ b/code/modules/power/cables/cable_coil.dm @@ -23,7 +23,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain throw_range = 5 materials = list(MAT_METAL = 15, MAT_GLASS = 10) flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined", "flogged") usesound = 'sound/items/deconstruct.ogg' toolspeed = 1 diff --git a/code/modules/power/engines/singularity/containment_field.dm b/code/modules/power/engines/singularity/containment_field.dm index e1c80554979b1..0c8f67e9c62c3 100644 --- a/code/modules/power/engines/singularity/containment_field.dm +++ b/code/modules/power/engines/singularity/containment_field.dm @@ -15,8 +15,10 @@ var/obj/machinery/field/generator/FG2 = null /obj/machinery/field/containment/Destroy() - FG1.fields -= src - FG2.fields -= src + if(FG1)// These checks are mostly in case a field is spawned in by accident. + FG1.fields -= src + if(FG2) + FG2.fields -= src return ..() /obj/machinery/field/containment/attack_hand(mob/user) @@ -50,7 +52,7 @@ return if(ismegafauna(M)) M.visible_message("[M] glows fiercely as the containment field flickers out!") - FG1.calc_power(INFINITY) //rip that 'containment' field + FG1.calc_energy(INFINITY) //rip that 'containment' field M.adjustHealth(-M.obj_damage) else ..() diff --git a/code/modules/power/engines/singularity/field_generator.dm b/code/modules/power/engines/singularity/field_generator.dm index c7238b8bdda9a..3d8a54279d1e1 100644 --- a/code/modules/power/engines/singularity/field_generator.dm +++ b/code/modules/power/engines/singularity/field_generator.dm @@ -1,14 +1,14 @@ /* -field_generator power level display - * The icon used for the field_generator need to have 'num_power_levels' number of icon states - * named 'Field_Gen +p[num]' where 'num' ranges from 1 to 'num_power_levels' - * The power level is displayed using overlays. The current displayed power level is stored in 'powerlevel'. - * The overlay in use and the powerlevel variable must be kept in sync. A powerlevel equal to 0 means that - * no power level overlay is currently in the overlays list. +field_generator energy level display + * The icon used for the field_generator need to have 'num_energy_levels' number of icon states + * named 'Field_Gen +p[num]' where 'num' ranges from 1 to 'num_energy_levels' + * The energy level is displayed using overlays. The current displayed energy level is stored in 'energylevel'. + * The overlay in use and the energylevel variable must be kept in sync. A energylevel equal to 0 means that + * no energy level overlay is currently in the overlays list. * -Aygar */ -#define field_generator_max_power 250 +#define FIELD_GENERATOR_MAX_ENERGY 125 #define FG_UNSECURED 0 #define FG_SECURED 1 @@ -31,10 +31,10 @@ GLOBAL_LIST_EMPTY(field_generator_fields) max_integrity = 500 //100% immune to lasers and energy projectiles since it absorbs their energy. armor = list(MELEE = 25, BULLET = 10, LASER = 100, ENERGY = 100, BOMB = 0, RAD = 0, FIRE = 50, ACID = 70) - var/const/num_power_levels = 6 // Total number of power level icon has - var/power_level = 0 + var/const/num_energy_levels = 6 // Total number of power level icon has + var/energy_level = 0 var/active = FG_OFFLINE - var/power = 20 // Current amount of power + var/energy = 20 // Current amount of energy var/state = FG_UNSECURED var/warming_up = 0 var/list/obj/machinery/field/containment/fields @@ -47,8 +47,8 @@ GLOBAL_LIST_EMPTY(field_generator_fields) . += "+a[warming_up]" if(length(fields)) . += "+on" - if(power_level) - . += "+p[power_level]" + if(energy_level) + . += "+p[energy_level]" /obj/machinery/field/generator/Initialize(mapload) . = ..() @@ -58,7 +58,7 @@ GLOBAL_LIST_EMPTY(field_generator_fields) /obj/machinery/field/generator/process() if(active == FG_ONLINE) - calc_power() + calc_energy() /obj/machinery/field/generator/attack_hand(mob/user) if(state == FG_WELDED) @@ -141,8 +141,8 @@ GLOBAL_LIST_EMPTY(field_generator_fields) /obj/machinery/field/generator/bullet_act(obj/item/projectile/Proj) if(Proj.flag != BULLET && !Proj.nodamage) - power = min(power + Proj.damage, field_generator_max_power) - check_power_level() + energy = min(energy + Proj.damage, FIELD_GENERATOR_MAX_ENERGY) + check_energy_level() return 0 @@ -151,10 +151,10 @@ GLOBAL_LIST_EMPTY(field_generator_fields) return ..() -/obj/machinery/field/generator/proc/check_power_level() - var/new_level = round(num_power_levels * power / field_generator_max_power) - if(new_level != power_level) - power_level = new_level +/obj/machinery/field/generator/proc/check_energy_level() + var/new_level = round(num_energy_levels * energy / FIELD_GENERATOR_MAX_ENERGY) + if(new_level != energy_level) + energy_level = new_level update_icon() /obj/machinery/field/generator/proc/turn_off() @@ -177,49 +177,60 @@ GLOBAL_LIST_EMPTY(field_generator_fields) start_fields() -/obj/machinery/field/generator/proc/calc_power() +/obj/machinery/field/generator/proc/calc_energy() var/power_draw = 2 + length(fields) - if(draw_power(round(power_draw/2, 1))) - check_power_level() - return 1 + if(draw_power(round(power_draw / 2, 1))) + spread_energy() + check_energy_level() + return TRUE else visible_message("[src] shuts down!", "You hear something shutting down.") turn_off() - investigate_log("ran out of power and deactivated","singulo") - power = 0 - check_power_level() - return 0 - -//This could likely be better, it tends to start loopin if you have a complex generator loop setup. Still works well enough to run the engine fields will likely recode the field gens and fields sometime -Mport -/obj/machinery/field/generator/proc/draw_power(draw = 0, failsafe = 0, obj/machinery/field/generator/G = null, obj/machinery/field/generator/last = null) - if((G && (G == src)) || (failsafe >= 8))//Loopin, set fail + investigate_log("ran out of energy and deactivated","singulo") + energy = 0 + check_energy_level() + return FALSE + +/** +* Draws power. If there isn't enough energy to sustain the draw, draw from connected generators, up to 3 generators away. +* We never do a 180, so at most we should be going around 270 degrees, and never loop. +* +* Arguments: +** draw - Amount of energy needed to sustain powerdraw during this cycle +** failsafe - Current depth of the recursion. We don't let this go above 3. +** last - should be src of the previous call, we check against this to prevent going back and forth between two field generators. +*/ +/obj/machinery/field/generator/proc/draw_power(draw = 0, failsafe = 0, obj/machinery/field/generator/last = null) + if(failsafe >= 3)// Asking at most 3 gens away so we can't loop. return 0 else failsafe++ - if(power >= draw)//We have enough power - power -= draw + if(energy >= draw)// We have enough energy + energy -= draw return 1 - else//Need more power - draw -= power - power = 0 + else//Need more energy + draw -= energy + energy = 0 for(var/CG in connected_gens) var/obj/machinery/field/generator/FG = CG - if(FG == last)//We just asked you + if(FG == last)// We just asked you continue - if(G)//Another gen is askin for power and we dont have it - if(FG.draw_power(draw,failsafe,G,src))//Can you take the load - return 1 - else - return 0 - else//We are askin another for power - if(FG.draw_power(draw,failsafe,src,src)) + else// We are askin another for energy + if(FG.draw_power(draw, failsafe, src)) return 1 else return 0 +/// Sends energy to every neighbour that has less energy +/obj/machinery/field/generator/proc/spread_energy() + for(var/obj/machinery/field/generator/gen as anything in connected_gens) + if(energy > gen.energy + 3) + var/diff = min(energy - gen.energy, FIELD_GENERATOR_MAX_ENERGY - gen.energy)// We don't want to delete energy + gen.energy += diff / 2 + energy -= diff / 2 /obj/machinery/field/generator/proc/start_fields() if(state != FG_WELDED || !anchored) @@ -299,8 +310,8 @@ GLOBAL_LIST_EMPTY(field_generator_fields) for(var/CG in connected_gens) var/obj/machinery/field/generator/FG = CG FG.connected_gens -= src - if(!FG.clean_up)//Makes the other gens clean up as well - FG.cleanup() + if(!FG.clean_up)//Makes the other gens clean up and shutdown as well + FG.turn_off() connected_gens -= FG clean_up = FALSE update_icon() @@ -343,3 +354,5 @@ GLOBAL_LIST_EMPTY(field_generator_fields) #undef FG_OFFLINE #undef FG_CHARGING #undef FG_ONLINE + +#undef FIELD_GENERATOR_MAX_ENERGY diff --git a/code/modules/power/engines/singularity/narsie.dm b/code/modules/power/engines/singularity/narsie.dm index 09963e0524045..caee19980a727 100644 --- a/code/modules/power/engines/singularity/narsie.dm +++ b/code/modules/power/engines/singularity/narsie.dm @@ -3,6 +3,7 @@ name = "Nar'sie's Avatar" desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees." icon = 'icons/obj/magic_terror.dmi' + icon_state = null pixel_x = -89 pixel_y = -85 current_size = 9 //It moves/eats like a max-size singulo, aside from range. --NEO @@ -18,6 +19,7 @@ /obj/singularity/narsie/large name = "Nar'Sie" icon = 'icons/obj/narsie.dmi' + icon_state = "narsie" // Pixel stuff centers Narsie. pixel_x = -236 pixel_y = -256 diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle.dm b/code/modules/power/engines/singularity/particle_accelerator/particle.dm index 7810a0cc2b833..12641cefbd82f 100644 --- a/code/modules/power/engines/singularity/particle_accelerator/particle.dm +++ b/code/modules/power/engines/singularity/particle_accelerator/particle.dm @@ -40,11 +40,16 @@ B.take_damage(energy * 0.6) movement_range = 0 +/// The particles bump the singularity /obj/effect/accelerated_particle/Bump(obj/singularity/S) if(!istype(S)) return ..() S.energy += energy + energy = 0 +/// The singularity bumps the particles +/obj/effect/accelerated_particle/singularity_act() + return /obj/effect/accelerated_particle/ex_act(severity) qdel(src) diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm index c2fcf54cb88f4..3269f4f87d820 100644 --- a/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm @@ -63,7 +63,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin name = "Particle Accelerator" desc = "Part of a Particle Accelerator." icon = 'icons/obj/machines/particle_accelerator.dmi' - icon_state = "none" + icon_state = null anchored = FALSE density = TRUE max_integrity = 500 @@ -222,7 +222,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin name = "Particle Accelerator" desc = "Part of a Particle Accelerator." icon = 'icons/obj/machines/particle_accelerator.dmi' - icon_state = "none" anchored = FALSE density = TRUE power_state = NO_POWER_USE diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm b/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm index c833b1340c90e..1e8456780c97b 100644 --- a/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm @@ -1,3 +1,12 @@ +#define PARTICLE_LEFT 1 +#define PARTICLE_CENTER 2 +#define PARTICLE_RIGHT 3 +#define EMITTER 1 +#define POWER_BOX 2 +#define FUEL_CHAMBER 3 +#define END_CAP 4 + + /obj/machinery/particle_accelerator/control_box name = "Particle Accelerator Control Console" desc = "This part controls the density of the particles." @@ -18,6 +27,13 @@ var/assembled = 0 var/parts = null var/datum/wires/particle_acc/control_box/wires = null + /// Layout of the particle accelerator. Used by the UI + var/list/layout = list( + list(list("name" = "EM Containment Grid Left", "icon_state" = "emitter_right", "status" = "", "dir" = "1"), list("name" = "Blank1", "icon_state" = "blank", "status" = "good", "dir" = "1"), list("name" = "Blank2", "icon_state" = "blank", "status" = "good", "dir" = "1"), list("name" = "Blank3", "icon_state" = "blank", "status" = "good", "dir" = "1")), + list(list("name" = "EM Containment Grid Center", "icon_state" = "emitter_center", "status" = "", "dir" = "1"), list("name" = "Particle Focusing EM Lens", "icon_state" = "power_box", "status" = "", "dir" = "1"), list("name" = "EM Acceleration Chamber", "icon_state" = "fuel_chamber", "status" = "", "dir" = "1"), list("name" = "Alpha Particle Generation Array", "icon_state" = "end_cap", "status" = "", "dir" = "1")), + list(list("name" = "EM Containment Grid Right", "icon_state" = "emitter_left", "status" = "", "dir" = "1"), list("name" = "Blank4", "icon_state" = "blank", "status" = "good", "dir" = "1"), list("name" = "Blank5", "icon_state" = "blank", "status" = "good", "dir" = "1"), list("name" = "Blank6", "icon_state" = "blank", "status" = "good", "dir" = "1"))) + /// The expected orientation of the accelerator this is trying to link. In text form so the UI can use it + var/dir_text /obj/machinery/particle_accelerator/control_box/Initialize(mapload) . = ..() @@ -146,34 +162,47 @@ /obj/machinery/particle_accelerator/control_box/proc/part_scan() + dir_text = null + var/turf/T for(var/obj/structure/particle_accelerator/fuel_chamber/F in orange(1,src)) dir = F.dir + T = F.loc + + if(!T) + return 0 + + dir_text = dir2text(dir) // Only set dir_text if we found an EM acceleration chamber + connected_parts = list() var/tally = 0 var/ldir = turn(dir,-90) var/rdir = turn(dir,90) var/odir = turn(dir,180) - var/turf/T = loc - T = get_step(T,rdir) - if(check_part(T,/obj/structure/particle_accelerator/fuel_chamber)) + if(check_part(T,/obj/structure/particle_accelerator/fuel_chamber, PARTICLE_CENTER, FUEL_CHAMBER)) tally++ + layout[PARTICLE_CENTER][FUEL_CHAMBER]["status"] = "good" T = get_step(T,odir) - if(check_part(T,/obj/structure/particle_accelerator/end_cap)) + if(check_part(T,/obj/structure/particle_accelerator/end_cap, PARTICLE_CENTER, END_CAP)) tally++ + layout[PARTICLE_CENTER][END_CAP]["status"] = "good" T = get_step(T,dir) T = get_step(T,dir) - if(check_part(T,/obj/structure/particle_accelerator/power_box)) + if(check_part(T,/obj/structure/particle_accelerator/power_box, PARTICLE_CENTER, POWER_BOX)) tally++ + layout[PARTICLE_CENTER][POWER_BOX]["status"] = "good" T = get_step(T,dir) - if(check_part(T,/obj/structure/particle_accelerator/particle_emitter/center)) + if(check_part(T,/obj/structure/particle_accelerator/particle_emitter/center, PARTICLE_CENTER, EMITTER)) tally++ + layout[PARTICLE_CENTER][EMITTER]["status"] = "good" T = get_step(T,ldir) - if(check_part(T,/obj/structure/particle_accelerator/particle_emitter/left)) + if(check_part(T,/obj/structure/particle_accelerator/particle_emitter/left, PARTICLE_LEFT, EMITTER)) tally++ + layout[PARTICLE_LEFT][EMITTER]["status"] = "good" T = get_step(T,rdir) T = get_step(T,rdir) - if(check_part(T,/obj/structure/particle_accelerator/particle_emitter/right)) + if(check_part(T,/obj/structure/particle_accelerator/particle_emitter/right, PARTICLE_RIGHT, EMITTER)) tally++ + layout[PARTICLE_RIGHT][EMITTER]["status"] = "good" if(tally >= 6) assembled = 1 return 1 @@ -181,7 +210,7 @@ assembled = 0 return 0 -/obj/machinery/particle_accelerator/control_box/proc/check_part(turf/T, type) +/obj/machinery/particle_accelerator/control_box/proc/check_part(turf/T, type, column, row) if(!(T)||!(type)) return 0 var/obj/structure/particle_accelerator/PA = locate(/obj/structure/particle_accelerator) in T @@ -190,6 +219,16 @@ if(PA.report_ready(src)) connected_parts.Add(PA) return 1 + else if(PA) + layout[column][row]["status"] = "Incomplete" + else if(PA) + layout[column][row]["status"] = "Wrong Orientation" + + layout[column][row]["dir"] = PA.dir + layout[column][row]["icon_state"] = PA.icon_state + else + layout[column][row]["status"] = "Not In Position" + return 0 /obj/machinery/particle_accelerator/control_box/proc/toggle_power() @@ -224,10 +263,30 @@ /obj/machinery/particle_accelerator/control_box/ui_data(mob/user) var/list/data = list() + var/list/ui_col_1 = list() + var/list/ui_col_2 = list() + var/list/ui_col_3 = list() + if(dir == NORTH || dir == WEST) + ui_col_1 = layout[PARTICLE_RIGHT] + ui_col_2 = layout[PARTICLE_CENTER] + ui_col_3 = layout[PARTICLE_LEFT] + else // If we are pointing east or south we need to reverse the order of the lists + var/len = length(layout[PARTICLE_CENTER]) + for(var/i in 0 to (len - 1)) + ui_col_1.Add(list(layout[PARTICLE_RIGHT][len - i])) + ui_col_2.Add(list(layout[PARTICLE_CENTER][len - i])) + ui_col_3.Add(list(layout[PARTICLE_LEFT][len - i])) + data["assembled"] = assembled data["power"] = active data["strength"] = strength data["max_strength"] = strength_upper_limit + // If we are pointing east or south we need to reverse the order of the columns/rows + data["layout_1"] = ui_col_1 + data["layout_2"] = ui_col_2 + data["layout_3"] = ui_col_3 + data["orientation"] = dir_text ? dir_text : FALSE + data["icon"] = icon return data /obj/machinery/particle_accelerator/control_box/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) @@ -260,3 +319,11 @@ if(.) update_icon() + +#undef PARTICLE_LEFT +#undef PARTICLE_CENTER +#undef PARTICLE_RIGHT +#undef EMITTER +#undef POWER_BOX +#undef FUEL_CHAMBER +#undef END_CAP diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/engines/singularity/particle_accelerator/particle_emitter.dm index 860283b577475..6f8e8e5210a24 100644 --- a/code/modules/power/engines/singularity/particle_accelerator/particle_emitter.dm +++ b/code/modules/power/engines/singularity/particle_accelerator/particle_emitter.dm @@ -2,7 +2,7 @@ name = "EM Containment Grid" desc_holder = "This part launches the Alpha particles. You might not want to stand near this end." icon = 'icons/obj/machines/particle_accelerator.dmi' - icon_state = "none" + icon_state = null var/fire_delay = 50 var/last_shot = 0 diff --git a/code/modules/power/engines/tesla/energy_ball.dm b/code/modules/power/engines/tesla/energy_ball.dm index 7e526501faf63..6bf6a8f3efd90 100644 --- a/code/modules/power/engines/tesla/energy_ball.dm +++ b/code/modules/power/engines/tesla/energy_ball.dm @@ -344,7 +344,7 @@ /obj/structure/grille, /obj/structure/cable, /obj/machinery/the_singularitygen/tesla, - /obj/machinery/constructable_frame/machine_frame)) + /obj/structure/machine_frame)) //Ok so we are making an assumption here. We assume that view() still calculates from the center out. //This means that if we find an object we can assume it is the closest one of its type. This is somewhat of a speed increase. diff --git a/code/modules/power/lights.dm b/code/modules/power/lights.dm index 74780dc48b75f..4d0aa1019cf05 100644 --- a/code/modules/power/lights.dm +++ b/code/modules/power/lights.dm @@ -17,7 +17,7 @@ * * Incomplete light tube fixture * - * Becomes a [Light fixture] when completed + * Becomes a [/obj/machinery/light/built] when completed. */ /obj/machinery/light_construct name = "light fixture frame" @@ -128,12 +128,47 @@ return icon_state = "[fixture_type]-construct-stage[stage]" +/** + * # Brass fixture frame + * + * Incomplete brass light tube fixture + * + * Becomes a [Brass light fixture] when completed + */ + +/obj/machinery/light_construct/clockwork + name = "brass light fixture frame" + desc = "A brass light fixture under construction." + icon_state = "clockwork_tube-construct-stage1" + construct_type = /obj/machinery/light/clockwork/built + fixture_type = "clockwork_tube" + +/obj/machinery/light_construct/clockwork/wrench_act(mob/living/user, obj/item/I) + . = TRUE + switch(stage) + if(1) + to_chat(user, "You begin to dismantle [src].") + if(!I.use_tool(src, user, 30, volume = I.tool_volume)) + return + new /obj/item/stack/tile/brass(get_turf(loc), sheets_refunded) + TOOL_DISMANTLE_SUCCESS_MESSAGE + qdel(src) + if(2) + to_chat(user, "You have to remove the wires first.") + if(3) + to_chat(user, "You have to unscrew the case first.") + +/obj/machinery/light_construct/clockwork/deconstruct(disassembled = TRUE) + if(!(flags & NODECONSTRUCT)) + new /obj/item/stack/tile/brass(loc, sheets_refunded) + qdel(src) + /** * # Small light fixture frame * * Incomplete light bulb fixture * - * Becomes a [Small light fixture] when completed + * Becomes a [/obj/machinery/light/small/built] when completed */ /obj/machinery/light_construct/small name = "small light fixture frame" @@ -156,6 +191,28 @@ sheets_refunded = 3 construct_type = /obj/machinery/light/floor/built +/obj/machinery/light_construct/clockwork/small + name = "small brass light fixture frame" + desc = "A small brass light fixture under construction." + icon = 'icons/obj/lighting.dmi' + icon_state = "clockwork_bulb-construct-stage1" + anchored = TRUE + layer = 5 + stage = 1 + fixture_type = "clockwork_bulb" + sheets_refunded = 1 + construct_type = /obj/machinery/light/clockwork/small/built + +/obj/machinery/light_construct/clockwork/floor + name = "brass floor light fixture frame" + desc = "A brass floor light fixture under construction." + icon_state = "clockwork_floor-construct-stage1" + anchored = TRUE + layer = ABOVE_OPEN_TURF_LAYER + plane = FLOOR_PLANE + fixture_type = "clockwork_floor" + sheets_refunded = 3 + construct_type = /obj/machinery/light/clockwork/floor/built #undef LIGHT_CONSTRUCT_EMPTY_FRAME #undef LIGHT_CONSTRUCT_WIRED @@ -268,6 +325,36 @@ layer = ABOVE_OPEN_TURF_LAYER plane = FLOOR_PLANE +/obj/machinery/light/clockwork + icon_state = "clockwork_tube1" + desc = "An industrial brass light fixture." + glow_icon_state = "clockwork_tube" + base_state = "clockwork_tube" + deconstruct_type = /obj/machinery/light_construct/clockwork + +/obj/machinery/light/clockwork/small + icon_state = "clockwork_bulb1" + desc = "A brass light fixture." + glow_icon_state = "clockwork_bulb" + base_state = "clockwork_bulb" + fitting = "bulb" + light_type = /obj/item/light/bulb + deconstruct_type = /obj/machinery/light_construct/clockwork/small + +/obj/machinery/light/clockwork/floor + name = "brass floor light" + desc = "A brass floor light." + icon_state = "clockwork_floor1" + glow_icon_state = "clockwork_floor" + base_state = "clockwork_floor" + fitting = "bulb" + light_type = /obj/item/light/bulb + deconstruct_type = /obj/machinery/light_construct/clockwork/floor + brightness_range = 6 + nightshift_light_range = 6 + layer = ABOVE_OPEN_TURF_LAYER + plane = FLOOR_PLANE + /obj/machinery/light/built status = LIGHT_EMPTY @@ -277,6 +364,14 @@ /obj/machinery/light/floor/built status = LIGHT_EMPTY +/obj/machinery/light/clockwork/built + status = LIGHT_EMPTY + +/obj/machinery/light/clockwork/small/built + status = LIGHT_EMPTY + +/obj/machinery/light/clockwork/floor/built + status = LIGHT_EMPTY // create a new lighting fixture /obj/machinery/light/Initialize(mapload) @@ -297,12 +392,12 @@ break_light_tube(TRUE) if("bulb") brightness_range = 4 - brightness_color = "#a0a080" + // brightness_color = "#a0a080" // SS220 EDIT: comment out if(prob(5)) break_light_tube(TRUE) if("floor") brightness_range = 6 - brightness_color = "#a0a080" + // brightness_color = "#a0a080" // SS220 EDIT: comment out if(prob(3)) break_light_tube(TRUE) update(FALSE, TRUE, FALSE) diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 5a0fbf434ff6f..18435e4dd15b1 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/ammo.dmi' icon_state = "s-casing" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 1 w_class = WEIGHT_CLASS_TINY var/fire_sound = null //What sound should play when this ammo is fired @@ -118,7 +118,7 @@ icon = 'icons/obj/ammo.dmi' icon_state = "10mmbox" // placeholder icon flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT item_state = "syringe_kit" materials = list(MAT_METAL = 30000) throwforce = 2 diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index aa6c863cd63df..c0d5882cc8153 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -5,7 +5,7 @@ icon_state = "revolver_bright" item_state = "gun" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT materials = list(MAT_METAL=2000) w_class = WEIGHT_CLASS_NORMAL throwforce = 5 diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index d995e7346fd73..5b22c551ca581 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -272,13 +272,14 @@ /obj/item/gun/energy/kinetic_accelerator/pistol name = "proto-kinetic pistol" desc = "A lightweight mining tool, sacrificing upgrade capacity for convenience." - icon_state = "kineticgun_p" + icon_state = "kineticpistol" item_state = "gun" w_class = WEIGHT_CLASS_SMALL max_mod_capacity = 65 can_bayonet = FALSE can_flashlight = FALSE can_holster = TRUE + empty_state = "kineticpistol_empty" //Modkits diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 166dc891ac6cd..f65ba7ddba880 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -166,7 +166,7 @@ w_class = WEIGHT_CLASS_BULKY force = 10 flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK can_holster = FALSE origin_tech = "combat=4;magnets=4;powerstorage=3" ammo_type = list(/obj/item/ammo_casing/energy/laser/accelerator) @@ -218,7 +218,7 @@ w_class = WEIGHT_CLASS_BULKY force = 12 flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK can_holster = FALSE weapon_weight = WEAPON_HEAVY origin_tech = "combat=6;magnets=6;powerstorage=4" diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index 9f3a275e61829..557a23fd42598 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -20,7 +20,7 @@ force = 10 modifystate = TRUE flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser) cell_type = /obj/item/stock_parts/cell/pulse execution_speed = 2 SECONDS @@ -57,7 +57,7 @@ name = "pulse carbine" desc = "A lighter, more compact version of the pulse rifle. Easier to store and transport, but has fewer shots. It has a mounting point for a flashlight. The fire selector has three settings: 'stun', 'kill', 'DESTROY'." w_class = WEIGHT_CLASS_NORMAL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT icon_state = "pulse_carbine" item_state = null cell_type = /obj/item/stock_parts/cell/pulse/carbine @@ -81,7 +81,7 @@ name = "pulse pistol" desc = "A pulse gun miniaturised into a pistol-sized form factor. Easy to conceal, but has a low capacity. The fire selector has three settings: 'stun', 'kill', 'DESTROY'." w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT icon_state = "pulse_pistol" item_state = null can_holster = TRUE diff --git a/code/modules/projectiles/guns/energy/special_eguns.dm b/code/modules/projectiles/guns/energy/special_eguns.dm index c71c7fa9d050d..42a2360e34b4a 100644 --- a/code/modules/projectiles/guns/energy/special_eguns.dm +++ b/code/modules/projectiles/guns/energy/special_eguns.dm @@ -32,7 +32,7 @@ w_class = WEIGHT_CLASS_HUGE can_holster = FALSE flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK shaded_charge = TRUE ammo_type = list(/obj/item/ammo_casing/energy/ion) ammo_x_offset = 3 @@ -69,7 +69,7 @@ desc = "The MK.II Prototype Ion Projector is a lightweight carbine version of the larger ion rifle, built to be ergonomic and efficient, it packs the exact same punch and capacity in a smaller, easier to transport package." icon_state = "ioncarbine" w_class = WEIGHT_CLASS_NORMAL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT ammo_x_offset = 2 flight_x_offset = 18 flight_y_offset = 11 @@ -610,7 +610,7 @@ weapon_weight = WEAPON_HEAVY w_class = WEIGHT_CLASS_BULKY can_holster = FALSE - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK cell_type = /obj/item/stock_parts/cell/bsg shaded_charge = TRUE can_fit_in_turrets = FALSE //Crystal would shatter, or someone would try to put an empty gun in the frame. @@ -733,7 +733,7 @@ icon = 'icons/obj/guns/gun_temperature.dmi' icon_state = "tempgun_4" item_state = "tempgun_4" - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY fire_sound = 'sound/weapons/pulse3.ogg' origin_tech = "combat=4;materials=4;powerstorage=3;magnets=2" diff --git a/code/modules/projectiles/guns/magic/magic_staff.dm b/code/modules/projectiles/guns/magic/magic_staff.dm index aa11d8b862d77..90797283e7c04 100644 --- a/code/modules/projectiles/guns/magic/magic_staff.dm +++ b/code/modules/projectiles/guns/magic/magic_staff.dm @@ -1,7 +1,7 @@ /obj/item/gun/magic/staff lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi' righthand_file = 'icons/mob/inhands/staves_righthand.dmi' - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK ammo_type = /obj/item/ammo_casing/magic flags_2 = NO_MAT_REDEMPTION_2 execution_speed = 3 SECONDS diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index 2eb257881e09c..709370ec588f3 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -240,7 +240,7 @@ CONTENTS: // This is needed to you don't try to perform an execution/suicide when lighting a cigarette. /obj/item/gun/magic/wand/fireball/handle_suicide(mob/user, mob/living/carbon/human/target, params) - var/mask_item = target.get_item_by_slot(SLOT_HUD_WEAR_MASK) + var/mask_item = target.get_item_by_slot(ITEM_SLOT_MASK) if(istype(mask_item, /obj/item/clothing/mask/cigarette) && user.zone_selected == "mouth" && user.a_intent == INTENT_HELP) return . = ..() diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm index 9c75e854f4b12..470ff0b0c861c 100644 --- a/code/modules/projectiles/guns/projectile/launchers.dm +++ b/code/modules/projectiles/guns/projectile/launchers.dm @@ -58,7 +58,7 @@ icon_state = "speargun" item_state = "speargun" w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK origin_tech = "combat=4;engineering=4" force = 10 can_suppress = FALSE diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 3b7a9248989af..8d3d20861eb03 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -333,7 +333,7 @@ weapon_weight = WEAPON_HEAVY force = 10 flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK mag_type = /obj/item/ammo_box/magazine/internal/shot/dual fire_sound = 'sound/weapons/gunshots/gunshot_shotgun.ogg' sawn_desc = "Omar's coming!" @@ -442,7 +442,7 @@ if(sling) to_chat(user, "The shotgun already has a sling!") else if(C.use(10)) - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK to_chat(user, "You tie the lengths of cable to the shotgun, making a sling.") sling = TRUE update_icon() diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index f65e94674595b..e7c537fcd0404 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -11,7 +11,7 @@ force = 10 flags = CONDUCT can_holster = FALSE - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK origin_tech = "combat=4;materials=2" mag_type = /obj/item/ammo_box/magazine/internal/shot fire_sound = 'sound/weapons/gunshots/gunshot_shotgun.ogg' @@ -137,8 +137,8 @@ w_class = WEIGHT_CLASS_NORMAL current_skin = "riotshotgun_sawn" item_state = "riotshotgun_sawn" //phil235 is it different with different skin? - slot_flags &= ~SLOT_FLAG_BACK //you can't sling it on your back - slot_flags |= SLOT_FLAG_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) + slot_flags &= ~ITEM_SLOT_BACK //you can't sling it on your back + slot_flags |= ITEM_SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) sawn_state = SAWN_OFF magazine.max_ammo = 3 update_appearance() @@ -178,8 +178,8 @@ w_class = initial(w_class) current_skin = "riotshotgun" item_state = initial(item_state) - slot_flags &= ~SLOT_FLAG_BELT - slot_flags |= SLOT_FLAG_BACK + slot_flags &= ~ITEM_SLOT_BELT + slot_flags |= ITEM_SLOT_BACK sawn_state = SAWN_INTACT magazine.max_ammo = 6 update_appearance() diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 91d0a879f7455..e3faa00a0c7a5 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -15,9 +15,9 @@ can_unsuppress = TRUE can_suppress = TRUE w_class = WEIGHT_CLASS_NORMAL - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK actions_types = list() - execution_speed = 8 SECONDS + execution_speed = 4 SECONDS var/zoomable = TRUE /obj/item/gun/projectile/automatic/sniper_rifle/Initialize(mapload) diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm index 27d195f82d9e2..fda9c8b4587a0 100644 --- a/code/modules/projectiles/guns/projectile/toy.dm +++ b/code/modules/projectiles/guns/projectile/toy.dm @@ -89,7 +89,7 @@ inhand_y_dimension = 32 mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow fire_sound = 'sound/items/syringeproj.ogg' - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL /obj/item/gun/projectile/automatic/c20r/toy @@ -134,7 +134,6 @@ 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/projectiles/guns/projectile_gun.dm b/code/modules/projectiles/guns/projectile_gun.dm index fd8ffce281d3f..5aac1bb486980 100644 --- a/code/modules/projectiles/guns/projectile_gun.dm +++ b/code/modules/projectiles/guns/projectile_gun.dm @@ -231,8 +231,8 @@ user.visible_message("[user] shortens \the [src]!", "You shorten \the [src].") w_class = WEIGHT_CLASS_NORMAL item_state = "gun"//phil235 is it different with different skin? - slot_flags &= ~SLOT_FLAG_BACK //you can't sling it on your back - slot_flags |= SLOT_FLAG_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) + slot_flags &= ~ITEM_SLOT_BACK //you can't sling it on your back + slot_flags |= ITEM_SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) sawn_state = SAWN_OFF update_appearance() return 1 diff --git a/code/modules/projectiles/guns/throw/pielauncher.dm b/code/modules/projectiles/guns/throw/pielauncher.dm index ac4a5c8540d16..fcb7c08a4f53a 100644 --- a/code/modules/projectiles/guns/throw/pielauncher.dm +++ b/code/modules/projectiles/guns/throw/pielauncher.dm @@ -1,7 +1,7 @@ /obj/item/gun/throw/piecannon name = "pie cannon" desc = "A projectile weapon that fires pies." - icon_state = "piecannon" + icon_state = "piecannon1" w_class = WEIGHT_CLASS_HUGE throw_speed = 2 throw_range = 3 diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 592a4e093aa3f..77ce0bb8af198 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -224,7 +224,7 @@ name = "dart" icon_state = "cbbolt" damage = 6 - var/piercing = FALSE + var/penetrate_thick = FALSE /obj/item/projectile/bullet/dart/New() ..() @@ -235,7 +235,7 @@ if(iscarbon(target)) var/mob/living/carbon/M = target if(blocked != INFINITY) - if(M.can_inject(null, FALSE, hit_zone, piercing)) // Pass the hit zone to see if it can inject by whether it hit the head or the body. + if(M.can_inject(null, FALSE, hit_zone, penetrate_thick)) // Pass the hit zone to see if it can inject by whether it hit the head or the body. ..() reagents.reaction(M, REAGENT_INGEST, 0.1) @@ -268,7 +268,7 @@ damage = 20 /obj/item/projectile/bullet/dart/syringe/pierce_ignore - piercing = TRUE + penetrate_thick = TRUE /obj/item/projectile/bullet/dart/syringe/tranquilizer diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 0672fa1f7c7b9..23f2dcacdb910 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -6,6 +6,9 @@ #define TRANSFER_TO_DISPOSAL 0 #define TRANSFER_TO_BEAKER 1 +#define SAFE_MIN_TEMPERATURE T0C+7 // Safe minimum temperature for chemicals before they would start to damage slimepeople. +#define SAFE_MAX_TEMPERATURE T0C+36 // Safe maximum temperature for chemicals before they would start to damage drask. + /obj/machinery/chem_master name = "\improper ChemMaster 3000" desc = "Used to turn reagents into pills, patches, and store them in bottles." @@ -610,6 +613,8 @@ for(var/datum/reagent/A in R.reagent_list) if(!safe_chem_list.Find(A.id)) return FALSE + if(R.chem_temp < SAFE_MIN_TEMPERATURE || R.chem_temp > SAFE_MAX_TEMPERATURE) + return FALSE return TRUE /datum/chemical_production_mode/patches/configure_item(data, datum/reagents/R, obj/item/reagent_containers/patch/P) @@ -628,7 +633,7 @@ production_name = "Bottles" production_icon = "wine-bottle" item_type = /obj/item/reagent_containers/glass/bottle/reagent - sprites = list("bottle", "small_bottle", "wide_bottle", "round_bottle", "reagent_bottle") + sprites = list("bottle", "reagent_bottle") max_items_amount = 5 max_units_per_item = 50 name_suffix = " bottle" @@ -665,3 +670,6 @@ #undef TRANSFER_TO_DISPOSAL #undef TRANSFER_TO_BEAKER + +#undef SAFE_MIN_TEMPERATURE +#undef SAFE_MAX_TEMPERATURE diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index 35eb0f141883d..bf48302233965 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -81,7 +81,7 @@ /obj/machinery/computer/pandemic/proc/create_culture(name, bottle_type = "culture", cooldown = 50) var/obj/item/reagent_containers/glass/bottle/B = new/obj/item/reagent_containers/glass/bottle(loc) - B.icon_state = "round_bottle" + B.icon_state = "bottle" B.pixel_x = rand(-3, 3) B.pixel_y = rand(-3, 3) replicator_cooldown(cooldown) diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm index 1371a3bf52249..c4060c3a187db 100644 --- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm @@ -102,9 +102,11 @@ drink_desc = "As colorful and healthy as it is delicious." taste_description = "citrus juice" -/datum/reagent/consumable/drink/triple_citrus/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) - if(method == REAGENT_INGEST) - M.adjustToxLoss(-rand(1,2)) +/datum/reagent/consumable/drink/triple_citrus/on_mob_life(mob/living/M) + var/update_flags = STATUS_UPDATE_NONE + if(prob(15)) + update_flags |= M.adjustToxLoss(-rand(1, 2), FALSE) + return ..() | update_flags /datum/reagent/consumable/drink/berryjuice name = "Berry Juice" diff --git a/code/modules/reagents/chemistry/reagents/misc_reagents.dm b/code/modules/reagents/chemistry/reagents/misc_reagents.dm index e723d0cabc30f..e49398c71a1f1 100644 --- a/code/modules/reagents/chemistry/reagents/misc_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/misc_reagents.dm @@ -397,7 +397,7 @@ if(H.wear_mask) H.unEquip(H.wear_mask) var/obj/item/clothing/mask/fakemoustache = new /obj/item/clothing/mask/fakemoustache - H.equip_to_slot(fakemoustache, SLOT_HUD_WEAR_MASK) + H.equip_to_slot(fakemoustache, ITEM_SLOT_MASK) to_chat(H, "Hair bursts forth from your every follicle!") ..() diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm index f986e610d92c6..ec1b87f2da377 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm @@ -72,7 +72,7 @@ if(isspaceturf(T)) return if(!T.reagents) - T.create_reagents(volume) + T.create_reagents(1000) T.reagents.add_reagent("napalm", volume) /datum/reagent/napalm/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume) @@ -220,7 +220,7 @@ /datum/reagent/thermite/reaction_turf(turf/simulated/S, volume) if(istype(S)) if(!S.reagents) - S.create_reagents(volume) + S.create_reagents(1000) S.reagents.add_reagent("thermite", volume) if(S.active_hotspot) S.reagents.temperature_reagents(S.active_hotspot.temperature, 10, 300) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 8ef267a08e45b..7a2e25eb4796c 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -18,7 +18,7 @@ /// How many SSobj ticks it takes for the reagents to recharge by 10 units var/recharge_time = 3 /// Can the autohypo inject through thick materials? - var/bypass_protection = 0 + var/penetrate_thick = FALSE var/choosen_reagent = "salglu_solution" var/list/datum/reagents/reagent_list = list() var/list/reagent_ids = list("salglu_solution", "epinephrine", "spaceacillin", "charcoal", "hydrocodone", "mannitol", "salbutamol") @@ -57,14 +57,14 @@ reagent_ids = list("syndicate_nanites", "potass_iodide", "hydrocodone") total_reagents = 30 maximum_reagents = 30 - bypass_protection = TRUE + penetrate_thick = TRUE choosen_reagent = "syndicate_nanites" /obj/item/reagent_containers/borghypo/abductor charge_cost = 40 recharge_time = 3 reagent_ids = list("salglu_solution", "epinephrine", "hydrocodone", "spaceacillin", "charcoal", "mannitol", "salbutamol", "corazone") - bypass_protection = 1 + penetrate_thick = TRUE /obj/item/reagent_containers/borghypo/Initialize(mapload) . = ..() @@ -94,7 +94,7 @@ return if(!istype(M)) return - if(total_reagents && M.can_inject(user, TRUE, user.zone_selected, penetrate_thick = bypass_protection)) + if(total_reagents && M.can_inject(user, TRUE, user.zone_selected, penetrate_thick)) to_chat(user, "You inject [M] with the injector.") to_chat(M, "You feel a tiny prick!") @@ -127,11 +127,11 @@ /obj/item/reagent_containers/borghypo/emag_act(mob/user) if(!emagged) emagged = TRUE - bypass_protection = TRUE + penetrate_thick = TRUE reagent_ids += reagent_ids_emagged return emagged = FALSE - bypass_protection = FALSE + penetrate_thick = FALSE reagent_ids -= reagent_ids_emagged /obj/item/reagent_containers/borghypo/basic diff --git a/code/modules/reagents/reagent_containers/chemical_bottle.dm b/code/modules/reagents/reagent_containers/chemical_bottle.dm index 0813cf3ebc952..22c72441c2856 100644 --- a/code/modules/reagents/reagent_containers/chemical_bottle.dm +++ b/code/modules/reagents/reagent_containers/chemical_bottle.dm @@ -5,37 +5,38 @@ name = "bottle" desc = "A small bottle." icon = 'icons/obj/chemical.dmi' - icon_state = "round_bottle" + icon_state = "bottle" item_state = "atoxinbottle" amount_per_transfer_from_this = 10 - possible_transfer_amounts = list(5,10,15,25,30) + possible_transfer_amounts = list(5, 10, 15, 25, 30, 40, 50) container_type = OPENCONTAINER - volume = 30 + volume = 50 /obj/item/reagent_containers/glass/bottle/on_reagent_change() update_icon(UPDATE_OVERLAYS) /obj/item/reagent_containers/glass/bottle/update_overlays() . = ..() - underlays.Cut() if(reagents.total_volume) - var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10") + var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]1") var/percent = round((reagents.total_volume / volume) * 100) switch(percent) - if(0 to 24) - filling.icon_state = "[icon_state]10" - if(25 to 49) - filling.icon_state = "[icon_state]25" - if(50 to 74) - filling.icon_state = "[icon_state]50" - if(75 to 90) - filling.icon_state = "[icon_state]75" - if(91 to INFINITY) + if(1 to 19) + filling.icon_state = "[icon_state]1" + if(20 to 39) + filling.icon_state = "[icon_state]20" + if(40 to 59) + filling.icon_state = "[icon_state]40" + if(60 to 79) + filling.icon_state = "[icon_state]60" + if(80 to 99) + filling.icon_state = "[icon_state]80" + if(100 to INFINITY) filling.icon_state = "[icon_state]100" filling.icon += mix_color_from_reagents(reagents.reagent_list) - underlays += filling + . += filling if(!is_open_container()) . += "lid_[icon_state]" @@ -50,67 +51,56 @@ /obj/item/reagent_containers/glass/bottle/toxin name = "toxin bottle" desc = "A small bottle containing toxic compounds." - icon_state = "small_bottle" list_reagents = list("toxin" = 30) /obj/item/reagent_containers/glass/bottle/atropine name = "atropine bottle" desc = "A small bottle containing atropine, used for cardiac emergencies." - icon_state = "small_bottle" list_reagents = list("atropine" = 30) /obj/item/reagent_containers/glass/bottle/saline name = "saline-glucose bottle" desc = "A small bottle containing saline-glucose solution." - icon_state = "small_bottle" list_reagents = list("salglu_solution" = 30) /obj/item/reagent_containers/glass/bottle/salicylic name = "salicylic acid bottle" desc = "A small bottle containing medicine for pain and fevers." - icon_state = "small_bottle" list_reagents = list("sal_acid" = 30) /obj/item/reagent_containers/glass/bottle/cyanide name = "cyanide bottle" desc = "A small bottle of cyanide. Bitter almonds?" - icon_state = "small_bottle" list_reagents = list("cyanide" = 30) /obj/item/reagent_containers/glass/bottle/mutagen name = "unstable mutagen bottle" desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact." - icon_state = "bottle" list_reagents = list("mutagen" = 30) /obj/item/reagent_containers/glass/bottle/ash name = "ash bottle" desc = "A small bottle of ash. The substance, not the person." - icon_state = "bottle" list_reagents = list("ash" = 30) /obj/item/reagent_containers/glass/bottle/ammonia name = "ammonia bottle" desc = "A small bottle of ammonia. Good for cleaning, but don't mix it with bleach." - icon_state = "bottle" list_reagents = list("ammonia" = 30) /obj/item/reagent_containers/glass/bottle/diethylamine name = "diethylamine bottle" desc = "A small bottle of diethylamine. Good for plants, bad for people." - icon_state = "round_bottle" list_reagents = list("diethylamine" = 30) /obj/item/reagent_containers/glass/bottle/saltpetre name = "saltpetre bottle" desc = "A small bottle of saltpetre. Used in botany and to make gunpowder." - icon_state = "round_bottle" list_reagents = list("saltpetre" = 30) /obj/item/reagent_containers/glass/bottle/facid name = "fluorosulfuric acid bottle" desc = "A small bottle. Contains a small amount of Fluorosulfuric Acid" - icon_state = "round_bottle" list_reagents = list("facid" = 30) /obj/item/reagent_containers/glass/bottle/adminordrazine @@ -123,55 +113,46 @@ /obj/item/reagent_containers/glass/bottle/capsaicin name = "capsaicin bottle" desc = "A small bottle. Contains hot sauce." - icon_state = "round_bottle" list_reagents = list("capsaicin" = 30) /obj/item/reagent_containers/glass/bottle/frostoil name = "frost oil bottle" desc = "A small bottle. Contains cold sauce." - icon_state = "round_bottle" list_reagents = list("frostoil" = 30) /obj/item/reagent_containers/glass/bottle/morphine name = "morphine bottle" desc = "A small bottle of morphine, a powerful painkiller." - icon_state = "bottle" list_reagents = list("morphine" = 30) /obj/item/reagent_containers/glass/bottle/ether name = "ether bottle" desc = "A small bottle of an ether, a strong anesthetic and sedative." - icon_state = "round_bottle" list_reagents = list("ether" = 30) /obj/item/reagent_containers/glass/bottle/charcoal name = "charcoal bottle" desc = "A small bottle. Contains charcoal." - icon_state = "wide_bottle" list_reagents = list("charcoal" = 30) /obj/item/reagent_containers/glass/bottle/epinephrine name = "epinephrine bottle" desc = "A small bottle. Contains epinephrine - used to stabilize patients." - icon_state = "round_bottle" list_reagents = list("epinephrine" = 30) /obj/item/reagent_containers/glass/bottle/pancuronium name = "pancuronium bottle" desc = "A small bottle of pancuronium." - icon_state = "round_bottle" list_reagents = list("pancuronium" = 30) /obj/item/reagent_containers/glass/bottle/sulfonal name = "sulfonal bottle" desc = "A small bottle of Sulfonal." - icon_state = "round_bottle" list_reagents = list("sulfonal" = 30) /obj/item/reagent_containers/glass/bottle/love name = "love bottle" desc = "A small bottle of love." - icon_state = "round_bottle" list_reagents = list("love" = 50) //Reagent bottles @@ -180,8 +161,6 @@ name = "reagent bottle" desc = "A bottle for storing reagents." icon_state = "reagent_bottle" - possible_transfer_amounts = list(5, 10, 15, 25, 30, 50) - volume = 50 /obj/item/reagent_containers/glass/bottle/reagent/oil name = "oil bottle" @@ -268,12 +247,16 @@ desc = "A bottle of glowing fluid." list_reagents = list("lazarus_reagent" = 30) +/obj/item/reagent_containers/glass/bottle/thermite + name = "thermite bottle" + desc = "A small bottle of thermite, a substance that burns extremely hot." + icon_state = "bottle" + list_reagents = list("thermite" = 50) + ////////////////////Traitor Poison Bottle////////////////////////////// /obj/item/reagent_containers/glass/bottle/traitor desc = "It has a small skull and crossbones on it. Uh-oh!" - possible_transfer_amounts = list(5,10,15,25,30,40) - volume = 40 /obj/item/reagent_containers/glass/bottle/traitor/Initialize(mapload) . = ..() @@ -282,162 +265,135 @@ /obj/item/reagent_containers/glass/bottle/plasma name = "plasma dust bottle" desc = "A small bottle of plasma in dust form. Extremely toxic and reacts with micro-organisms inside blood." - icon_state = "wide_bottle" list_reagents = list("plasma_dust" = 30) /obj/item/reagent_containers/glass/bottle/diphenhydramine name = "diphenhydramine bottle" desc = "A small bottle of diphenhydramine." - icon_state = "round_bottle" list_reagents = list("diphenhydramine" = 30) /obj/item/reagent_containers/glass/bottle/oculine name = "oculine bottle" desc = "A small bottle of combined eye and ear medication." - icon_state = "round_bottle" list_reagents = list("oculine" = 30) /obj/item/reagent_containers/glass/bottle/potassium_iodide name = "potassium iodide bottle" desc = "A small bottle of potassium iodide." - icon_state = "wide_bottle" list_reagents = list("potass_iodide" = 30) /obj/item/reagent_containers/glass/bottle/flu_virion name = "Flu virion culture bottle" desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium." - icon_state = "round_bottle" spawned_disease = /datum/disease/advance/flu /obj/item/reagent_containers/glass/bottle/epiglottis_virion name = "Epiglottis virion culture bottle" desc = "A small bottle. Contains Epiglottis virion culture in synthblood medium." - icon_state = "round_bottle" spawned_disease = /datum/disease/advance/voice_change /obj/item/reagent_containers/glass/bottle/liver_enhance_virion name = "Liver enhancement virion culture bottle" desc = "A small bottle. Contains liver enhancement virion culture in synthblood medium." - icon_state = "round_bottle" spawned_disease = /datum/disease/advance/heal /obj/item/reagent_containers/glass/bottle/hullucigen_virion name = "Hullucigen virion culture bottle" desc = "A small bottle. Contains hullucigen virion culture in synthblood medium." - icon_state = "round_bottle" spawned_disease = /datum/disease/advance/hullucigen /obj/item/reagent_containers/glass/bottle/pierrot_throat name = "Pierrot's Throat culture bottle" desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium." - icon_state = "round_bottle" spawned_disease = /datum/disease/pierrot_throat /obj/item/reagent_containers/glass/bottle/cold name = "Rhinovirus culture bottle" desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium." - icon_state = "round_bottle" spawned_disease = /datum/disease/advance/cold /obj/item/reagent_containers/glass/bottle/retrovirus name = "Retrovirus culture bottle" desc = "A small bottle. Contains a retrovirus culture in a synthblood medium." - icon_state = "round_bottle" spawned_disease = /datum/disease/dna_retrovirus /obj/item/reagent_containers/glass/bottle/gbs name = "GBS culture bottle" desc = "A small bottle. Contains Gravitokinetic Bipotential SADS+ culture in synthblood medium."//Or simply - General BullShit - icon_state = "round_bottle" amount_per_transfer_from_this = 5 spawned_disease = /datum/disease/gbs /obj/item/reagent_containers/glass/bottle/fake_gbs name = "GBS culture bottle" desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit - icon_state = "round_bottle" spawned_disease = /datum/disease/fake_gbs /obj/item/reagent_containers/glass/bottle/brainrot name = "Brainrot culture bottle" desc = "A small bottle. Contains Cryptococcus Cosmosis culture in synthblood medium." - icon_state = "round_bottle" spawned_disease = /datum/disease/brainrot /obj/item/reagent_containers/glass/bottle/magnitis name = "Magnitis culture bottle" desc = "A small bottle. Contains a small dosage of Fukkos Miracos." - icon_state = "round_bottle" spawned_disease = /datum/disease/magnitis /obj/item/reagent_containers/glass/bottle/wizarditis name = "Wizarditis culture bottle" desc = "A small bottle. Contains a sample of Rincewindus Vulgaris." - icon_state = "round_bottle" spawned_disease = /datum/disease/wizarditis /obj/item/reagent_containers/glass/bottle/anxiety name = "Severe Anxiety culture bottle" desc = "A small bottle. Contains a sample of Lepidopticides." - icon_state = "round_bottle" spawned_disease = /datum/disease/anxiety /obj/item/reagent_containers/glass/bottle/beesease name = "Beesease culture bottle" desc = "A small bottle. Contains a sample of invasive Apidae." - icon_state = "round_bottle" spawned_disease = /datum/disease/beesease /obj/item/reagent_containers/glass/bottle/fluspanish name = "Spanish flu culture bottle" desc = "A small bottle. Contains a sample of Inquisitius." - icon_state = "round_bottle" spawned_disease = /datum/disease/fluspanish /obj/item/reagent_containers/glass/bottle/tuberculosis name = "Fungal Tuberculosis culture bottle" desc = "A small bottle. Contains a sample of Fungal Tubercle bacillus." - icon_state = "round_bottle" spawned_disease = /datum/disease/tuberculosis /obj/item/reagent_containers/glass/bottle/regeneration name = "Regeneration culture bottle" desc = "A small bottle. Contains a sample of a virus that heals toxin damage." - icon_state = "round_bottle" spawned_disease = /datum/disease/advance/heal /obj/item/reagent_containers/glass/bottle/sensory_restoration name = "Sensory Restoration culture bottle" desc = "A small bottle. Contains a sample of a virus that heals sensory damage." - icon_state = "round_bottle" spawned_disease = /datum/disease/advance/sensory_restoration /obj/item/reagent_containers/glass/bottle/tuberculosiscure name = "BVAK bottle" desc = "A small bottle containing Bio Virus Antidote Kit." - icon_state = "wide_bottle" list_reagents = list("atropine" = 5, "epinephrine" = 5, "salbutamol" = 10, "spaceacillin" = 10) /obj/item/reagent_containers/glass/bottle/zombiecure1 name = "\improper Anti-Plague Sequence Alpha bottle" desc = "A small bottle containing 50 units of Anti-Plague Sequence Alpha. Prevents infection, cures level 1 infection." - icon_state = "wide_bottle" list_reagents = list("zombiecure1" = 50) /obj/item/reagent_containers/glass/bottle/zombiecure2 name = "\improper Anti-Plague Sequence Beta bottle" desc = "A small bottle containing 50 units of Anti-Plague Sequence Beta. Weakens zombies, heals low infections." - icon_state = "wide_bottle" list_reagents = list("zombiecure2" = 50) /obj/item/reagent_containers/glass/bottle/zombiecure3 name = "\improper Anti-Plague Sequence Gamma bottle" desc = "A small bottle containing 50 units of Anti-Plague Sequence Gamma. Lowers zombies healing. Heals stage 5 and slows stage 6 infections." - icon_state = "wide_bottle" list_reagents = list("zombiecure3" = 50) /obj/item/reagent_containers/glass/bottle/zombiecure4 name = "\improper Anti-Plague Sequence Omega bottle" desc = "A small bottle containing 50 units of Anti-Plague Sequence Omega. Cures all cases of the Necrotizing Plague. Also heals dead limbs." - icon_state = "wide_bottle" list_reagents = list("zombiecure4" = 50) diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index fccf8de333545..b21cf9dc7b17f 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -6,8 +6,6 @@ var/base_name = " " desc = " " icon = 'icons/obj/chemical.dmi' - icon_state = "null" - item_state = "null" amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25,30,50) volume = 50 @@ -142,23 +140,21 @@ /obj/item/reagent_containers/glass/beaker/update_overlays() . = ..() if(reagents.total_volume) - var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10") + var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]1") var/percent = round((reagents.total_volume / volume) * 100) switch(percent) - if(0 to 9) - filling.icon_state = "[icon_state]-10" - if(10 to 24) - filling.icon_state = "[icon_state]10" - if(25 to 49) - filling.icon_state = "[icon_state]25" - if(50 to 74) - filling.icon_state = "[icon_state]50" - if(75 to 79) - filling.icon_state = "[icon_state]75" - if(80 to 90) + if(1 to 19) + filling.icon_state = "[icon_state]1" + if(20 to 39) + filling.icon_state = "[icon_state]20" + if(40 to 59) + filling.icon_state = "[icon_state]40" + if(60 to 79) + filling.icon_state = "[icon_state]60" + if(80 to 99) filling.icon_state = "[icon_state]80" - if(91 to INFINITY) + if(100 to INFINITY) filling.icon_state = "[icon_state]100" filling.icon += mix_color_from_reagents(reagents.reagent_list) @@ -302,7 +298,7 @@ possible_transfer_amounts = list(5,10,15,20,25,30,50,80,100,120) volume = 120 armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 75, ACID = 50) //Weak melee protection, because you can wear it on your head - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD resistance_flags = NONE blocks_emissive = EMISSIVE_BLOCK_GENERIC container_type = OPENCONTAINER @@ -323,7 +319,7 @@ /obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot) ..() - if(slot == SLOT_HUD_HEAD && reagents.total_volume) + if(slot == ITEM_SLOT_HEAD && reagents.total_volume) to_chat(user, "[src]'s contents spill all over you!") reagents.reaction(user, REAGENT_TOUCH) reagents.clear_reagents() diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index fd3aa4d31611e..95f5abf153b01 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -13,11 +13,13 @@ possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30) resistance_flags = ACID_PROOF container_type = OPENCONTAINER - slot_flags = SLOT_FLAG_BELT - /// If TRUE, the hypospray can inject through most hardsuits/modsuits. - var/can_pierce_hardsuits = FALSE + slot_flags = ITEM_SLOT_BELT + /// If TRUE, the hypospray can inject any clothing without TRAIT_HYPOSPRAY_IMMUNE. + var/penetrate_thick = FALSE /// If TRUE, the hypospray isn't blocked by suits with TRAIT_HYPOSPRAY_IMMUNE. var/ignore_hypospray_immunity = FALSE + /// if TRUE, the hypospray will always succeed at injecting an organic limb regardless of protective clothing or traits such as the thick skin gene (except for TRAIT_HYPOSPRAY_IMMUNE). + var/penetrate_everything = FALSE /// If TRUE, the hypospray will reject any chemicals not on the safe_chem_list. var/safety_hypo = FALSE // List of SOSHA-approved medicines. @@ -32,16 +34,18 @@ if(!reagents.total_volume) to_chat(user, "[src] is empty!") return + if(!iscarbon(M)) return var/mob/living/carbon/human/H = M if(H.wear_suit) - if(HAS_TRAIT(H.wear_suit, TRAIT_HYPOSPRAY_IMMUNE) && !ignore_hypospray_immunity) // This check is here entirely to stop goobers injecting nukies with meme chems + // This check is here entirely to stop goobers injecting Nukies, the SST, and the Deathsquad with meme chems. + if(HAS_TRAIT(H.wear_suit, TRAIT_HYPOSPRAY_IMMUNE) && !ignore_hypospray_immunity) to_chat(user, "[src] is unable to penetrate the armour of [M] or interface with any injection ports.") return - if(reagents.total_volume && (can_pierce_hardsuits || M.can_inject(user, TRUE))) // can_pierce_hardsuits should be checked first or there will be an error message. + if(reagents.total_volume && M.can_inject(user, TRUE, user.zone_selected, penetrate_thick, penetrate_everything)) to_chat(M, "You feel a tiny prick!") to_chat(user, "You inject [M] with [src].") @@ -99,7 +103,8 @@ /obj/item/reagent_containers/hypospray/emag_act(mob/user) if(safety_hypo && !emagged) emagged = TRUE - can_pierce_hardsuits = TRUE + penetrate_thick = TRUE + penetrate_everything = TRUE to_chat(user, "You short out the safeties on [src].") return TRUE @@ -124,8 +129,9 @@ possible_transfer_amounts = list(5, 10, 15, 20, 25, 30) icon_state = "combat_hypo" volume = 90 - can_pierce_hardsuits = TRUE // So they can heal their comrades. + penetrate_thick = TRUE // So they can heal their comrades. ignore_hypospray_immunity = TRUE + penetrate_everything = TRUE list_reagents = list("epinephrine" = 30, "weak_omnizine" = 30, "salglu_solution" = 30) /obj/item/reagent_containers/hypospray/combat/nanites @@ -148,7 +154,7 @@ desc = "Nanotrasen's own, reverse-engineered and improved version of DeForest's hypospray." list_reagents = list("omnizine" = 30) volume = 100 - can_pierce_hardsuits = TRUE + penetrate_thick = TRUE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF /obj/item/reagent_containers/hypospray/CMO/Initialize(mapload) @@ -177,8 +183,9 @@ amount_per_transfer_from_this = 10 possible_transfer_amounts = null volume = 10 - can_pierce_hardsuits = TRUE //so you can medipen through hardsuits + penetrate_thick = TRUE ignore_hypospray_immunity = TRUE + penetrate_everything = TRUE // Autoinjectors bypass everything. container_type = DRAWABLE flags = null diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index aacef32353b89..017356e217006 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -7,7 +7,7 @@ belt_icon = "space_cleaner" flags = NOBLUDGEON container_type = OPENCONTAINER - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 48875c4435a95..8137f1f545952 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -2,7 +2,7 @@ name = "Dispenser" desc = "..." icon = 'icons/obj/objects.dmi' - icon_state = "watertank" + icon_state = "water" density = TRUE pressure_resistance = 2*ONE_ATMOSPHERE container_type = DRAINABLE | AMOUNT_VISIBLE diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index c7a23b33c67e4..8244fef598461 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -247,7 +247,7 @@ w_class = WEIGHT_CLASS_TINY item_state = "electronic" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT ///Value of the tag var/currTag = 1 //The whole system for the sort_type var is determined based on the order of this list, diff --git a/code/modules/ruins/ghost_bar.dm b/code/modules/ruins/ghost_bar.dm index b3066244a7910..2976fe21dcf76 100644 --- a/code/modules/ruins/ghost_bar.dm +++ b/code/modules/ruins/ghost_bar.dm @@ -39,8 +39,8 @@ GLOBAL_LIST_EMPTY(occupants_by_key) save_to_load.copy_to(H) if(!H.back) - equip_item(H, /obj/item/storage/backpack, SLOT_HUD_BACK) - equip_item(H, /obj/item/radio/headset/deadsay, SLOT_HUD_LEFT_EAR) + equip_item(H, /obj/item/storage/backpack, ITEM_SLOT_BACK) + equip_item(H, /obj/item/radio/headset/deadsay, ITEM_SLOT_LEFT_EAR) H.dna.species.before_equip_job(/datum/job/assistant, H) H.dna.species.remains_type = /obj/effect/decal/cleanable/ash var/obj/item/bio_chip/dust/I = new @@ -57,12 +57,12 @@ GLOBAL_LIST_EMPTY(occupants_by_key) else H.equip_or_collect(G.spawn_item(null, save_to_load.get_gear_metadata(G))) if(!H.w_uniform) - equip_item(H, /obj/item/clothing/under/color/random, SLOT_HUD_JUMPSUIT) + equip_item(H, /obj/item/clothing/under/color/random, ITEM_SLOT_JUMPSUIT) if(!H.shoes) - equip_item(H, /obj/item/clothing/shoes/black, SLOT_HUD_SHOES) - equip_item(H, /obj/item/stack/spacecash/c1000, SLOT_HUD_LEFT_STORE) + equip_item(H, /obj/item/clothing/shoes/black, ITEM_SLOT_SHOES) + equip_item(H, /obj/item/stack/spacecash/c1000, ITEM_SLOT_LEFT_POCKET) - var/obj/item/card/id/syndicate/our_id = equip_item(H, /obj/item/card/id/syndicate/ghost_bar, SLOT_HUD_WEAR_ID) + var/obj/item/card/id/syndicate/our_id = equip_item(H, /obj/item/card/id/syndicate/ghost_bar, ITEM_SLOT_ID) our_id.assignment = assignedrole our_id.registered_name = H.real_name our_id.sex = capitalize(H.gender) diff --git a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm index be103a2eb18f7..3f32048e4dda6 100644 --- a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm +++ b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm @@ -42,23 +42,6 @@ linked = null . = ..() -/obj/effect/clockwork/overlay/wall - name = "clockwork wall" - icon = 'icons/turf/walls/clockwork_wall.dmi' - icon_state = "clockwork_wall" - canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BRASS_WALL) - smoothing_flags = SMOOTH_CORNERS - layer = CLOSED_TURF_LAYER - -/obj/effect/clockwork/overlay/wall/Initialize(mapload) - . = ..() - QUEUE_SMOOTH_NEIGHBORS(src) - QUEUE_SMOOTH(src) - -/obj/effect/clockwork/overlay/wall/Destroy() - QUEUE_SMOOTH_NEIGHBORS(src) - return ..() - /obj/effect/clockwork/overlay/floor icon = 'icons/turf/floors.dmi' icon_state = "clockwork_floor" @@ -167,7 +150,7 @@ . = ..() if(randomsinglesprite) replace_name_desc() - icon_state = "[icon_state][rand(1, randomspritemax)]" + icon_state = "[base_icon_state][rand(1, randomspritemax)]" pixel_x = rand(-sprite_shift, sprite_shift) pixel_y = rand(-sprite_shift, sprite_shift) @@ -185,17 +168,20 @@ w_class = WEIGHT_CLASS_TINY randomsinglesprite = TRUE icon_state = "shard_large" + base_icon_state = "shard_large" sprite_shift = 9 /obj/item/clockwork/alloy_shards/medium w_class = WEIGHT_CLASS_TINY randomsinglesprite = TRUE icon_state = "shard_medium" + base_icon_state = "shard_medium" sprite_shift = 10 /obj/item/clockwork/alloy_shards/medium/gear_bit randomspritemax = 4 - icon_state = "gear_bit" + icon_state = "gear_bit1" + base_icon_state = "gear_bit" sprite_shift = 12 /obj/item/clockwork/alloy_shards/medium/gear_bit/replace_name_desc() @@ -214,6 +200,7 @@ randomsinglesprite = TRUE randomspritemax = 3 icon_state = "shard_small" + base_icon_state = "shard_small" sprite_shift = 12 /obj/item/clockwork/alloy_shards/pinion_lock diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index f6deb5a9b85bc..d70f918e72fb4 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -534,6 +534,8 @@ continue AM.onShuttleMove(T0, T1, rotation, mobile_port.last_caller) + SEND_SIGNAL(T0, COMSIG_TURF_ON_SHUTTLE_MOVE, T1) + if(rotation) T1.shuttleRotate(rotation) diff --git a/code/modules/supply/supply_packs/pack_engineering.dm b/code/modules/supply/supply_packs/pack_engineering.dm index 0c2d2df736e7c..7953192f35eb0 100644 --- a/code/modules/supply/supply_packs/pack_engineering.dm +++ b/code/modules/supply/supply_packs/pack_engineering.dm @@ -168,6 +168,12 @@ cost = 250 containername = "particle accelerator crate" +/datum/supply_packs/engineering/transmission_laser + name = "Power Transmission Laser Circuitboard" + cost = 1500 + contains = list(/obj/item/circuitboard/machine/transmission_laser) + containername = "power transmission laser circuitboard crate" + /datum/supply_packs/engineering/radiation name = "Radiation Protection Crate" cost = 150 diff --git a/code/modules/surgery/bio_chip_removal.dm b/code/modules/surgery/bio_chip_removal.dm index 5b324bbb714ae..c447c3dfe9523 100644 --- a/code/modules/surgery/bio_chip_removal.dm +++ b/code/modules/surgery/bio_chip_removal.dm @@ -82,10 +82,10 @@ var/obj/item/bio_chip_case/case - if(istype(user.get_item_by_slot(SLOT_HUD_LEFT_HAND), /obj/item/bio_chip_case)) - case = user.get_item_by_slot(SLOT_HUD_LEFT_HAND) - else if(istype(user.get_item_by_slot(SLOT_HUD_RIGHT_HAND), /obj/item/bio_chip_case)) - case = user.get_item_by_slot(SLOT_HUD_RIGHT_HAND) + if(istype(user.get_item_by_slot(ITEM_SLOT_LEFT_HAND), /obj/item/bio_chip_case)) + case = user.get_item_by_slot(ITEM_SLOT_LEFT_HAND) + else if(istype(user.get_item_by_slot(ITEM_SLOT_RIGHT_HAND), /obj/item/bio_chip_case)) + case = user.get_item_by_slot(ITEM_SLOT_RIGHT_HAND) else case = locate(/obj/item/bio_chip_case) in get_turf(target) diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 95875da02cf58..ce7b326499166 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -117,7 +117,7 @@ var/obj/item/flash/F = holder F.set_light(7) - var/arm_slot = (parent_organ == "r_arm" ? SLOT_HUD_RIGHT_HAND : SLOT_HUD_LEFT_HAND) + var/arm_slot = (parent_organ == "r_arm" ? ITEM_SLOT_RIGHT_HAND : ITEM_SLOT_LEFT_HAND) var/obj/item/arm_item = owner.get_item_by_slot(arm_slot) if(arm_item) @@ -151,7 +151,7 @@ return // You can emag the arm-mounted implant by activating it while holding emag in it's hand. - var/arm_slot = (parent_organ == "r_arm" ? SLOT_HUD_RIGHT_HAND : SLOT_HUD_LEFT_HAND) + var/arm_slot = (parent_organ == "r_arm" ? ITEM_SLOT_RIGHT_HAND : ITEM_SLOT_LEFT_HAND) if(istype(owner.get_item_by_slot(arm_slot), /obj/item/card/emag) && emag_act(owner)) return diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index 05d7d216960f6..914824891c15c 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -537,8 +537,11 @@ if(istype(user.loc, /obj/machinery/atmospherics)) //Come now, no emaging all the doors on station from a pipe to_chat(user, "Your implant is unable to get a lock on anything in the pipes!") return - - var/beam = user.Beam(target, icon_state = "sm_arc_supercharged", time = 3 SECONDS) + var/beam + if(!isturf(user.loc)) //Using it inside a locker or stealth box is fine! Let us make sure the beam can be seen though. + beam = user.loc.Beam(target, icon_state = "sm_arc_supercharged", time = 3 SECONDS) + else + beam = user.Beam(target, icon_state = "sm_arc_supercharged", time = 3 SECONDS) user.visible_message("[user] makes an unusual buzzing sound as the air between them and [target] crackles.", \ "The air between you and [target] begins to crackle audibly as the Binyat gets to work and heats up in your head!") @@ -757,7 +760,7 @@ /// Blocks teleports and stuns the would-be-teleportee. /obj/item/organ/internal/cyberimp/chest/bluespace_anchor/proc/on_teleport(mob/living/teleportee, atom/destination, channel) - SIGNAL_HANDLER // COMSIG_MOVABLE_TELEPORTED + SIGNAL_HANDLER // COMSIG_MOVABLE_TELEPORTED to_chat(teleportee, "You feel yourself teleporting, but are suddenly flung back to where you just were!") @@ -769,7 +772,7 @@ /// Prevents a user from entering a jaunt. /obj/item/organ/internal/cyberimp/chest/bluespace_anchor/proc/on_jaunt(mob/living/jaunter) - SIGNAL_HANDLER // COMSIG_MOB_PRE_JAUNT + SIGNAL_HANDLER // COMSIG_MOB_PRE_JAUNT to_chat(jaunter, "As you attempt to jaunt, you slam directly into the barrier between realities and are sent crashing back into corporeality!") diff --git a/code/modules/surgery/organs/subtypes/xenos.dm b/code/modules/surgery/organs/subtypes/xenos.dm index 6512d934cedd3..606c15cf96133 100644 --- a/code/modules/surgery/organs/subtypes/xenos.dm +++ b/code/modules/surgery/organs/subtypes/xenos.dm @@ -1,6 +1,6 @@ /obj/item/organ/internal/alien origin_tech = "biotech=5" - icon_state = "xgibmid2" + icon_state = null var/list/alien_powers = list() var/list/human_powers = list() tough = TRUE diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 4ea5674385dae..427bce2257d68 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -337,7 +337,7 @@ surgery.step_in_progress = FALSE return SURGERY_INITIATE_SUCCESS - play_preop_sound(user, target, target_zone, tool, surgery) + INVOKE_ASYNC(src, PROC_REF(play_preop_sound), user, target, target_zone, tool, surgery) if(tool) speed_mod = tool.toolspeed @@ -394,10 +394,10 @@ surgery.step_in_progress = FALSE if(advance) - play_success_sound(user, target, target_zone, tool, surgery) + INVOKE_ASYNC(src, PROC_REF(play_success_sound), user, target, target_zone, tool, surgery) return SURGERY_INITIATE_SUCCESS else - play_failure_sound(user, target, target_zone, tool, surgery) + INVOKE_ASYNC(src, PROC_REF(play_failure_sound), user, target, target_zone, tool, surgery) return SURGERY_INITIATE_FAILURE /** @@ -510,7 +510,7 @@ if(user.gloves) germ_level = user.gloves.germ_level target_organ.germ_level = max(germ_level, target_organ.germ_level) - spread_germs_by_incision(target_organ, tool) //germ spread from environement to patient + INVOKE_ASYNC(src, PROC_REF(spread_germs_by_incision), target_organ, tool) //germ spread from environement to patient /** * Spread germs directly from a tool. diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 5878ead2163ad..9bcba4f51b0ab 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(GPS_list) icon = 'icons/obj/telescience.dmi' icon_state = "gps-c" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "materials=2;magnets=1;bluespace=2" /// Whether the GPS is on. var/tracking = TRUE diff --git a/code/modules/tgui/modules/appearance_changer.dm b/code/modules/tgui/modules/appearance_changer.dm index 5b9730486e150..975b0fd07d828 100644 --- a/code/modules/tgui/modules/appearance_changer.dm +++ b/code/modules/tgui/modules/appearance_changer.dm @@ -142,7 +142,7 @@ update_dna() if("runechat_color") - var/new_runechat_color = tgui_input_color("Please select runechat color.", "Runechat Color", owner.dna.chat_color) + var/new_runechat_color = tgui_input_color(usr, "Please select runechat color.", "Runechat Color", owner.dna.chat_color) if(!isnull(new_runechat_color) && (!..())) owner.change_runechat_color(new_runechat_color) diff --git a/code/modules/tgui/tgui_panel/to_chat.dm b/code/modules/tgui/tgui_panel/to_chat.dm index 7489b1626062c..b2e6f4a737a2a 100644 --- a/code/modules/tgui/tgui_panel/to_chat.dm +++ b/code/modules/tgui/tgui_panel/to_chat.dm @@ -43,12 +43,15 @@ * to_chat(client, "You have found [object]", MESSAGE_TYPE_INFO, * ``` * Always remember to close spans! - * TARGET: Refers to the target of the to_chat message. Valid targets include clients, mobs, and the static world controller - * HTML: The Message to be sent to the TARGET. Converted to a string if not already one in this function - * TYPE: The chat tab that this message will be sent to, a list of all valid types can be found in chat.dm - * TEXT: Unused - * AVOID_HIGHLIGHTING: Unused - * trailing_newline, confidential, and handle_whitespace currently have no effect, please fix this in the future or remove the arguments to lower cache! + * + * Arguments: + * - target: Refers to the target of the to_chat message. Valid targets include clients, mobs, and the static world controller + * - html: The Message to be sent to the TARGET. Converted to a string if not already one in this function + * - type: The chat tab that this message will be sent to, a list of all valid types can be found in chat.dm + * - text: Unused + * - avoid_highlighting: Unused + * + * `trailing_newline`, `confidential`, and `handle_whitespace` currently have no effect, please fix this in the future or remove the arguments to lower cache! */ /proc/to_chat(target, html, type, text, avoid_highlighting, handle_whitespace = TRUE, trailing_newline = TRUE, confidential = FALSE, ticket_id = -1) if(Master.current_runlevel == RUNLEVEL_INIT || !SSchat?.initialized) diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 8f7f9c7d318db..eea46b9e67f50 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -17,6 +17,7 @@ #include "log_format.dm" #include "map_templates.dm" #include "map_tests.dm" +#include "missing_icons.dm" #include "origin_tech.dm" #include "purchase_reference_test.dm" #include "reagent_id_typos.dm" diff --git a/code/modules/unit_tests/missing_icons.dm b/code/modules/unit_tests/missing_icons.dm new file mode 100644 index 0000000000000..17822595c0668 --- /dev/null +++ b/code/modules/unit_tests/missing_icons.dm @@ -0,0 +1,45 @@ +/// Makes sure objects actually have icons that exist! +/datum/unit_test/missing_icons + var/static/list/possible_icon_states = list() + +/datum/unit_test/missing_icons/proc/generate_possible_icon_states_list(directory_path = "icons/obj/") + for(var/file_path in flist(directory_path)) + if(findtext(file_path, ".dmi")) + for(var/sprite_icon in icon_states("[directory_path][file_path]", 1)) //2nd arg = 1 enables 64x64+ icon support, otherwise you'll end up with "sword0_1" instead of "sword" + possible_icon_states[sprite_icon] += list("[directory_path][file_path]") + else + possible_icon_states += generate_possible_icon_states_list("[directory_path][file_path]") + +/datum/unit_test/missing_icons/Run() + generate_possible_icon_states_list() + generate_possible_icon_states_list("icons/effects/") + + //Add EVEN MORE paths if needed here! + //generate_possible_icon_states_list("your/folder/path/") + var/list/bad_list = list() + for(var/obj/obj_path as anything in subtypesof(/obj)) // maybe someday a subtype of this test can cover mobs too (hell maybe atom/movable) + if(initial(obj_path.flags) & ABSTRACT) + continue + + var/icon = initial(obj_path.icon) + if(isnull(icon)) + continue + var/icon_state = initial(obj_path.icon_state) + if(isnull(icon_state)) + continue + + if(length(bad_list) && (icon_state in bad_list[icon])) + continue + + if(icon_exists(icon, icon_state)) + continue + + bad_list[icon] += list(icon_state) + + var/match_message + if(icon_state in possible_icon_states) + for(var/file_place in possible_icon_states[icon_state]) + match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'") + + Fail("Missing icon_state for [obj_path] in '[icon]'.\n\ticon_state = \"[icon_state]\"[match_message]") + diff --git a/code/modules/vehicle/tg_vehicles/scooter.dm b/code/modules/vehicle/tg_vehicles/scooter.dm index 5b9d490601adc..f275c858eeb58 100644 --- a/code/modules/vehicle/tg_vehicles/scooter.dm +++ b/code/modules/vehicle/tg_vehicles/scooter.dm @@ -119,7 +119,7 @@ V.tilt(rider, from_combat = TRUE) return rider.throw_at(throw_target, 3, 2) - var/head_slot = rider.get_item_by_slot(SLOT_HUD_HEAD) + var/head_slot = rider.get_item_by_slot(ITEM_SLOT_HEAD) if(!head_slot || !(istype(head_slot, /obj/item/clothing/head/helmet) || istype(head_slot, /obj/item/clothing/head/hardhat))) rider.adjustBrainLoss(5) rider.updatehealth() @@ -346,7 +346,7 @@ force = 12 throwforce = 4 w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK attack_verb = list("smacks", "whacks", "slams", "smashes") ///The vehicle counterpart for the board var/board_item_type = /obj/tgvehicle/scooter/skateboard diff --git a/code/modules/vehicle/tg_vehicles/tg_vehicles.dm b/code/modules/vehicle/tg_vehicles/tg_vehicles.dm index 5018f41e603be..b0bf2f2f39d18 100644 --- a/code/modules/vehicle/tg_vehicles/tg_vehicles.dm +++ b/code/modules/vehicle/tg_vehicles/tg_vehicles.dm @@ -2,7 +2,7 @@ name = "generic vehicle" desc = "Yell at coding chat." icon = 'icons/obj/tgvehicles.dmi' - icon_state = "error" + icon_state = null max_integrity = 300 armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 0, BOMB = 30, RAD = 0, FIRE = 60, ACID = 60) density = TRUE diff --git a/code/modules/vehicle/vehicle.dm b/code/modules/vehicle/vehicle.dm index 65d4aacd4c0d2..117b5a11148c7 100644 --- a/code/modules/vehicle/vehicle.dm +++ b/code/modules/vehicle/vehicle.dm @@ -3,7 +3,7 @@ name = "vehicle" desc = "A basic vehicle, vroom!" icon = 'icons/obj/vehicles.dmi' - icon_state = "scooter" + icon_state = null density = TRUE anchored = FALSE can_buckle = TRUE diff --git a/code/modules/world_topic/_topic_base.dm b/code/modules/world_topic/_topic_base.dm index 34cb1329842d9..6621a0bf3f4e9 100644 --- a/code/modules/world_topic/_topic_base.dm +++ b/code/modules/world_topic/_topic_base.dm @@ -11,7 +11,7 @@ * This includes sanity checking for if the key is required, as well as other sanity checks * DO NOT OVERRIDE * Arguments: - * * input - The list of topic data, sent from [world/Topic] + * * input - The list of topic data, sent from [/world/proc/Topic] */ /datum/world_topic_handler/proc/invoke(list/input) SHOULD_NOT_OVERRIDE(TRUE) @@ -28,7 +28,7 @@ * Override this to do your work in subtypes of this topic * * Arguments: - * * input - The list of topic data, sent from [world/Topic] + * * input - The list of topic data, sent from [/world/proc/Topic] * * key_valid - Has the user entered the correct auth key */ /datum/world_topic_handler/proc/execute(list/input, key_valid = FALSE) diff --git a/config/example/config.toml b/config/example/config.toml index 22107e4abd9c7..04447ca934015 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 = 602207 +sql_version = 622207 # SQL server address. Can be an IP or DNS name sql_address = "127.0.0.1" # SQL server port @@ -387,6 +387,8 @@ bomb_cap = 20 revival_brain_life = 6000 # 10 minutes # Enable random silicon lawset (If said lawset has default = TRUE in the code). Disable for always crewsimov random_ai_lawset = true +# Enable weather events initialized by SSweather. New weather events can still be added during the round if this is disabled. +enable_default_weather_events = true ################################################################ @@ -666,6 +668,16 @@ enable_space_ruins = false minimum_zlevels = 2 # Maximum number of extra zlevels to generate and fill with ruins maximum_zlevels = 4 +# Minimum space ruin budget. +space_ruin_budget_min = 750 +# Maximum space ruin budget. +space_ruin_budget_max = 1000 +# Minimum lavaland ruin budget. +lavaland_ruin_budget_min = 175 +# Maximum lavaland ruin budget. +lavaland_ruin_budget_max = 325 +# List of all space ruins that can generate in the world +# Commenting something out in here DISABLES IT FROM SPAWNING active_space_ruins = [ "_maps/map_files/RandomRuins/SpaceRuins/way_home.dmm", "_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm", @@ -702,6 +714,8 @@ active_space_ruins = [ "_maps/map_files/RandomRuins/SpaceRuins/casino.dmm", "_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm", "_maps/map_files/RandomRuins/SpaceRuins/abandoned_sec_shuttle.dmm", + "_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm", + "_maps/map_files/RandomRuins/SpaceRuins/unathi_skiff.dmm", ## SS220 Ruins "_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm", "_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm", @@ -899,15 +913,16 @@ non_repeating_maps = true # - "Vote" = regular voting # - "Nodupes" = voting wont include current map # - "Random" = no vote, map is random +# - "FPTP" = A vote that excludes the map from the current round, and last round, then uses a weighted pick on the remaining maps, from preferences. # If you dont enter one correctly, it will whine on startup map_vote_day_types = [ - { day_number = 1, rotation_type = "Vote" }, # Monday - { day_number = 2, rotation_type = "Random" }, # Tuesday - { day_number = 3, rotation_type = "Vote" }, # Wednesday - { day_number = 4, rotation_type = "Random" }, # Thursday - { day_number = 5, rotation_type = "Vote" }, # Friday - { day_number = 6, rotation_type = "Nodupes" }, # Saturday - { day_number = 7, rotation_type = "Nodupes" }, # Sunday + { day_number = 1, rotation_type = "Vote" }, # Monday + { day_number = 2, rotation_type = "Random" }, # Tuesday + { day_number = 3, rotation_type = "FPTP" }, # Wednesday + { day_number = 4, rotation_type = "Random" }, # Thursday + { day_number = 5, rotation_type = "Vote" }, # Friday + { day_number = 6, rotation_type = "FPTP" }, # Saturday + { day_number = 7, rotation_type = "FPTP" }, # Sunday ] diff --git a/docs/mapping/spawn_pools.md b/docs/mapping/spawn_pools.md new file mode 100644 index 0000000000000..b17c1bea4f127 --- /dev/null +++ b/docs/mapping/spawn_pools.md @@ -0,0 +1,195 @@ +# Spawn Pools + +Mappers have many useful random spawners to provide variety to their maps. +However, if these spawners provide high-value loot, or rare loot, it can become +difficult to ensure that these spawners are generally balanced. + +In some cases this doesn't matter so much. Maintenance loot spawners have free +reign to spawn loot of varying value and the only balancing done is to adjust +the weights of these loots, and scale the amount of spawners to reasonably work +for a given map's size and expected population. + +In other situations, like explorer loot in space, a surplus of valuable loot +spawners can quickly give players enormous advantages. This is compounded by the +fact that ruins are generally reviewed for balance in a vacuum, because it would +be too difficult to try and reason through what could spawn on any given round +across all ruins. + +Spawn pools were written as an attempt to solve this problem. Pool spawners are +assigned a point value, and registered to a global pool. Spawn pools track these +spawners, and deduct points from a central budget every time one of them spawns +loot. Once the budget runs out, no more spawners from that pool are activated. + +## Example + +Let's take our explorer loot scenario as before. If we want to register all +explorer loot to a pool, we first need to create the pool as a distinct +`/datum/spawn_pool` subtype: + +```dm +/datum/spawn_pool/space_loot + id = "space_loot_pool" + available_points = 200 +``` + +And then we create the spawners we want, all subtypes of +`/obj/effect/spawner/random/pool`: + +```dm +/obj/effect/spawner/random/pool/space_loot + spawn_pool_id = "space_loot_pool" + +/obj/effect/spawner/random/pool/space_loot/tier1 + point_value = 5 + loot = list( + /obj/item/soap/syndie, + /obj/item/stamp/chameleon, + ) + +/obj/effect/spawner/random/pool/space_loot/tier2 + point_value = 60 + loot = list( + /obj/item/ammo_box/magazine/smgm45, + /obj/item/ammo_box/magazine/apsm10mm/hp, + ) + +/obj/effect/spawner/random/pool/space_loot/tier3 + point_value = 100 + loot = list( + /obj/item/gun/projectile/automatic/pistol/APS = 2, + /obj/item/gun/projectile/automatic/l6_saw = 1, + ) +``` + +Here we have three different tiers of loot. The lowest tier has low-value items +and a low point value of 5. The middle tier has ammo and a point value of 50. +The highest tier has guns and a point value of 100. Note that you can continue +to use weights in these spawners, as well as all the other features of +`/obj/effect/spawner/random`. + +Armed with these three spawners, we can now use them on any ruin we want, in any +quantity. We may put the tier 3 spawner in a difficult, popular ruin, and the +tier 1 spawner in a less popular ruin. Importantly, we can place many of these +spawners, with a guarantee that only a handful will actually receive loot. + +Let's examine through some sample runs. Let's say we have: + +- two tier 1 spawners +- two tier 2 spawners +- two tier 3 spawners + +### Example Scenarios + +Spawners are selected at random, so one run might look like this: + +1. Pool budget is 200. +2. Tier 3 spawner chosen, gun spawns, budget is now 100. +3. Tier 2 spawner chosen, ammo spawns, budget is now 40. +4. Tier 1 spawner chosen, soap spawns, budget is now 35. + +At this point, neither tier 2 or tier 3 spawners can be afforded. If they are +chosen in the random selection, they are discarded, and do not spawn anything. +When the pool reaches the remainin tier 1 spawner, it will proc: + +4. Tier 2 spawner chosen, cost too high, does not spawn. +5. Tier 3 spawner chosen, cost too high, does not spawn. +6. Tier 1 spawner chosen, chameleon stamp spawns, budget is now 30. + +The pool has now exhausted all its spawners and stops. + +Another run may look like this: + +1. Pool budget is 200. +2. Tier 3 spawner chosen, gun spawns, budget is now 100. +3. Tier 3 spawner chosen, gun spawns, budget is now 0. + +The budget has been exhausted and no more spawners are chosen. Obviously this +second scenario is not ideal, as now only high-value loot has spawned. One of +the ways to fix this is to set the tier 3 cost to 110, rather than 100. That +way, the pool can only afford to ever spawn one of them. + +## Nested Spawners + +This is not a great usage of the spawn pool. It still means that high value +ruins will have high value loot, and less often explored ruins are still not +worth visiting. What we want to do is expand the amount of variety and +randomness across all ruins. + +To do this, we can nest our spawners. Create a new subtype: + +```dm +/obj/effect/spawner/random/pool/space_loot/mixed + loot = list( + /obj/effect/spawner/random/pool/space_loot/tier1 = 5, + /obj/effect/spawner/random/pool/space_loot/tier2 = 2, + /obj/effect/spawner/random/pool/space_loot/tier3 = 1, + ) +``` + +This works much better for our purposes. Not only are we decreasing the weight +of tier 3 spawns, but we can place one spawner type everywhere, meaning any of +the spawners has a chance of spawning great or passable loot. + +By nesting spawners, we gain the fine-grained control we want over drop +likelihood: the budget system, much like ruin placement, is concerned only about +how much loot it should attempt to spawn. The nested spawner's weights dictate +what it is we want to spawn more or less often. + +## Unique and Guaranteed Spawners + +Pool spawners also expose two other important features: guaranteed and unique +spawns. + +If we have ruins that have specialized, valuable loot, we always want the pool +to spawn loot there, no matter what. It would be bad to run a difficult, unique +ruin only to be left with nothing or generic loot from the table. + +_Guaranteed spawns_ are a way to fix that. For example, let's say we have a mech +themed ruin and we want the loot to be exosuit parts, but we don't want those +parts spawning anywhere else. We create a distinct subtype: + +```dm +/obj/effect/spawner/random/pool/space_loot/mech_ruin + point_value = 100 + guaranteed = TRUE + loot = list( + /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill, + /obj/item/mecha_parts/mecha_equipment/extinguisher, + /obj/item/mecha_parts/mecha_equipment/medical/sleeper, + ) +``` + +By placing this spawner in our ruin, we can guarantee that loot is spawned there +before any other spawners are checked. But we can also include a point value +with it, so that it still counts as part of the overall budget. + +Let's say we have an item that we want to be part of the generic pool, but we +only want it to spawn once. This is what _unique spawns_ are for. For example, +say we want to spawn a Syndicate Elite MODsuit, but we only want one spawning +anywhere in space. We create a unique subtype: + +```dm +/obj/effect/spawner/random/pool/space_loot/elite_modsuit + point_value = 100 + unique_picks = TRUE + loot = list(/obj/item/mod/control/pre_equipped/traitor_elite) +``` + +If this spawner is chosen, it will spawn the MODsuit, and then the MODsuit will +be removed from the list. Spawners with empty lists are no-ops, so any other +spawners of this type will simply be dropped. By providing rare unique spawns +like this, you can give players motivation to search high and low for elusive +loot, while continuing to ensure the global budget of the spawn pool is +respected. + +## Conclusion + +Spawn pools are useful and flexible, but they are not magic. Balancing their +spawner values against their budget requires careful consideration and testing, +and you will not get them right on the first try. There are various subtle +things you will have to watch out for. For example, if you make high-value loot +too high in cost but low-value loot too low, then if the budget is too high +you'll end up with a tiny amount of high-value loot (good) but a +disproportionately enormous amount of low-value loot (bad). If you have more +budget than spawners to accomodate it, then you'll end up with unused budget +which will skew balance. Be sure to tweak and experiment. diff --git a/icons/_nanomaps/Cyberiad220_nanomap_z1.png b/icons/_nanomaps/BoxStation220_nanomap_z1.png similarity index 100% rename from icons/_nanomaps/Cyberiad220_nanomap_z1.png rename to icons/_nanomaps/BoxStation220_nanomap_z1.png diff --git a/icons/_nanomaps/BoxStation_nanomap_z1.png b/icons/_nanomaps/BoxStation_nanomap_z1.png new file mode 100644 index 0000000000000..81a47a4319e55 Binary files /dev/null and b/icons/_nanomaps/BoxStation_nanomap_z1.png differ diff --git a/icons/_nanomaps/CereStation_nanomap_z1.png b/icons/_nanomaps/CereStation_nanomap_z1.png index dd9a134bd0804..fc351160b11f9 100644 Binary files a/icons/_nanomaps/CereStation_nanomap_z1.png and b/icons/_nanomaps/CereStation_nanomap_z1.png differ diff --git a/icons/_nanomaps/Cyberiad_nanomap_z1.png b/icons/_nanomaps/Cyberiad_nanomap_z1.png deleted file mode 100644 index 72984d0eff042..0000000000000 Binary files a/icons/_nanomaps/Cyberiad_nanomap_z1.png and /dev/null differ diff --git a/icons/_nanomaps/Delta220_nanomap_z1.png b/icons/_nanomaps/DeltaStation220_nanomap_z1.png similarity index 100% rename from icons/_nanomaps/Delta220_nanomap_z1.png rename to icons/_nanomaps/DeltaStation220_nanomap_z1.png diff --git a/icons/_nanomaps/DeltaStation_nanomap_z1.png b/icons/_nanomaps/DeltaStation_nanomap_z1.png new file mode 100644 index 0000000000000..ef90fbc79c063 Binary files /dev/null and b/icons/_nanomaps/DeltaStation_nanomap_z1.png differ diff --git a/icons/_nanomaps/Delta_nanomap_z1.png b/icons/_nanomaps/Delta_nanomap_z1.png deleted file mode 100644 index b7089bf344e05..0000000000000 Binary files a/icons/_nanomaps/Delta_nanomap_z1.png and /dev/null differ diff --git a/icons/_nanomaps/EmeraldStation_nanomap_z1.png b/icons/_nanomaps/EmeraldStation_nanomap_z1.png index 32daf8ef084d0..9479c09770244 100644 Binary files a/icons/_nanomaps/EmeraldStation_nanomap_z1.png and b/icons/_nanomaps/EmeraldStation_nanomap_z1.png differ diff --git a/icons/_nanomaps/MetaStation_nanomap_z1.png b/icons/_nanomaps/MetaStation_nanomap_z1.png index 9ea7cca43598f..c7bf92642bc2b 100644 Binary files a/icons/_nanomaps/MetaStation_nanomap_z1.png and b/icons/_nanomaps/MetaStation_nanomap_z1.png differ diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi index 993e5aa9a249e..22c9c0dae1e09 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 0417843bf6217..3f8518c5e123f 100644 Binary files a/icons/effects/spawner_icons.dmi and b/icons/effects/spawner_icons.dmi differ diff --git a/icons/effects/spellblade.dmi b/icons/effects/spellblade.dmi index 63dd6d6c33327..7e1e860e3e27d 100644 Binary files a/icons/effects/spellblade.dmi and b/icons/effects/spellblade.dmi differ diff --git a/icons/goonstation/effects/pt_beam.dmi b/icons/goonstation/effects/pt_beam.dmi new file mode 100644 index 0000000000000..f4d1023e7f463 Binary files /dev/null and b/icons/goonstation/effects/pt_beam.dmi differ diff --git a/icons/goonstation/objects/pt_laser.dmi b/icons/goonstation/objects/pt_laser.dmi new file mode 100644 index 0000000000000..90aeb6af2cea0 Binary files /dev/null and b/icons/goonstation/objects/pt_laser.dmi differ diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 4b904d20be2fe..2ba2146729628 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi index a48fbca63cab2..15765964a0d27 100644 Binary files a/icons/mob/clothing/eyes.dmi and b/icons/mob/clothing/eyes.dmi differ diff --git a/icons/mob/clothing/modsuit/species/modules_vox.dmi b/icons/mob/clothing/modsuit/species/modules_vox.dmi index 7226f8dcad4fb..eeb4fa6ccacab 100644 Binary files a/icons/mob/clothing/modsuit/species/modules_vox.dmi and b/icons/mob/clothing/modsuit/species/modules_vox.dmi differ diff --git a/icons/mob/clothing/modsuit/species/vox_modsuits.dmi b/icons/mob/clothing/modsuit/species/vox_modsuits.dmi index 0897e30a17e85..d33ea204e8011 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/neck.dmi b/icons/mob/clothing/neck.dmi new file mode 100644 index 0000000000000..0cfe1952e5a38 Binary files /dev/null and b/icons/mob/clothing/neck.dmi differ diff --git a/icons/mob/clothing/species/drask/eyes.dmi b/icons/mob/clothing/species/drask/eyes.dmi index 4488742b6957f..ef6bd08d6721d 100644 Binary files a/icons/mob/clothing/species/drask/eyes.dmi and b/icons/mob/clothing/species/drask/eyes.dmi differ diff --git a/icons/mob/clothing/species/grey/eyes.dmi b/icons/mob/clothing/species/grey/eyes.dmi index 4865bd39cfacd..e0e4773e323ad 100644 Binary files a/icons/mob/clothing/species/grey/eyes.dmi and b/icons/mob/clothing/species/grey/eyes.dmi differ diff --git a/icons/mob/clothing/species/kidan/eyes.dmi b/icons/mob/clothing/species/kidan/eyes.dmi index e89bd57d7e61b..e1f3bf85e8569 100644 Binary files a/icons/mob/clothing/species/kidan/eyes.dmi and b/icons/mob/clothing/species/kidan/eyes.dmi differ diff --git a/icons/mob/clothing/species/plasmaman/helmet.dmi b/icons/mob/clothing/species/plasmaman/helmet.dmi index 53e36a92e35c2..04feebb6aa9b6 100644 Binary files a/icons/mob/clothing/species/plasmaman/helmet.dmi and b/icons/mob/clothing/species/plasmaman/helmet.dmi differ diff --git a/icons/mob/clothing/species/plasmaman/uniform.dmi b/icons/mob/clothing/species/plasmaman/uniform.dmi index 80e63b2de2b20..bf1e7080881c5 100644 Binary files a/icons/mob/clothing/species/plasmaman/uniform.dmi and b/icons/mob/clothing/species/plasmaman/uniform.dmi differ diff --git a/icons/mob/clothing/species/vox/eyes.dmi b/icons/mob/clothing/species/vox/eyes.dmi index 311817e02a7d3..f3dbd860e1a0a 100644 Binary files a/icons/mob/clothing/species/vox/eyes.dmi and b/icons/mob/clothing/species/vox/eyes.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index fcbd77823588b..ea24a3551a279 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/inhands/staves_lefthand.dmi b/icons/mob/inhands/staves_lefthand.dmi index 2ba9683578eb9..ca9da5278d311 100644 Binary files a/icons/mob/inhands/staves_lefthand.dmi and b/icons/mob/inhands/staves_lefthand.dmi differ diff --git a/icons/mob/inhands/staves_righthand.dmi b/icons/mob/inhands/staves_righthand.dmi index 1ae20da38dca6..808be65c2c4d8 100644 Binary files a/icons/mob/inhands/staves_righthand.dmi and b/icons/mob/inhands/staves_righthand.dmi differ diff --git a/icons/mob/inhands/weapons_lefthand.dmi b/icons/mob/inhands/weapons_lefthand.dmi index 56dc70c272686..ff467c8a6cc2f 100644 Binary files a/icons/mob/inhands/weapons_lefthand.dmi and b/icons/mob/inhands/weapons_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons_righthand.dmi b/icons/mob/inhands/weapons_righthand.dmi index 36e5ec1c4e71f..4cdfa9234e77e 100644 Binary files a/icons/mob/inhands/weapons_righthand.dmi and b/icons/mob/inhands/weapons_righthand.dmi differ diff --git a/icons/mob/lavaland/64x64megafauna.dmi b/icons/mob/lavaland/64x64megafauna.dmi index 49320479b97b4..c0585271636a2 100644 Binary files a/icons/mob/lavaland/64x64megafauna.dmi and b/icons/mob/lavaland/64x64megafauna.dmi differ diff --git a/icons/mob/lavaland/96x96megafauna.dmi b/icons/mob/lavaland/96x96megafauna.dmi index 01413087b27a4..e87cbff266960 100644 Binary files a/icons/mob/lavaland/96x96megafauna.dmi and b/icons/mob/lavaland/96x96megafauna.dmi differ diff --git a/icons/mob/lavaland/blood_drunk.dmi b/icons/mob/lavaland/blood_drunk.dmi index 912c460ee2641..d5b142a429c64 100644 Binary files a/icons/mob/lavaland/blood_drunk.dmi and b/icons/mob/lavaland/blood_drunk.dmi differ diff --git a/icons/mob/lavaland/hierophant_new.dmi b/icons/mob/lavaland/hierophant_new.dmi index 97226b4778f24..319fb63f00bfa 100644 Binary files a/icons/mob/lavaland/hierophant_new.dmi and b/icons/mob/lavaland/hierophant_new.dmi differ diff --git a/icons/mob/lavaland/lavaland_elites.dmi b/icons/mob/lavaland/lavaland_elites.dmi index 2d12d55ca8828..f4b79e3957861 100644 Binary files a/icons/mob/lavaland/lavaland_elites.dmi and b/icons/mob/lavaland/lavaland_elites.dmi differ diff --git a/icons/mob/lavaland/legion.dmi b/icons/mob/lavaland/legion.dmi index 1840b13b3ecae..19aec858b015d 100644 Binary files a/icons/mob/lavaland/legion.dmi and b/icons/mob/lavaland/legion.dmi differ diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi index 0600a2ddcbcf4..cd7ad64edee89 100644 Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi index ec625f420ab9e..140ceb8e5d090 100644 Binary files a/icons/mob/screen_gen.dmi and b/icons/mob/screen_gen.dmi differ diff --git a/icons/mob/screen_midnight.dmi b/icons/mob/screen_midnight.dmi index ad82f12808020..b20dd3e0d7583 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 e0ace87e5d1a3..0d96bfe44f4c9 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 da228456ee45e..6283445e072d7 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 3fa0025ab7bc6..a031cf4db0132 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 2e261c40cf3e5..ce1a5b7db8e90 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 8b444e12e2a81..b0cb9551d7a2d 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 c2b23216c5057..311d82013cb86 100644 Binary files a/icons/mob/simple_human.dmi and b/icons/mob/simple_human.dmi differ diff --git a/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi b/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi deleted file mode 100644 index f0f77b65df37c..0000000000000 Binary files a/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi and /dev/null differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index d28eb469cbfd7..6b10d61b77e90 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/assemblies.dmi b/icons/obj/assemblies.dmi index 123b386ea178a..ce9df87f45d29 100644 Binary files a/icons/obj/assemblies.dmi and b/icons/obj/assemblies.dmi differ diff --git a/icons/obj/cardboard_cutout.dmi b/icons/obj/cardboard_cutout.dmi index 5ec47ecb5d331..023ef9049e238 100644 Binary files a/icons/obj/cardboard_cutout.dmi and b/icons/obj/cardboard_cutout.dmi differ diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index 29291e062e6b8..82ad7c7f7e11e 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 0b86bb536d15d..b4775ad0f4d0f 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 82104fdc49a3c..926c2d713586b 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi new file mode 100644 index 0000000000000..c06d4875bcfd0 Binary files /dev/null and b/icons/obj/clothing/neck.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi index 6139a79bc2f5a..f216a84f05a67 100644 Binary files a/icons/obj/clothing/species/plasmaman/hats.dmi and b/icons/obj/clothing/species/plasmaman/hats.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/uniform.dmi b/icons/obj/clothing/species/plasmaman/uniform.dmi index 2f274f7541ce7..3486bd07b43db 100644 Binary files a/icons/obj/clothing/species/plasmaman/uniform.dmi and b/icons/obj/clothing/species/plasmaman/uniform.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index c6c9e1caa2990..f58f9db6ff6b7 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/ties_overlay.dmi b/icons/obj/clothing/ties_overlay.dmi index 1ac2a5373607f..fe3433bdbb069 100644 Binary files a/icons/obj/clothing/ties_overlay.dmi and b/icons/obj/clothing/ties_overlay.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index c3e9295fda977..a350b78ba85dd 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/food/candy.dmi b/icons/obj/food/candy.dmi index dd7acd3200bcf..53cc0b59f4c2b 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 4ddb808bcd3f0..e70a01a9df845 100644 Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index 377427ee5ba0b..5eebe0312c5ad 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ diff --git a/icons/obj/guns/magic.dmi b/icons/obj/guns/magic.dmi index 586b87ccec638..9337eab2f7c17 100644 Binary files a/icons/obj/guns/magic.dmi and b/icons/obj/guns/magic.dmi differ diff --git a/icons/obj/lamps.dmi b/icons/obj/lamps.dmi index 29d8e21bc401d..18efdbc7b6ac1 100644 Binary files a/icons/obj/lamps.dmi and b/icons/obj/lamps.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index 6d887c8114d53..d24011b606821 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ diff --git a/icons/obj/machines/particle_accelerator.dmi b/icons/obj/machines/particle_accelerator.dmi index 964886038b283..7f1bb9d653d5a 100644 Binary files a/icons/obj/machines/particle_accelerator.dmi and b/icons/obj/machines/particle_accelerator.dmi differ diff --git a/icons/obj/machines/suit_storage.dmi b/icons/obj/machines/suit_storage.dmi index ecea6a596076a..e3a68d28e9963 100644 Binary files a/icons/obj/machines/suit_storage.dmi and b/icons/obj/machines/suit_storage.dmi differ diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index 2b783a75ad62e..1cb729cd2343e 100644 Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ diff --git a/icons/obj/smooth_structures/catwalk_clockwork.dmi b/icons/obj/smooth_structures/catwalk_clockwork.dmi deleted file mode 100644 index 2c2a0da498742..0000000000000 Binary files a/icons/obj/smooth_structures/catwalk_clockwork.dmi and /dev/null differ diff --git a/icons/obj/smooth_structures/lattice_clockwork.dmi b/icons/obj/smooth_structures/lattice_clockwork.dmi deleted file mode 100644 index 4bdd3adaadac4..0000000000000 Binary files a/icons/obj/smooth_structures/lattice_clockwork.dmi and /dev/null differ diff --git a/icons/obj/statue.dmi b/icons/obj/statue.dmi index de14c4fb77678..332dd226e8610 100644 Binary files a/icons/obj/statue.dmi and b/icons/obj/statue.dmi differ diff --git a/icons/obj/wizard.dmi b/icons/obj/wizard.dmi index 14127725d254c..a4e21fa49fccf 100644 Binary files a/icons/obj/wizard.dmi and b/icons/obj/wizard.dmi differ diff --git a/icons/turf/overlays.dmi b/icons/turf/overlays.dmi index 95951deb72615..4b9aa80e14eb2 100644 Binary files a/icons/turf/overlays.dmi and b/icons/turf/overlays.dmi differ diff --git a/icons/ui_icons/inventory/neck.png b/icons/ui_icons/inventory/neck.png new file mode 100644 index 0000000000000..9fa2ba237936a Binary files /dev/null and b/icons/ui_icons/inventory/neck.png differ diff --git a/mkdocs.yml b/mkdocs.yml index 73aa8d48235fb..4f166851582c5 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -87,6 +87,7 @@ nav: - 'Mapping Requirements': './mapping/requirements.md' - 'Design Guidelines': './mapping/design.md' - 'Guide to Submaps': './mapping/submaps.md' + - 'Spawn Pools': './mapping/spawn_pools.md' - 'References': - 'Glossary': './references/glossary.md' diff --git a/modular_ss220/aesthetics/better_ids/code/better_ids.dm b/modular_ss220/aesthetics/better_ids/code/better_ids.dm index bf5baa161c741..c6b126df4d92b 100644 --- a/modular_ss220/aesthetics/better_ids/code/better_ids.dm +++ b/modular_ss220/aesthetics/better_ids/code/better_ids.dm @@ -24,7 +24,7 @@ GLOBAL_LIST_INIT(card_skins_donor_ss220, list( )) /obj/item/card - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' /obj/item/nanomob_card - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' diff --git a/modular_ss220/aesthetics/better_ids/icons/better_ids.dmi b/modular_ss220/aesthetics/better_ids/icons/better_ids.dmi deleted file mode 100644 index 09e2c4a107f41..0000000000000 Binary files a/modular_ss220/aesthetics/better_ids/icons/better_ids.dmi and /dev/null differ diff --git a/modular_ss220/aesthetics/better_ids/icons/card.dmi b/modular_ss220/aesthetics/better_ids/icons/card.dmi new file mode 100644 index 0000000000000..a6270c06d5850 Binary files /dev/null and b/modular_ss220/aesthetics/better_ids/icons/card.dmi differ diff --git a/modular_ss220/aesthetics/cameras/code/cameras.dm b/modular_ss220/aesthetics/cameras/code/cameras.dm index 061af80422901..d7a04bd4b19be 100644 --- a/modular_ss220/aesthetics/cameras/code/cameras.dm +++ b/modular_ss220/aesthetics/cameras/code/cameras.dm @@ -1,2 +1,8 @@ /obj/machinery/camera icon = 'modular_ss220/aesthetics/cameras/icons/cameras.dmi' + +/obj/machinery/camera/tracking_head + icon = 'icons/obj/monitors.dmi' + +/obj/item/camera_assembly + icon = 'modular_ss220/aesthetics/cameras/icons/cameras.dmi' diff --git a/modular_ss220/aesthetics/decals/code/decals.dm b/modular_ss220/aesthetics/decals/code/decals.dm index 9cabb9fcfa413..b2e8249cd569a 100644 --- a/modular_ss220/aesthetics/decals/code/decals.dm +++ b/modular_ss220/aesthetics/decals/code/decals.dm @@ -1,8 +1,8 @@ -/datum/component/decal/generate_appearance(_icon, _icon_state, _dir, _layer, _color, _alpha) +/datum/element/decal/generate_appearance(_icon, _icon_state, _dir, _layer, _color, _alpha, source) . = ..() if(!.) return - var/atom/master = parent + var/atom/master = source if(master::color && _color) pic.appearance_flags |= RESET_COLOR diff --git a/modular_ss220/aesthetics/decals/icons/siding.dmi b/modular_ss220/aesthetics/decals/icons/siding.dmi index eccc13c6a9f72..127b3431102de 100644 Binary files a/modular_ss220/aesthetics/decals/icons/siding.dmi and b/modular_ss220/aesthetics/decals/icons/siding.dmi differ diff --git a/modular_ss220/aesthetics/floors/icons/tiles.dmi b/modular_ss220/aesthetics/floors/icons/tiles.dmi index 019ca3ba4fb88..25adb345181bd 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 84b7c65eaa62e..3d59504901e4e 100644 --- a/modular_ss220/aesthetics/lights/code/lights.dm +++ b/modular_ss220/aesthetics/lights/code/lights.dm @@ -11,9 +11,18 @@ /obj/machinery/light/small icon = 'icons/obj/lighting.dmi' layer = ABOVE_MOB_LAYER + brightness_color = "#FFF780" /obj/machinery/light/floor icon = 'icons/obj/lighting.dmi' + brightness_color = "#FFF780" + +/obj/machinery/light/clockwork + icon = 'icons/obj/lighting.dmi' + layer = ABOVE_MOB_LAYER + +/obj/machinery/light/clockwork/small + layer = ABOVE_MOB_LAYER /obj/machinery/light_construct icon = 'modular_ss220/aesthetics/lights/icons/lights.dmi' @@ -26,6 +35,9 @@ /obj/machinery/light_construct/floor icon = 'icons/obj/lighting.dmi' +/obj/machinery/light_construct/clockwork + icon = 'icons/obj/lighting.dmi' + /obj/item/mounted/frame/light_fixture icon = 'modular_ss220/aesthetics/lights/icons/lights.dmi' @@ -35,5 +47,8 @@ /obj/item/mounted/frame/light_fixture/floor icon = 'icons/obj/lighting.dmi' +/obj/item/mounted/frame/light_fixture/clockwork + icon = 'icons/obj/lighting.dmi' + /obj/item/flashlight/lamp on = FALSE diff --git a/modular_ss220/aesthetics/lights/icons/lamps.dmi b/modular_ss220/aesthetics/lights/icons/lamps.dmi index 4fe2260f5b7ca..0dfd181eeaa44 100644 Binary files a/modular_ss220/aesthetics/lights/icons/lamps.dmi and b/modular_ss220/aesthetics/lights/icons/lamps.dmi differ diff --git a/modular_ss220/aesthetics/sheets/code/sheets.dm b/modular_ss220/aesthetics/sheets/code/sheets.dm index 5b66a6a2e2c34..b3e21e7d5a08b 100644 --- a/modular_ss220/aesthetics/sheets/code/sheets.dm +++ b/modular_ss220/aesthetics/sheets/code/sheets.dm @@ -82,9 +82,6 @@ /obj/item/bedsheet/wiz/double icon_state = "double_sheetwiz" -/obj/item/bedsheet/rev/double - icon_state = "double_sheetrev" - /obj/item/bedsheet/nanotrasen/double icon_state = "double_sheetNT" 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 effcd2d15b6e5..0f391743f3bf9 100644 --- a/modular_ss220/agent_id_tgui/code/agent_id_tgui.dm +++ b/modular_ss220/agent_id_tgui/code/agent_id_tgui.dm @@ -1,255 +1,15 @@ /obj/item/card/id/syndicate - dna_hash = null - blood_type = null - fingerprint_hash = null - var/mob/living/carbon/human/registered_human 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, - "Supply" = GLOB.supply_positions, - "Engineering" = GLOB.engineering_positions, - "Medical" = GLOB.medical_positions, - "Science" = GLOB.science_positions, - "Security" = GLOB.security_positions, - "Command" = GLOB.command_positions, - "Special" = (get_all_solgov_jobs() + get_all_soviet_jobs() + get_all_centcom_jobs()), - "Custom" = null, - ) - -/obj/item/card/id/syndicate/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) - if(..() || !registered_human) - return - . = TRUE - - switch(action) - if("change_name") - var/new_name - if(params["option"] == "Primary") - new_name = ishuman(registered_human) ? registered_human.real_name : registered_human.name - - else if(params["option"] == "Secondary") - new_name = tgui_input_list(registered_human, "Чьё имя вы хотите взять?", "Карта Агента - Имя", GLOB.human_list) - if(isnull(new_name)) - return - - else - new_name = params["name"] - - registered_name = reject_bad_name(new_name, TRUE) - UpdateName() - to_chat(registered_human, span_notice("Имя изменено на: [new_name].")) - - if("change_sex") - var/new_sex = params["sex"] - sex = new_sex - to_chat(registered_human, span_notice("Пол изменён на: [sex].")) - - if("change_age") - var/new_age = params["age"] - age = clamp(new_age, 17, 300) - to_chat(registered_human, span_notice("Возраст изменён на: [new_age].")) - - if("change_occupation") - change_occupation() - - if("change_fingerprints") - if(params["option"] == "Primary") - fingerprint_hash = md5(registered_human.dna.uni_identity) - else - var/fingerprints_param = params["new_fingerprints"] - if(fingerprints_param) - fingerprint_hash = fingerprints_param - - to_chat(registered_human, span_notice("Отпечатки изменёны на: [fingerprint_hash].")) - - if("change_blood_type") - if(params["option"] == "Primary") - blood_type = registered_human.dna.blood_type - else - var/blood_param = params["new_type"] - if(blood_param) - blood_type = blood_param - - to_chat(registered_human, span_notice("Тип крови изменён на: [blood_type].")) - - if("change_dna_hash") - if(params["option"] == "Primary") - dna_hash = registered_human.dna.unique_enzymes - else - var/dna_param = params["new_dna"] - if(dna_param) - dna_hash = dna_param - - to_chat(registered_human, span_notice("ДНК изменён на: [dna_hash].")) - - if("change_money_account") - var/new_account - if(params["option"] == "Primary") - new_account = rand(1000, 9999) * 1000 + rand(1000, 9999) - else - new_account = params["new_account"] - if(!isnum(new_account)) - to_chat(registered_human, span_warning("Номер аккаунта должен состоять только из цифр!")) - return - - associated_account_number = clamp(new_account, 1000000, 9999999) - to_chat(registered_human, span_notice("Привязанный счёт изменён на: [new_account].")) - - if("change_photo") - change_photo() - if("change_appearance") - change_appearance(params) - if("delete_info") - delete_info() - if("clear_access") - clear_access() - if("change_ai_tracking") - change_ai_tracking() - RebuildHTML() /obj/item/card/id/syndicate/ui_data(mob/user) - var/list/data = list() - data["registered_name"] = registered_name - data["sex"] = sex - data["age"] = age - data["assignment"] = assignment - data["associated_account_number"] = associated_account_number - data["blood_type"] = blood_type - data["dna_hash"] = dna_hash - data["fingerprint_hash"] = fingerprint_hash - data["photo"] = photo - data["ai_tracking"] = untrackable + var/list/data = ..() + var/default = 'icons/mob/hud/job_assets.dmi' + var/custom = 'modular_ss220/jobs/icons/job_assets.dmi' + data["job_assets"] = !hud_icon || icon_exists(default, hud_icon) ? default : custom return data /obj/item/card/id/syndicate/ui_static_data(mob/user) - var/list/data = list() - data["icon"] = icon + var/list/data = ..() data["appearances"] = appearances return data - -/obj/item/card/id/syndicate/ui_state(mob/user) - return GLOB.default_state - -/obj/item/card/id/syndicate/ui_interact(mob/user, datum/tgui/ui) - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "AgentCard", name) - ui.open() - -/obj/item/card/id/syndicate/proc/check_registered_human(mob/user) - if(!ishuman(user)) - return FALSE - if(!registered_human) - registered_human = user - if(registered_human != user) - return FALSE - return TRUE - -/obj/item/card/id/syndicate/attack_self(mob/user) - flash_card(user) - return - -/obj/item/card/id/syndicate/CtrlClick(mob/user) - if(!check_registered_human(user)) - return - ui_interact(user) - -/obj/item/card/id/syndicate/examine(mob/user) - . = ..() - if(check_registered_human(user)) - . += span_info("Ctrl-Click для открытия интерфейса.") - -/obj/item/card/id/proc/flash_card(mob/user) - user.visible_message( - span_notice("[user] показывает тебе: [bicon(src)] [src.name]. Должность на карте: [src.assignment]."), - span_notice("Ты показываешь свою ID карту: [bicon(src)] [src.name]. Должность на карте: [src.assignment].")) - if(mining_points) - to_chat(user, "На ней [mining_points] шахтёрских очков. Всего было получено за смену [total_mining_points] шахтёрских очков!") - src.add_fingerprint(user) - -/obj/item/card/id/syndicate/proc/delete_info() - name = null - registered_name = null - icon_state = null - sex = null - age = null - assignment = null - associated_account_number = null - blood_type = null - dna_hash = null - fingerprint_hash = null - photo = null - registered_user = null - SStgui.close_uis(src) - to_chat(registered_human, span_notice("Вся информация с карты агента была удалена.")) - -/obj/item/card/id/syndicate/proc/clear_access() - access = initial_access.Copy() - to_chat(registered_human, span_notice("Выполнен сброс доступов.")) - -/obj/item/card/id/syndicate/proc/change_ai_tracking() - untrackable = !untrackable - to_chat(registered_human, span_notice("Эта ID карта[untrackable ? " не" : ""] может быть отслежена ИИ.")) - -/obj/item/card/id/syndicate/proc/change_photo() - if(!Adjacent(registered_human)) - return - - var/job_clothes = null - if(assignment) - job_clothes = assignment - - var/icon/newphoto = get_id_photo(registered_human, job_clothes) - if(!newphoto) - return - - photo = newphoto - to_chat(registered_human, span_notice("Фото изменено. Если хотите другую одежду, то выберите другую должность и измените снова.")) - -/obj/item/card/id/syndicate/proc/change_appearance(list/params) - var/choice = params["new_appearance"] - if(!(choice in appearances)) - message_admins("Warning: AgentID href exploit attempted by [key_name(usr)]! Impossible icon_state: [choice].") - return - - icon_state = choice - to_chat(usr, span_notice("Внешний вид изменён на: [choice].")) - -/obj/item/card/id/syndicate/proc/change_occupation() - var/title = "Карта Агента - Должность" - var/department_icon_text = "Какая должность будет показываться с этой картой на ХУДах?" - var/department_selection_text = "Какую должность вы хотите присвоить этой карте? Выберите департамент, или можете вписать собственную должность." - var/selected_department = tgui_input_list(registered_human, department_selection_text, title, departments) - if(isnull(selected_department)) - return - - var/new_rank - var/new_job - if(selected_department == "Assistant") - new_job = selected_department - new_rank = selected_department - - else if(selected_department == "Custom") - new_job = sanitize(tgui_input_text(registered_human, "Введите название своей должности:", title, "Assistant", MAX_MESSAGE_LEN)) - var/department_icon = tgui_input_list(registered_human, department_icon_text, title, departments - list("Assistant", "Custom")) - if(isnull(department_icon)) - to_chat(registered_human, span_warning("Вы должны выбрать департамент!")) - return - new_rank = tgui_input_list(registered_human, department_icon_text, title, departments[department_icon]) - - else - new_job = tgui_input_list(registered_human, "Какую должность вы хотите?", title, departments[selected_department]) - if(isnull(new_job)) - new_job = "Assistant" - new_rank = new_job - - if(!Adjacent(registered_human)) - return - - assignment = new_job - rank = new_rank - UpdateName() - registered_human.sec_hud_set_ID() - to_chat(registered_human, span_notice("Должность сменена на [new_job].")) diff --git a/modular_ss220/antagonists/code/vox_raider/clothing/vox_suit_armor.dm b/modular_ss220/antagonists/code/vox_raider/clothing/vox_suit_armor.dm index 1d19d795bd491..fd8e612a16c81 100644 --- a/modular_ss220/antagonists/code/vox_raider/clothing/vox_suit_armor.dm +++ b/modular_ss220/antagonists/code/vox_raider/clothing/vox_suit_armor.dm @@ -173,7 +173,7 @@ /obj/item/clothing/suit/armor/vox_merc/stealth/equipped(mob/living/user, slot) ..() - if(isvox(user) && slot == SLOT_HUD_OUTER_SUIT) + if(isvox(user) && slot == ITEM_SLOT_OUTER_SUIT) disguise_spell = new(null) user.AddSpell(disguise_spell) @@ -207,7 +207,7 @@ /obj/item/clothing/head/helmet/vox_merc/stealth/equipped(mob/living/user, slot) ..() - if(isvox(user) && slot == SLOT_HUD_HEAD) + if(isvox(user) && slot == ITEM_SLOT_HEAD) smoke_spell = new(null) user.AddSpell(smoke_spell) diff --git a/modular_ss220/antagonists/code/vox_raider/objects/vox_objects.dm b/modular_ss220/antagonists/code/vox_raider/objects/vox_objects.dm index 2e39ace29cba4..29cde724718cb 100644 --- a/modular_ss220/antagonists/code/vox_raider/objects/vox_objects.dm +++ b/modular_ss220/antagonists/code/vox_raider/objects/vox_objects.dm @@ -6,7 +6,7 @@ /obj/item/clothing/glasses/meson/cyber/vox/equipped(mob/user, slot, initial) . = ..() - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) flags = NODROP else flags = initial(flags) @@ -19,7 +19,7 @@ /obj/item/clothing/glasses/thermal/cyber/vox/equipped(mob/user, slot, initial) . = ..() - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) flags = NODROP else flags = initial(flags) diff --git a/modular_ss220/antagonists/code/vox_raider/objects/vox_shop.dm b/modular_ss220/antagonists/code/vox_raider/objects/vox_shop.dm index fa338bc08ef97..6cb3f6df72ae2 100644 --- a/modular_ss220/antagonists/code/vox_raider/objects/vox_shop.dm +++ b/modular_ss220/antagonists/code/vox_raider/objects/vox_shop.dm @@ -121,7 +121,7 @@ if(isitem(obj)) if(!user.put_in_any_hand_if_possible(obj) && ishuman(user)) var/mob/living/carbon/human/H = user - H.equip_or_collect(obj, SLOT_HUD_IN_BACKPACK) + H.equip_or_collect(obj, ITEM_SLOT_IN_BACKPACK) else obj.forceMove(get_turf(src)) 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 eba5a040bbbe3..488bf1e146246 100644 --- a/modular_ss220/antagonists/code/vox_raider/vox_raider_team.dm +++ b/modular_ss220/antagonists/code/vox_raider/vox_raider_team.dm @@ -57,7 +57,7 @@ continue var/teamwin = 1 to_send += "
Стая [name]" - for(var/datum/objective/objective in objective_holder.objectives) + for(var/datum/objective/objective in objective_holder.get_objectives()) if(!objective.check_completion()) teamwin = 0 if(teamwin) diff --git a/modular_ss220/clothing/code/helmet.dm b/modular_ss220/clothing/code/helmet.dm index dafe0ce18f823..9fc5388a9aa3c 100644 --- a/modular_ss220/clothing/code/helmet.dm +++ b/modular_ss220/clothing/code/helmet.dm @@ -68,6 +68,22 @@ "Nucleation" = 'modular_ss220/clothing/icons/mob/helmet.dmi', ) +/obj/item/clothing/head/helmet/ert/security + icon_state = "ember_sec" + item_state = "ember_sec" + +/obj/item/clothing/head/helmet/ert/engineer + icon_state = "ember_eng" + item_state = "ember_eng" + +/obj/item/clothing/head/helmet/ert/medical + icon_state = "ember_med" + item_state = "ember_med" + +/obj/item/clothing/head/helmet/ert/janitor + icon_state = "ember_jan" + item_state = "ember_jan" + /obj/item/clothing/head/helmet/ert/command icon_state = "ember_com" item_state = "ember_com" @@ -83,12 +99,12 @@ toggle_nvg(user) /obj/item/clothing/head/helmet/ert/command/item_action_slot_check(slot) - if(slot == SLOT_HUD_HEAD) + if(slot == ITEM_SLOT_HEAD) return TRUE /obj/item/clothing/head/helmet/ert/command/equipped(mob/user, slot, initial) . = ..() - if(nvg_enabled && slot == SLOT_HUD_HEAD) + if(nvg_enabled && slot == ITEM_SLOT_HEAD) ADD_TRAIT(user, TRAIT_NIGHT_VISION, "ert_commander_helmet[UID()]") /obj/item/clothing/head/helmet/ert/command/dropped(mob/user) @@ -125,10 +141,6 @@ user.update_inv_head() to_chat(user, span_notice("[msg]")) -/obj/item/clothing/head/helmet/ert/security - icon_state = "ember_sec" - item_state = "ember_sec" - /obj/item/clothing/head/helmet/ert/security/paranormal icon_state = "knight_templar" item_state = "knight_templar" @@ -167,11 +179,3 @@ "Nucleation" = 'modular_ss220/clothing/icons/mob/helmet.dmi', ) armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 10, RAD = 50, FIRE = 200, ACID = 115) - -/obj/item/clothing/head/helmet/ert/medical - icon_state = "ember_med" - item_state = "ember_med" - -/obj/item/clothing/head/helmet/ert/janitor - icon_state = "ember_jan" - item_state = "ember_jan" diff --git a/modular_ss220/clothing/code/hev_suit.dm b/modular_ss220/clothing/code/hev_suit.dm index 690a07abd8331..31d5e9e94d610 100644 --- a/modular_ss220/clothing/code/hev_suit.dm +++ b/modular_ss220/clothing/code/hev_suit.dm @@ -84,7 +84,7 @@ //Signal handling. /obj/item/clothing/suit/space/hev/equipped(mob/M, slot) ..() - if(slot == SLOT_HUD_OUTER_SUIT && iscarbon(M)) + if(slot == ITEM_SLOT_OUTER_SUIT && iscarbon(M)) for(var/voice in funny_signals) RegisterSignal(M, voice, funny_signals[voice]) owner = M @@ -159,7 +159,7 @@ /obj/item/clothing/head/helmet/hev_helmet/equipped(mob/living/carbon/human/user, slot) ..() - if(slot != SLOT_HUD_HEAD) + if(slot != ITEM_SLOT_HEAD) return for(var/new_hud in hud_types) var/datum/atom_hud/H = GLOB.huds[new_hud] diff --git a/modular_ss220/clothing/code/mask.dm b/modular_ss220/clothing/code/mask.dm index 2b5895df38409..07e4c663643ec 100644 --- a/modular_ss220/clothing/code/mask.dm +++ b/modular_ss220/clothing/code/mask.dm @@ -8,7 +8,7 @@ /obj/item/clothing/mask/equipped(mob/M, slot) . = ..() - if((slot & SLOT_HUD_WEAR_MASK) && modifies_speech) + if((slot & ITEM_SLOT_MASK) && modifies_speech) RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) else UnregisterSignal(M, COMSIG_MOB_SAY) diff --git a/modular_ss220/clothing/code/mod.dm b/modular_ss220/clothing/code/mod.dm index ffc794a75a70f..b0cbf5f3daa15 100644 --- a/modular_ss220/clothing/code/mod.dm +++ b/modular_ss220/clothing/code/mod.dm @@ -173,7 +173,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( @@ -249,7 +249,7 @@ SEALED_CLOTHING = THICKMATERIAL | STOPSPRESSUREDMAGE | BLOCK_GAS_SMOKE_EFFECT | BLOCKHAIR, UNSEALED_INVISIBILITY = HIDEFACE, - SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEFACE, + SEALED_INVISIBILITY = HIDEMASK | HIDEEYES | HIDEEARS | HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH | HEADCOVERSEYES, ), CHESTPLATE_FLAGS = list( diff --git a/modular_ss220/clothing/code/shoes.dm b/modular_ss220/clothing/code/shoes.dm index 4e24b850ffe37..6e6045d1d5fd4 100644 --- a/modular_ss220/clothing/code/shoes.dm +++ b/modular_ss220/clothing/code/shoes.dm @@ -36,7 +36,7 @@ /obj/item/clothing/shoes/black/neon/equipped(mob/user, slot) . = ..() - if(!neon_overlay && glow_active && slot == SLOT_HUD_SHOES) + if(!neon_overlay && glow_active && slot == ITEM_SLOT_SHOES) apply_neon_overlay(user) /obj/item/clothing/shoes/black/neon/dropped(mob/user) @@ -73,7 +73,7 @@ return remove_neon_overlay(user) - if(user.get_item_by_slot(SLOT_HUD_SHOES)) + if(user.get_item_by_slot(ITEM_SLOT_SHOES)) apply_neon_overlay(user) /// Toggles neon overlay and light emit @@ -81,7 +81,7 @@ if(!user) return // Toggle neon overlay - if(!glow_active && user.get_item_by_slot(SLOT_HUD_SHOES)) + if(!glow_active && user.get_item_by_slot(ITEM_SLOT_SHOES)) apply_neon_overlay(user) else if(neon_overlay) remove_neon_overlay(user) diff --git a/modular_ss220/clothing/code/suits.dm b/modular_ss220/clothing/code/suits.dm index f1b7a3a7960ff..bc5d8211f4843 100644 --- a/modular_ss220/clothing/code/suits.dm +++ b/modular_ss220/clothing/code/suits.dm @@ -7,7 +7,6 @@ icon_override = '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' - flags_inv = HIDEJUMPSUIT /obj/item/clothing/suit/takemura_jacket name = "куртка Такэмуры" @@ -17,7 +16,6 @@ icon_override = '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' - flags_inv = HIDEJUMPSUIT /obj/item/clothing/suit/katarina_jacket name = "куртка Катарины" @@ -27,7 +25,6 @@ icon_override = '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' - flags_inv = HIDEJUMPSUIT /obj/item/clothing/suit/katarina_cyberjacket name = "киберкуртка Катарины" @@ -37,7 +34,6 @@ icon_override = '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' - flags_inv = HIDEJUMPSUIT /obj/item/clothing/suit/hooded/shark_costume name = "костюм акулы" @@ -82,7 +78,6 @@ icon_override = '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' - flags_inv = HIDEJUMPSUIT hoodtype = /obj/item/clothing/head/hooded/vi_arcane /obj/item/clothing/head/hooded/vi_arcane @@ -317,11 +312,24 @@ icon_state = "ember_com" item_state = "ember_com" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS + /obj/item/clothing/suit/armor/vest/ert/security icon_state = "ember_sec" item_state = "ember_sec" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS +/obj/item/clothing/suit/armor/vest/ert/medical + icon_state = "ember_med" + item_state = "ember_med" + +// Actualy not used - ERT engineer uses /obj/item/clothing/suit/space/ert_engineer instead +/obj/item/clothing/suit/armor/vest/ert/engineer + icon = 'icons/obj/clothing/suits.dmi' + +/obj/item/clothing/suit/armor/vest/ert/janitor + icon_state = "ember_jan" + item_state = "ember_jan" + /obj/item/clothing/suit/armor/vest/ert/security/paranormal icon_state = "knight_templar" item_state = "knight_templar" @@ -360,14 +368,6 @@ "Nucleation" = 'modular_ss220/clothing/icons/mob/suits.dmi', ) -/obj/item/clothing/suit/armor/vest/ert/medical - icon_state = "ember_med" - item_state = "ember_med" - -/obj/item/clothing/suit/armor/vest/ert/janitor - icon_state = "ember_jan" - item_state = "ember_jan" - /obj/item/clothing/suit/storage/browntrenchcoat name = "старое коричневое пальто" desc = "Поношенное пальто старого фасона." diff --git a/modular_ss220/clothing/icons/object/mod_clothing.dmi b/modular_ss220/clothing/icons/object/mod_clothing.dmi index 870844708f310..d1b91725df35a 100644 Binary files a/modular_ss220/clothing/icons/object/mod_clothing.dmi and b/modular_ss220/clothing/icons/object/mod_clothing.dmi differ diff --git a/modular_ss220/clumsy_table/code/clumsy_table.dm b/modular_ss220/clumsy_table/code/clumsy_table.dm index 7e4635806d59e..3edfd64c3c189 100644 --- a/modular_ss220/clumsy_table/code/clumsy_table.dm +++ b/modular_ss220/clumsy_table/code/clumsy_table.dm @@ -3,7 +3,8 @@ . = ..() /obj/structure/table/do_climb(mob/living/user) - if(!..()) + . = ..() + if(!.) return FALSE AddComponent(/datum/component/clumsy_climb, 15) SEND_SIGNAL(src, COMSIG_CLIMBED_ON, user) diff --git a/modular_ss220/detective_rework/code/sample_kits.dm b/modular_ss220/detective_rework/code/sample_kits.dm index cb21f741e8261..b4f23dd7fe98d 100644 --- a/modular_ss220/detective_rework/code/sample_kits.dm +++ b/modular_ss220/detective_rework/code/sample_kits.dm @@ -64,7 +64,7 @@ /obj/item/sample/print name = "\improper дактилоскопическая карта" desc = "Сохраняет отпечатки пальцев." - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "fingerprint0" item_state = "paper" diff --git a/modular_ss220/hairs/code/human_hair.dm b/modular_ss220/hairs/code/human_hair.dm index 320aa66e7dcd8..5feb93306c3a8 100644 --- a/modular_ss220/hairs/code/human_hair.dm +++ b/modular_ss220/hairs/code/human_hair.dm @@ -693,3 +693,53 @@ icon_state = "punk_lying" secondary_theme = "acs" species_allowed = list("Human", "Slime People", "Tajaran") + +/datum/sprite_accessory/hair/halfshave + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Halfshave" + icon_state = "halfshave" + species_allowed = list("Human", "Slime People", "Tajaran") + +/datum/sprite_accessory/hair/ruby + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Ruby" + icon_state = "ruby" + species_allowed = list("Human", "Slime People", "Tajaran") + +/datum/sprite_accessory/hair/long_flipped + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Long Flipped" + icon_state = "long_flipped" + species_allowed = list("Human", "Slime People", "Tajaran") + +/datum/sprite_accessory/hair/himeup + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Hime Big Ponytail" + icon_state = "himeup" + species_allowed = list("Human", "Slime People", "Tajaran") + +/datum/sprite_accessory/hair/rosemary + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Rosemary" + icon_state = "rosemary" + secondary_theme = "acs" + species_allowed = list("Human", "Slime People", "Tajaran") + +/datum/sprite_accessory/hair/slimetendrils + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Slimetendrils" + icon_state = "slimetendrils" + species_allowed = list("Slime People") + +/datum/sprite_accessory/hair/country + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Country" + icon_state = "country" + secondary_theme = "acs" + species_allowed = list("Human", "Slime People", "Tajaran") + +/datum/sprite_accessory/hair/jinx + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Jinx" + icon_state = "jinx" + species_allowed = list("Human", "Slime People", "Tajaran") diff --git a/modular_ss220/hairs/code/vulpkanin_hair.dm b/modular_ss220/hairs/code/vulpkanin_hair.dm index c44b24fb0e5b0..31f5665fd4710 100644 --- a/modular_ss220/hairs/code/vulpkanin_hair.dm +++ b/modular_ss220/hairs/code/vulpkanin_hair.dm @@ -217,3 +217,8 @@ icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' name = "Braids" icon_state = "braids" + +/datum/sprite_accessory/hair/vulpkanin/long_bedhead + icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + name = "Long Bedhead" + icon_state = "long_bedhead" diff --git a/modular_ss220/hairs/icons/human_hair.dmi b/modular_ss220/hairs/icons/human_hair.dmi index e29553b601155..c371ec4e53bbb 100644 Binary files a/modular_ss220/hairs/icons/human_hair.dmi and b/modular_ss220/hairs/icons/human_hair.dmi differ diff --git a/modular_ss220/hairs/icons/vulpkanin_hair.dmi b/modular_ss220/hairs/icons/vulpkanin_hair.dmi index ffaaf323ead3c..f70c9436c09c2 100644 Binary files a/modular_ss220/hairs/icons/vulpkanin_hair.dmi and b/modular_ss220/hairs/icons/vulpkanin_hair.dmi differ diff --git a/modular_ss220/jobs/code/card_id.dm b/modular_ss220/jobs/code/card_id.dm index d61e04da44dba..6d8db55e4843d 100644 --- a/modular_ss220/jobs/code/card_id.dm +++ b/modular_ss220/jobs/code/card_id.dm @@ -2,7 +2,7 @@ var/image/holder = hud_list[ID_HUD] holder.icon = 'icons/mob/hud/sechud.dmi' if(wear_id && (wear_id.get_job_name() in GLOB.all_jobs_ss220)) - holder.icon = 'modular_ss220/jobs/icons/hud.dmi' + holder.icon = 'modular_ss220/jobs/icons/sechud.dmi' . = ..() /obj/item/get_job_name() //Used in secHUD icon generation @@ -21,191 +21,191 @@ /obj/item/card/id/medical/intern name = "Intern ID" registered_name = "Intern" - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "intern" rank = "Medical Intern" /obj/item/card/id/research/student name = "Student ID" registered_name = "Student" - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "student" /obj/item/card/id/engineering/trainee name = "Trainee ID" registered_name = "Trainee" - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "trainee" /obj/item/card/id/security/cadet name = "Cadet ID" registered_name = "Cadet" - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "cadet" /obj/item/card/id/barber name = "Barber ID" access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "barber" /obj/item/card/id/bath name = "Bath ID" access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "bath" /obj/item/card/id/casino name = "Casino ID" access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS, ACCESS_THEATRE, ACCESS_HYDROPONICS, ACCESS_BAR) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "casino" /obj/item/card/id/waiter name = "Waiter ID" access = list(ACCESS_MAINT_TUNNELS, ACCESS_THEATRE, ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "waiter" /obj/item/card/id/acolyte name = "Acolyte ID" access = list(ACCESS_CHAPEL_OFFICE, ACCESS_MAINT_TUNNELS) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "acolyte" /obj/item/card/id/courier name = "Deliverer ID" access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_MINERAL_STOREROOM) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' - icon_state = "deliverer" + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' + icon_state = "courier" /obj/item/card/id/wrestler name = "Wrestler ID" access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS, ACCESS_THEATRE, ACCESS_RC_ANNOUNCE) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "wrestler" /obj/item/card/id/painter name = "Painter ID" access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS, ACCESS_THEATRE) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "painter" /obj/item/card/id/musican name = "Musician ID" access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS, ACCESS_THEATRE) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "musician" /obj/item/card/id/actor name = "Actor ID" access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS, ACCESS_THEATRE) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "actor" /obj/item/card/id/administrator name = "Administrator ID" access = list(ACCESS_THEATRE, ACCESS_LIBRARY, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_MINERAL_STOREROOM, ACCESS_JANITOR) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "administrator" /obj/item/card/id/tourist_tsf name = "Tourist TSF ID" access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "touristtsf" /obj/item/card/id/tourist_ussp name = "Tourist USSP ID" access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "touristussp" /obj/item/card/id/cleaning_manager name = "Clining Manager ID" access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MEDICAL) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "managerjanitor" /obj/item/card/id/apprentice name = "Apprentice ID" access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "apprentice" /obj/item/card/id/guard name = "Guard ID" access = list(ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LIBRARY) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "guard" /obj/item/card/id/migrant name = "Migrant ID" access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "migrant" /obj/item/card/id/uncertain name = "Uncertain ID" access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "uncertain" /obj/item/card/id/adjutant name = "Adjutant ID" access = list(ACCESS_LIBRARY, ACCESS_HEADS, ACCESS_EVA, ACCESS_INTERNAL_AFFAIRS, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "adjutant" item_state = "silver-id" /obj/item/card/id/butler name = "Butler ID" access = list(ACCESS_MAINT_TUNNELS, ACCESS_LIBRARY, ACCESS_HEADS, ACCESS_EVA, ACCESS_INTERNAL_AFFAIRS) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "butler" /obj/item/card/id/maid name = "Maid ID" access = list(ACCESS_MAINT_TUNNELS, ACCESS_LIBRARY, ACCESS_HEADS, ACCESS_EVA, ACCESS_INTERNAL_AFFAIRS) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "maid" /obj/item/card/id/representative_tsf name = "Representative TSF ID" access = list(ACCESS_MAINT_TUNNELS, ACCESS_LIBRARY, ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_EVA) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "representativetsf" item_state = "silver-id" /obj/item/card/id/representative_ussp name = "Representative USSP ID" access = list(ACCESS_MAINT_TUNNELS, ACCESS_LIBRARY, ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_EVA) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "representativeussp" item_state = "silver-id" /obj/item/card/id/dealer name = "Dealer ID" access = list(ACCESS_MAINT_TUNNELS, ACCESS_LIBRARY, ACCESS_RC_ANNOUNCE, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_MINERAL_STOREROOM, ACCESS_CONSTRUCTION) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "dealer" /obj/item/card/id/vip_guest name = "VIP Guest ID" access = list(ACCESS_MAINT_TUNNELS, ACCESS_LIBRARY, ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_EVA) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "vipcorporateguest" item_state = "gold-id" /obj/item/card/id/banker name = "Banker ID" access = list(ACCESS_MAINT_TUNNELS, ACCESS_LIBRARY, ACCESS_EVA) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "banker" item_state = "gold-id" /obj/item/card/id/seclown name = "Security Clown ID" access = list(ACCESS_CLOWN, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS, ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT) - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon = 'modular_ss220/aesthetics/better_ids/icons/card.dmi' icon_state = "securityclown" diff --git a/modular_ss220/jobs/icons/job_assets.dmi b/modular_ss220/jobs/icons/job_assets.dmi new file mode 100644 index 0000000000000..e36bc7908527f Binary files /dev/null and b/modular_ss220/jobs/icons/job_assets.dmi differ diff --git a/modular_ss220/jobs/icons/hud.dmi b/modular_ss220/jobs/icons/sechud.dmi similarity index 100% rename from modular_ss220/jobs/icons/hud.dmi rename to modular_ss220/jobs/icons/sechud.dmi diff --git a/modular_ss220/loadout/code/racial.dm b/modular_ss220/loadout/code/racial.dm index b69406d7f9865..ba0015d308ab8 100644 --- a/modular_ss220/loadout/code/racial.dm +++ b/modular_ss220/loadout/code/racial.dm @@ -3,18 +3,18 @@ /datum/gear/racial/vox_sandal display_name = "Vox sandals" path = /obj/item/clothing/shoes/roman/vox - slot = SLOT_HUD_SHOES + slot = ITEM_SLOT_SHOES /datum/gear/racial/vox_gauntlets display_name = "Vox gauntlets" path = /obj/item/clothing/gloves/vox/light - slot = SLOT_HUD_GLOVES + slot = ITEM_SLOT_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 + slot = ITEM_SLOT_JUMPSUIT /datum/gear/racial/vox_jumpsuit/red display_name = "Vox red jumpsuit" diff --git a/modular_ss220/maps220/code/RandomRuins/lavaland/lavaland_ruins.dm b/modular_ss220/maps220/code/RandomRuins/lavaland/lavaland_ruins.dm index f87d12c36a758..cd20846ee34c3 100644 --- a/modular_ss220/maps220/code/RandomRuins/lavaland/lavaland_ruins.dm +++ b/modular_ss220/maps220/code/RandomRuins/lavaland/lavaland_ruins.dm @@ -5,7 +5,7 @@ description = "Пример описания" // Описание руины. Видно только админам. prefix = "_maps/map_files220/RandomRuins/LavaRuins/" // Путь до карты, обязательно оставлять таким. suffix = "" // .dmm файл руины, вписывать название полностью, пример: suffix = "example.dmm". Саму карту закидывать в "_maps\map_files\RandomRuins\LavaRuins" - cost = 5 // Вес руины, чем он больше, тем меньше шанс что она заспавнится + // cost = 5 // Вес руины, чем он больше, тем меньше шанс что она заспавнится allow_duplicates = FALSE // Разрешает/Запрещает дубликаты руины. TRUE - могут быть дубликаты. FALSE - дубликатов не будет. always_place = TRUE // Если вписать эту строчку, руина будет спавнится всегда. ci_exclude = /datum/map_template/ruin/lavaland/example // Это не использовать. @@ -18,7 +18,7 @@ description = "Заброшенное место хранения опасных и паранормальных предметов а так же существ." prefix = "_maps/map_files220/RandomRuins/LavaRuins/" suffix = "scp_facility.dmm" - cost = 20 // Бесконечная пицца + // cost = 20 // Бесконечная пицца allow_duplicates = FALSE /datum/map_template/ruin/lavaland/cheesus_temple @@ -27,7 +27,7 @@ description = "Перенесённая в результате БС аномалии церковь Чизуза." prefix = "_maps/map_files220/RandomRuins/LavaRuins/" suffix = "cheesus_temple.dmm" - cost = 20 // Имеется книга призыва сыра + // cost = 20 // Имеется книга призыва сыра always_place = FALSE allow_duplicates = FALSE @@ -37,7 +37,7 @@ description = "Старый, заброшенный лагерь Эшей." prefix = "_maps/map_files220/RandomRuins/LavaRuins/" suffix = "ash_old.dmm" - cost = 10 // В себе имеет платы консоли заключенных и хим раздратчик, так же пнв модуль + // cost = 10 // В себе имеет платы консоли заключенных и хим раздратчик, так же пнв модуль always_place = FALSE allow_duplicates = FALSE @@ -47,6 +47,6 @@ description = "Старый заброшенный аванпост. Его постигла участь разлома Лаваленда." prefix = "_maps/map_files220/RandomRuins/LavaRuins/" suffix = "old_outpost.dmm" - cost = 25 // на базе в сейфе есть ЕКА + // cost = 25 // на базе в сейфе есть ЕКА allow_duplicates = FALSE always_place = FALSE diff --git a/modular_ss220/maps220/code/RandomRuins/space/space_ruins.dm b/modular_ss220/maps220/code/RandomRuins/space/space_ruins.dm index c9d1ace1919bc..2cc84a260e856 100644 --- a/modular_ss220/maps220/code/RandomRuins/space/space_ruins.dm +++ b/modular_ss220/maps220/code/RandomRuins/space/space_ruins.dm @@ -5,7 +5,7 @@ description = "Пример описания" // Описание руины. Видно только админам. prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" // Путь до карты, обязательно оставлять таким. suffix = "" // .dmm файл руины, вписывать название полностью, пример: suffix = "example.dmm". Саму карту закидывать в путь префикса. - cost = 5 // Вес руины, чем он больше, тем меньше шанс что она заспавнится + // cost = 5 // Вес руины, чем он больше, тем меньше шанс что она заспавнится allow_duplicates = FALSE // Разрешает/Запрещает дубликаты руины. TRUE - могут быть дубликаты. FALSE - дубликатов не будет. always_place = TRUE // Если вписать эту строчку, руина будет спавнится всегда. Использовать ТОЛЬКО для теста! После удалить. ci_exclude = /datum/map_template/ruin/space/example // Это не использовать. @@ -18,7 +18,7 @@ description = "An abandoned unarmed transport ship, a perfect target for the bandit scum." prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" suffix = "mechtransport_new.dmm" - cost = 3 + // cost = 3 allow_duplicates = FALSE /datum/map_template/ruin/space/destroyed_infiltrator @@ -27,7 +27,7 @@ description = "They're loading BSA! But why? Ah, they're going to sho-..." prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" suffix = "destroyed_infiltrator.dmm" - cost = 3 + // cost = 3 allow_duplicates = FALSE /datum/map_template/ruin/space/transit_bar @@ -36,7 +36,7 @@ description = "One of the trillion bars in this galaxy, this one looks especially homey and comfy." prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" suffix = "transit_bar.dmm" - cost = 1 + // cost = 1 allow_duplicates = FALSE /datum/map_template/ruin/space/infected_ship @@ -45,7 +45,7 @@ description = "A lonely drifting ship showing no signs of life... What kind of black rubber substance is weaving around its shell?" prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" suffix = "infected_ship.dmm" - cost = 3 + // cost = 3 allow_duplicates = FALSE /datum/map_template/ruin/space/convoy_ambush @@ -54,7 +54,7 @@ description = "I've been waiting for this for twuh years!" prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" suffix = "convoy_ambush.dmm" - cost = 3 + // cost = 3 allow_duplicates = FALSE /datum/map_template/ruin/space/whiteship @@ -65,7 +65,10 @@ description = "An old, abandoned NT medical ship. Its computer can navigate to other landmarks within space with ease." allow_duplicates = FALSE always_place = TRUE - cost = 0 + // cost = 0 + +/datum/map_template/ruin/space/whiteship/get_cost() + return 0 /datum/map_template/ruin/space/voxraiders_1 name = "Vox Raiders" @@ -73,7 +76,7 @@ description = "A small Vox skipjack near some space scrap. They will definitely not tolerate new rivals." prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" suffix = "voxraiders_1.dmm" - cost = 4 + // cost = 4 allow_duplicates = FALSE /datum/map_template/ruin/space/spacehotel @@ -82,6 +85,6 @@ description = "An interstellar hotel, where the weary spaceman can rest their head and relax, assured that the residental staff will not murder them in their sleep. Probably." prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" suffix = "spacehotel.dmm" - cost = 10 + // cost = 10 allow_duplicates = FALSE diff --git a/modular_ss220/maps220/code/Station/station_datums.dm b/modular_ss220/maps220/code/Station/station_datums.dm index 7d41ab8864458..f7642b0e785bf 100644 --- a/modular_ss220/maps220/code/Station/station_datums.dm +++ b/modular_ss220/maps220/code/Station/station_datums.dm @@ -1,12 +1,12 @@ /datum/map/boxstation fluff_name = "ИСН Кибериада" - technical_name = "Cyberiad220" + technical_name = "BoxStation220" map_path = "_maps/map_files220/stations/boxstation.dmm" webmap_url = "https://webmap.affectedarc07.co.uk/maps/ss220/boxstation/" /datum/map/deltastation fluff_name = "ИСН Керберос" - technical_name = "Delta220" + technical_name = "DeltaStation220" map_path = "_maps/map_files220/stations/deltastation.dmm" webmap_url = "https://webmap.affectedarc07.co.uk/maps/ss220/deltastation/" diff --git a/modular_ss220/maps220/code/mobs.dm b/modular_ss220/maps220/code/mobs.dm index 19aca4337f970..fbd75b1f3d2dc 100644 --- a/modular_ss220/maps220/code/mobs.dm +++ b/modular_ss220/maps220/code/mobs.dm @@ -426,7 +426,7 @@ /* Jungle Mob Spawners */ /obj/effect/landmark/awaymissions/gate_lizard/mine_spawner - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/restraints.dmi' icon_state = "fleshtrap" var/id = null var/triggered = FALSE @@ -436,6 +436,7 @@ /obj/effect/landmark/awaymissions/gate_lizard/mob_spawn name = "spawner" icon = 'modular_ss220/maps220/icons/simple_human.dmi' + icon_state = "spawner" var/id = null var/jungle_mob = null @@ -1280,6 +1281,7 @@ /obj/effect/landmark/awaymissions/spacebattle/mob_spawn name = "spawner" icon = 'modular_ss220/maps220/icons/spacebattle.dmi' + icon_state = "melee" var/id = null var/syndi_mob = null diff --git a/modular_ss220/maps220/code/objects.dm b/modular_ss220/maps220/code/objects.dm index 19e936943000f..d5636d90eaad6 100644 --- a/modular_ss220/maps220/code/objects.dm +++ b/modular_ss220/maps220/code/objects.dm @@ -42,16 +42,14 @@ //Crates /obj/structure/closet/crate/wooden - icon = 'modular_ss220/maps220/icons/crates.dmi' - open_sound = 'sound/machines/wooden_closet_open.ogg' - close_sound = 'sound/machines/wooden_closet_close.ogg' - -/obj/structure/closet/crate/wooden/wooden_crate name = "wooden crate" desc = "A wooden crate." + icon = 'modular_ss220/maps220/icons/crates.dmi' icon_state = "wooden" icon_opened = "wooden_open" icon_closed = "wooden" + open_sound = 'sound/machines/wooden_closet_open.ogg' + close_sound = 'sound/machines/wooden_closet_close.ogg' /obj/structure/closet/crate/wooden/barrel name = "wooden barrel" @@ -194,13 +192,13 @@ ring_ability(user) /obj/item/clothing/gloves/ring/immortality_ring/item_action_slot_check(slot, mob/user, immortality) - if(slot == SLOT_HUD_GLOVES) + if(slot == ITEM_SLOT_GLOVES) return TRUE /obj/item/clothing/gloves/ring/immortality_ring/equipped(mob/user, slot) ..() var/mob/living/carbon/human/H = user - if(istype(H) && slot == SLOT_HUD_GLOVES) + if(istype(H) && slot == ITEM_SLOT_GLOVES) flags = NODROP to_chat(user, span_danger("[name] туго обвивается вокруг твоего пальца!")) SEND_SOUND (user, sound('modular_ss220/aesthetics_sounds/sound/creepy/demon2.ogg')) @@ -268,30 +266,30 @@ switch(randomUndead) if("roman") var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) - raised.equip_to_slot_or_del(new hat(raised), SLOT_HUD_HEAD) - raised.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(raised), SLOT_HUD_JUMPSUIT) - raised.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(raised), SLOT_HUD_SHOES) - raised.equip_to_slot_or_del(new /obj/item/shield/riot/roman(raised), SLOT_HUD_LEFT_HAND) - raised.equip_to_slot_or_del(new /obj/item/claymore/ceremonial(raised), SLOT_HUD_RIGHT_HAND) - raised.equip_to_slot_or_del(new /obj/item/spear(raised), SLOT_HUD_BACK) + raised.equip_to_slot_or_del(new hat(raised), ITEM_SLOT_HEAD) + raised.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(raised), ITEM_SLOT_JUMPSUIT) + raised.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(raised), ITEM_SLOT_SHOES) + raised.equip_to_slot_or_del(new /obj/item/shield/riot/roman(raised), ITEM_SLOT_LEFT_HAND) + raised.equip_to_slot_or_del(new /obj/item/claymore/ceremonial(raised), ITEM_SLOT_RIGHT_HAND) + raised.equip_to_slot_or_del(new /obj/item/spear(raised), ITEM_SLOT_BACK) if("pirate") - raised.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(raised), SLOT_HUD_JUMPSUIT) - raised.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(raised), SLOT_HUD_OUTER_SUIT) - raised.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(raised), SLOT_HUD_HEAD) - raised.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(raised), SLOT_HUD_SHOES) - raised.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(raised), SLOT_HUD_GLASSES) - raised.equip_to_slot_or_del(new /obj/item/claymore/ceremonial(raised), SLOT_HUD_RIGHT_HAND) - raised.equip_to_slot_or_del(new /obj/item/spear(raised), SLOT_HUD_BACK) - raised.equip_to_slot_or_del(new /obj/item/shield/riot/roman(raised), SLOT_HUD_LEFT_HAND) + raised.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(raised), ITEM_SLOT_JUMPSUIT) + raised.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(raised), ITEM_SLOT_OUTER_SUIT) + raised.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(raised), ITEM_SLOT_HEAD) + raised.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(raised), ITEM_SLOT_SHOES) + raised.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(raised), ITEM_SLOT_EYES) + raised.equip_to_slot_or_del(new /obj/item/claymore/ceremonial(raised), ITEM_SLOT_RIGHT_HAND) + raised.equip_to_slot_or_del(new /obj/item/spear(raised), ITEM_SLOT_BACK) + raised.equip_to_slot_or_del(new /obj/item/shield/riot/roman(raised), ITEM_SLOT_LEFT_HAND) if("clown") - raised.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(raised), SLOT_HUD_JUMPSUIT) - raised.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(raised), SLOT_HUD_SHOES) - raised.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(raised), SLOT_HUD_WEAR_MASK) - raised.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(raised), SLOT_HUD_HEAD) - raised.equip_to_slot_or_del(new /obj/item/bikehorn(raised), SLOT_HUD_LEFT_STORE) - raised.equip_to_slot_or_del(new /obj/item/claymore/ceremonial(raised), SLOT_HUD_RIGHT_HAND) - raised.equip_to_slot_or_del(new /obj/item/shield/riot/roman(raised), SLOT_HUD_LEFT_HAND) - raised.equip_to_slot_or_del(new /obj/item/spear(raised), SLOT_HUD_BACK) + raised.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(raised), ITEM_SLOT_JUMPSUIT) + raised.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(raised), ITEM_SLOT_SHOES) + raised.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(raised), ITEM_SLOT_MASK) + raised.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(raised), ITEM_SLOT_HEAD) + raised.equip_to_slot_or_del(new /obj/item/bikehorn(raised), ITEM_SLOT_LEFT_POCKET) + raised.equip_to_slot_or_del(new /obj/item/claymore/ceremonial(raised), ITEM_SLOT_RIGHT_HAND) + raised.equip_to_slot_or_del(new /obj/item/shield/riot/roman(raised), ITEM_SLOT_LEFT_HAND) + raised.equip_to_slot_or_del(new /obj/item/spear(raised), ITEM_SLOT_BACK) /*Black Mesa awaymission*/ //Xenodoor diff --git a/modular_ss220/maps220/code/spawners.dm b/modular_ss220/maps220/code/spawners.dm index 31fe9ed72847b..3193e9299c416 100644 --- a/modular_ss220/maps220/code/spawners.dm +++ b/modular_ss220/maps220/code/spawners.dm @@ -90,24 +90,26 @@ ) /* Random spawners */ -/obj/effect/spawner/random_spawners/mod +/obj/effect/spawner/random/mod icon = 'modular_ss220/maps220/icons/spawner_icons.dmi' icon_state = "mod" -/obj/effect/spawner/random_spawners/syndicate/loot +/obj/effect/spawner/random/syndicate/loot icon = 'modular_ss220/maps220/icons/spawner_icons.dmi' + +/obj/effect/spawner/random/syndicate/loot/common icon_state = "common" -/obj/effect/spawner/random_spawners/syndicate/loot/level2 +/obj/effect/spawner/random/syndicate/loot/rare icon_state = "rare" -/obj/effect/spawner/random_spawners/syndicate/loot/level3 +/obj/effect/spawner/random/syndicate/loot/officer icon_state = "officer" -/obj/effect/spawner/random_spawners/syndicate/loot/level4 +/obj/effect/spawner/random/syndicate/loot/armory icon_state = "armory" -/obj/effect/spawner/random_spawners/syndicate/loot/stetchkin +/obj/effect/spawner/random/syndicate/loot/stetchkin icon_state = "stetchkin" /obj/item/reagent_containers/pill/random_drugs diff --git a/modular_ss220/maps220/icons/mapping_helpers.dmi b/modular_ss220/maps220/icons/mapping_helpers.dmi index 09b1656984194..98f6b9118df84 100644 Binary files a/modular_ss220/maps220/icons/mapping_helpers.dmi and b/modular_ss220/maps220/icons/mapping_helpers.dmi differ diff --git a/modular_ss220/mecha_skins/code/paintkit_install.dm b/modular_ss220/mecha_skins/code/paintkit_install.dm index 98a09fa690b3a..5bd857a500c89 100644 --- a/modular_ss220/mecha_skins/code/paintkit_install.dm +++ b/modular_ss220/mecha_skins/code/paintkit_install.dm @@ -35,7 +35,7 @@ . = ..() icon_state = reset_icon(icon_state)+"-open" -// RIP AND PEPPERONI +// MARK: Ripley /obj/structure/mecha_wreckage/ripley/titan name = "\improper Обломки \"Кулака Титана\"" @@ -85,7 +85,7 @@ icon = 'modular_ss220/mecha_skins/icons/mecha.dmi' icon_state = "deathripley-broken" -// ODYSSEUS`S ASS +// MARK: Odysseus /obj/structure/mecha_wreckage/odysseus/hermes name = "\improper Обломки \"Гермеса\"" @@ -99,7 +99,7 @@ icon = 'modular_ss220/mecha_skins/icons/mecha.dmi' icon_state = "murdysseus-broken" -// GYGAXCHAD +// MARK: Gygax /obj/structure/mecha_wreckage/gygax/medigax name = "\improper Обломки \"Медигакса\"" @@ -129,7 +129,7 @@ name = "\improper Обломки \"Молчигакса\"" desc = "..." icon = 'modular_ss220/mecha_skins/icons/mecha.dmi' - icon_state = "mimegax-broken" + icon_state = "mime-broken" /obj/structure/mecha_wreckage/gygax/gygax_black name = "\improper Обломки черного Гигакса" @@ -137,7 +137,7 @@ icon = 'modular_ss220/mecha_skins/icons/mecha.dmi' icon_state = "gygax_black-broken" -// DURAND +// MARK: Durand /obj/structure/mecha_wreckage/durand/dollhouse name = "\improper Обломки \"Кукольного домика\"" @@ -163,7 +163,7 @@ icon = 'modular_ss220/mecha_skins/icons/mecha.dmi' icon_state = "skullmech-broken" -// USELESS SHIT +// MARK: Phazon /obj/structure/mecha_wreckage/phazon/imperion name = "\improper Обломки \"Империона\"" diff --git a/modular_ss220/mecha_skins/code/paintkit_menu.dm b/modular_ss220/mecha_skins/code/paintkit_menu.dm index 5cb6f4619dc3b..04860eaaea614 100644 --- a/modular_ss220/mecha_skins/code/paintkit_menu.dm +++ b/modular_ss220/mecha_skins/code/paintkit_menu.dm @@ -1,13 +1,16 @@ // Please don't use this for anything, it's a base type for custom mech paintjobs. /obj/item/paintkit name = "Набор кастомизации меха" - desc = "Дефолтный набор кастомизации, превращающий мех в другой мех(визуально)." + desc = "Дефолтный набор кастомизации, превращающий мех в другой мех (визуально)." icon = 'modular_ss220/mecha_skins/icons/paintkit.dmi' icon_state = "paintkit" // New type of wreckage var/new_wreckage = null -// RIPLEY +/obj/item/paintkit/titansfist + icon = 'icons/obj/painting.dmi' + +// MARK: Ripley /obj/item/paintkit/ripley_titansfist name = "Набор кастомизации АЭП \"Кулак Титана\"" @@ -97,7 +100,7 @@ allowed_types = list("ripley", "firefighter") new_wreckage = /obj/structure/mecha_wreckage/ripley/reaper -// ODYSSEUS +// MARK: Odysseus /obj/item/paintkit/odysseus_hermes name = "Набор кастомизации Одиссея \"Гермес\"" @@ -121,7 +124,7 @@ allowed_types = list("odysseus") new_wreckage = /obj/structure/mecha_wreckage/odysseus/reaper -// GYGAXCHAD +// MARK: Gygax /obj/item/paintkit/gygax_alt name = "Набор кастомизации старого Гигакса" @@ -174,7 +177,7 @@ new_name = "Молчигакс" new_desc = "...!" - new_icon = "mimegax" + new_icon = "mime" allowed_types = list("gygax") new_wreckage = /obj/structure/mecha_wreckage/gygax/mimegax @@ -189,7 +192,7 @@ allowed_types = list("gygax") new_wreckage = /obj/structure/mecha_wreckage/gygax/gygax_black -// DURAND +// MARK: Durand /obj/item/paintkit/durand_soviet name = "Набор кастомизации Дюранда \"Кукольный домик\"" @@ -235,7 +238,7 @@ allowed_types = list("durand") new_wreckage = /obj/structure/mecha_wreckage/durand/skull -// USELESS SHIT +// MARK: Phazon /obj/item/paintkit/phazon_imperion name = "Набор кастомизации Фазона \"Империон\"" diff --git a/modular_ss220/mobs/code/mob_holder.dm b/modular_ss220/mobs/code/mob_holder.dm index 48c03607460c1..6c3c52cd9fa62 100644 --- a/modular_ss220/mobs/code/mob_holder.dm +++ b/modular_ss220/mobs/code/mob_holder.dm @@ -4,7 +4,7 @@ lefthand_file = 'modular_ss220/mobs/icons/mob/inhands/mobs_lefthand.dmi' righthand_file = 'modular_ss220/mobs/icons/mob/inhands/mobs_righthand.dmi' origin_tech = "biotech=2" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD /obj/item/holder/attack(mob/living/target, mob/living/user, def_zone) ASSERT(length(contents) > 0) @@ -107,9 +107,8 @@ /obj/item/holder/pai name = "pAI" desc = "It's a little robot." - icon_state = "pai" origin_tech = "materials=3;programming=4;engineering=4" - slot_flags = SLOT_FLAG_HEAD | SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_HEAD | ITEM_SLOT_BOTH_EARS /obj/item/holder/bee name = "bee" @@ -120,7 +119,7 @@ slot_flags = null /obj/item/holder/bunny - slot_flags = SLOT_FLAG_HEAD | SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_HEAD | ITEM_SLOT_BOTH_EARS /obj/item/holder/butterfly name = "butterfly" @@ -128,14 +127,14 @@ icon = 'icons/mob/animal.dmi' icon_state = "butterfly" origin_tech = "biotech=4" - slot_flags = SLOT_FLAG_HEAD | SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_HEAD | ITEM_SLOT_BOTH_EARS /obj/item/holder/mouse name = "mouse" desc = "It's a small, disease-ridden rodent." icon = 'modular_ss220/mobs/icons/mob/animal.dmi' icon_state = "mouse_gray" - slot_flags = SLOT_FLAG_HEAD | SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_HEAD | ITEM_SLOT_BOTH_EARS /obj/item/holder/drone name = "maintenance drone" @@ -148,12 +147,6 @@ icon_state = "drone-emagged" origin_tech = "materials=3;programming=4;powerstorage=3;engineering=4;syndicate=3" -/obj/item/holder/cogscarab - name = "cogscarab" - desc = "A strange, drone-like machine. It constantly emits the hum of gears." - icon_state = "cogscarab" - origin_tech = "materials=3;magnets=4;powerstorage=9;bluespace=4" - /obj/item/holder/monkey name = "monkey" desc = "It's a monkey" @@ -276,12 +269,6 @@ icon = 'modular_ss220/mobs/icons/mob/pets.dmi' icon_state = "crusher" -/obj/item/holder/original - name = "pet" - desc = "It's a pet" - icon = 'modular_ss220/mobs/icons/mob/pets.dmi' - icon_state = "original" - /obj/item/holder/spacecat name = "pet" desc = "It's a pet" @@ -366,6 +353,7 @@ /obj/item/holder/fennec name = "fennec" desc = "It's a fennec. Yiff!" + icon = 'modular_ss220/mobs/icons/mob/pets.dmi' icon_state = "fennec" origin_tech = "biotech=4" @@ -379,7 +367,7 @@ /obj/item/holder/headslug name = "headslug" desc = "It's a headslug. Ewwww..." - icon = 'modular_ss220/mobs/icons/mob/animal.dmi' + icon = 'icons/mob/mob.dmi' icon_state = "headslug" origin_tech = "biotech=6" @@ -422,5 +410,5 @@ /obj/item/holder/clowngoblin name = "clowngoblin" desc = "Honk honk" - icon = 'modular_ss220/mobs/icons/mob/animal.dmi' + icon = 'icons/mob/animal.dmi' icon_state = "clowngoblin" diff --git a/modular_ss220/mobs/code/simple_animal/mobs.dm b/modular_ss220/mobs/code/simple_animal/mobs.dm index 981bfffd30e6a..1decab575cf3f 100644 --- a/modular_ss220/mobs/code/simple_animal/mobs.dm +++ b/modular_ss220/mobs/code/simple_animal/mobs.dm @@ -7,7 +7,7 @@ /mob/living/simple_animal/hostile/headslug attacktext = "грызёт" -// holder_type = /obj/item/holder/headslug (Пупс попросил закомментить) + holder_type = /obj/item/holder/headslug /mob/living/simple_animal/hostile/retaliate/clown/goblin holder_type = /obj/item/holder/clowngoblin diff --git a/modular_ss220/mobs/code/supplypacks/crittercrate.dm b/modular_ss220/mobs/code/supplypacks/crittercrate.dm index 93ea13b6d7d8e..bc644327eaca0 100644 --- a/modular_ss220/mobs/code/supplypacks/crittercrate.dm +++ b/modular_ss220/mobs/code/supplypacks/crittercrate.dm @@ -133,7 +133,6 @@ /obj/item/clothing/suit/victcoat/red = 25, /obj/item/clothing/suit/draculacoat = 25, /obj/item/clothing/suit/browntrenchcoat = 25, - /obj/item/clothing/suit/neocoat = 25, /obj/item/clothing/suit/blacktrenchcoat = 25, /obj/item/clothing/suit/storage/blueshield = 5, diff --git a/modular_ss220/mobs/icons/mob/pets.dmi b/modular_ss220/mobs/icons/mob/pets.dmi index fa2fabc90e575..8e18c44950b9a 100644 Binary files a/modular_ss220/mobs/icons/mob/pets.dmi and b/modular_ss220/mobs/icons/mob/pets.dmi differ diff --git a/modular_ss220/objects/code/id_skins/id_skins_spawners.dm b/modular_ss220/objects/code/id_skins/id_skins_spawners.dm index 3ae5313bbc82d..f90a5aea5dad7 100644 --- a/modular_ss220/objects/code/id_skins/id_skins_spawners.dm +++ b/modular_ss220/objects/code/id_skins/id_skins_spawners.dm @@ -13,11 +13,11 @@ . = ..() // Spawner -/obj/effect/spawner/random_spawners/id_skins +/obj/effect/spawner/random/id_skins name = "Случайная наклейка на карту" icon = 'modular_ss220/maps220/icons/spawner_icons.dmi' icon_state = "ID_Random" - result = list( + loot = list( /obj/item/id_skin/colored = 10, /obj/item/id_skin/donut = 5, /obj/item/id_skin/business = 5, @@ -44,34 +44,8 @@ /obj/item/id_skin/boykisser = 1 ) -/obj/effect/spawner/random_spawners/id_skins/no_chance - result = list( - /datum/nothing = 80, - /obj/item/id_skin/colored = 10, - /obj/item/id_skin/donut = 5, - /obj/item/id_skin/business = 5, - /obj/item/id_skin/ussp = 5, - /obj/item/id_skin/colored/silver = 5, - /obj/item/id_skin/silver = 5, - /obj/item/id_skin/gold = 1, - /obj/item/id_skin/lifetime = 1, - /obj/item/id_skin/clown = 1, - /obj/item/id_skin/neon = 1, - /obj/item/id_skin/colored/neon = 1, - /obj/item/id_skin/missing = 1, - /obj/item/id_skin/ouija = 1, - /obj/item/id_skin/paradise = 1, - /obj/item/id_skin/rainbow = 1, - /obj/item/id_skin/space = 1, - /obj/item/id_skin/kitty = 1, - /obj/item/id_skin/colored/kitty = 1, - /obj/item/id_skin/cursedmiku = 1, - /obj/item/id_skin/colored/snake = 1, - /obj/item/id_skin/magic = 1, - /obj/item/id_skin/terminal = 1, - /obj/item/id_skin/jokerge = 1, - /obj/item/id_skin/boykisser = 1 - ) +/obj/effect/spawner/random/id_skins/no_chance + spawn_loot_chance = 40 // Prize Counter /datum/prize_item/id_skin diff --git a/modular_ss220/objects/code/material_pouch.dm b/modular_ss220/objects/code/material_pouch.dm index 7df1bb8b96958..4fa2cf70d904e 100644 --- a/modular_ss220/objects/code/material_pouch.dm +++ b/modular_ss220/objects/code/material_pouch.dm @@ -30,5 +30,5 @@ ) resistance_flags = FLAMMABLE max_w_class = WEIGHT_CLASS_NORMAL - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_POCKET + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_POCKETS diff --git a/modular_ss220/objects/code/platform.dm b/modular_ss220/objects/code/platform.dm index c540f205826f8..c7086e605748b 100644 --- a/modular_ss220/objects/code/platform.dm +++ b/modular_ss220/objects/code/platform.dm @@ -141,13 +141,13 @@ usr.visible_message(span_warning("[user] starts climbing over \the [src]!")) else usr.visible_message(span_warning("[user] starts getting off \the [src]!")) - climber = user + climbers += user if(!do_after(user, 50, target = src)) - climber = null + climbers -= user return if(!can_touch(user) || !climbable) - climber = null + climbers -= user return if(get_turf(user) == get_turf(src)) @@ -156,7 +156,7 @@ else usr.loc = get_turf(src) usr.visible_message(span_warning("[user] starts climbing over \the [src]!")) - climber = null + climbers -= user /obj/structure/platform/CanAtmosPass() return TRUE diff --git a/modular_ss220/objects/code/plushies/hampters.dm b/modular_ss220/objects/code/plushies/hampters.dm index 228c384a5424f..a41bc56d0bfd4 100644 --- a/modular_ss220/objects/code/plushies/hampters.dm +++ b/modular_ss220/objects/code/plushies/hampters.dm @@ -53,7 +53,7 @@ icon_override = 'modular_ss220/objects/icons/inhead/head.dmi' lefthand_file = 'modular_ss220/objects/icons/inhands/plushies_lefthand.dmi' righthand_file = 'modular_ss220/objects/icons/inhands/plushies_righthand.dmi' - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD w_class = WEIGHT_CLASS_TINY blood_color = "#d42929" var/squeak = 'sound/items/squeaktoy.ogg' diff --git a/modular_ss220/objects/code/weapons/melee/baseball_bat.dm b/modular_ss220/objects/code/weapons/melee/baseball_bat.dm index ba4c87580807b..f084a5f74b00b 100644 --- a/modular_ss220/objects/code/weapons/melee/baseball_bat.dm +++ b/modular_ss220/objects/code/weapons/melee/baseball_bat.dm @@ -5,7 +5,7 @@ В официальных документах эта бита проходит под элегантным названием \"Высокоскоростная система доставки СРП\". \ Выдаваясь только самым верным и эффективным офицерам Nanotrasen, это оружие является одновременно символом статуса \ и инструментом высшего правосудия." - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL var/on = FALSE diff --git a/modular_ss220/objects/code/weapons/melee/electrostaff.dm b/modular_ss220/objects/code/weapons/melee/electrostaff.dm index 67e80cfd0cb9f..f0fbc42c9b70a 100644 --- a/modular_ss220/objects/code/weapons/melee/electrostaff.dm +++ b/modular_ss220/objects/code/weapons/melee/electrostaff.dm @@ -6,7 +6,7 @@ icon = 'modular_ss220/objects/icons/melee.dmi' base_icon = "electrostaff" icon_state = "electrostaff_orange" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_HUGE force = 10 throwforce = 7 diff --git a/modular_ss220/objects/code/weapons/melee/stylet.dm b/modular_ss220/objects/code/weapons/melee/stylet.dm index 354dd45356161..c5611ba2791ca 100644 --- a/modular_ss220/objects/code/weapons/melee/stylet.dm +++ b/modular_ss220/objects/code/weapons/melee/stylet.dm @@ -3,7 +3,7 @@ desc = "Маленький складной нож скрытого ношения. \ Нож в итальянском стиле, который исторически стал предметом споров и даже запретов \ Его лезвие практически мгновенно выбрасывается при нажатии кнопки-качельки." - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_TINY var/on = FALSE diff --git a/modular_ss220/objects/code/weapons/melee/vibroblade.dm b/modular_ss220/objects/code/weapons/melee/vibroblade.dm index 8ef7865d0b262..ba6ef2239d8c2 100644 --- a/modular_ss220/objects/code/weapons/melee/vibroblade.dm +++ b/modular_ss220/objects/code/weapons/melee/vibroblade.dm @@ -23,7 +23,7 @@ throw_speed = 2 throw_range = 5 armour_penetration_percentage = 75 - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_NORMAL sharp = TRUE flags = CONDUCT @@ -132,7 +132,7 @@ /obj/item/melee/vibroblade/equipped(mob/user, slot, initial) . = ..() - if(hold_to_be_charged && slot != SLOT_HUD_LEFT_HAND && slot != SLOT_HUD_RIGHT_HAND) + if(hold_to_be_charged && slot != ITEM_SLOT_LEFT_HAND && slot != ITEM_SLOT_RIGHT_HAND) set_charge_level(CHARGE_LEVEL_NONE) /obj/item/melee/vibroblade/dropped(mob/user, silent) diff --git a/modular_ss220/objects/code/weapons/ranged/skrell_rifle.dm b/modular_ss220/objects/code/weapons/ranged/skrell_rifle.dm index e7844b3d0c209..37782883759c8 100644 --- a/modular_ss220/objects/code/weapons/ranged/skrell_rifle.dm +++ b/modular_ss220/objects/code/weapons/ranged/skrell_rifle.dm @@ -74,7 +74,7 @@ fire_sound = 'modular_ss220/objects/sound/weapons/gunshots/railgun.ogg' recoil = 0 fire_delay = 25 - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT zoomable = FALSE can_suppress = FALSE mag_type = /obj/item/ammo_box/magazine/skrell_magazine diff --git a/modular_ss220/objects/icons/platform.dmi b/modular_ss220/objects/icons/platform.dmi index 5bbf75c31b121..1f6dcf8a42514 100644 Binary files a/modular_ss220/objects/icons/platform.dmi and b/modular_ss220/objects/icons/platform.dmi differ diff --git a/modular_ss220/smart_equip_targeted/code/smart_equip_targeted.dm b/modular_ss220/smart_equip_targeted/code/smart_equip_targeted.dm index f8e403837150d..4c4ccf83fe830 100644 --- a/modular_ss220/smart_equip_targeted/code/smart_equip_targeted.dm +++ b/modular_ss220/smart_equip_targeted/code/smart_equip_targeted.dm @@ -1,5 +1,5 @@ /// take the most recent item out of a slot or place held item in a slot -/mob/living/carbon/human/proc/smart_equip_targeted(slot_item = SLOT_HUD_BELT) +/mob/living/carbon/human/proc/smart_equip_targeted(slot_item = ITEM_SLOT_BELT) var/obj/item/thing = get_active_hand() var/obj/item/item_in_slot = get_item_by_slot(slot_item) var/obj/item/storage/equipped_item diff --git a/modular_ss220/species/code/mob/new_player/sprite_accessories/nucleation/nucleation_face.dm b/modular_ss220/species/code/mob/new_player/sprite_accessories/nucleation/nucleation_face.dm index 553a91a7f1ab1..8cd49e624a7a4 100644 --- a/modular_ss220/species/code/mob/new_player/sprite_accessories/nucleation/nucleation_face.dm +++ b/modular_ss220/species/code/mob/new_player/sprite_accessories/nucleation/nucleation_face.dm @@ -30,3 +30,23 @@ /datum/sprite_accessory/hair/nucleation/nuc_neutron name = "Nucleation Neutron Bomb" icon_state = "neutron" + +/datum/sprite_accessory/hair/nucleation/nuc_duelist + name = "Nucleation Crystalized Duelist" + icon_state = "duelist" + +/datum/sprite_accessory/hair/nucleation/nuc_psalad + name = "Nucleation Crystalized Psalad" + icon_state = "psalad" + +/datum/sprite_accessory/hair/nucleation/nuc_punk + name = "Nucleation Crystalized Punk" + icon_state = "punk" + +/datum/sprite_accessory/hair/nucleation/nuc_rows + name = "Nucleation Crystalized Rows" + icon_state = "rows" + +/datum/sprite_accessory/hair/nucleation/nuc_ziegler + name = "Nucleation Crystalized Ziegler" + icon_state = "ziegler" diff --git a/modular_ss220/species/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi b/modular_ss220/species/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi index 8ac1e0f4f05fb..74e7ca71801c9 100644 Binary files a/modular_ss220/species/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi and b/modular_ss220/species/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi differ diff --git a/modular_ss220/spy_spider/code/spy_spider.dm b/modular_ss220/spy_spider/code/spy_spider.dm index 7a1a4e621d295..8a18fe4f7c8db 100644 --- a/modular_ss220/spy_spider/code/spy_spider.dm +++ b/modular_ss220/spy_spider/code/spy_spider.dm @@ -67,7 +67,7 @@ /obj/item/clothing/attackby(obj/item/I, mob/user, params) if(!istype(I, /obj/item/radio/spy_spider)) return ..() - if(spy_spider_attached || !((slot_flags & SLOT_FLAG_OCLOTHING) || (slot_flags & SLOT_FLAG_ICLOTHING))) + if(spy_spider_attached || !((slot_flags & ITEM_SLOT_OUTER_SUIT) || (slot_flags & ITEM_SLOT_JUMPSUIT))) to_chat(user, span_warning("Ты не находишь места для жучка!")) return TRUE var/obj/item/radio/spy_spider/spy_spider = I diff --git a/modular_ss220/translations/_translations.dm b/modular_ss220/translations/_translations.dm index 1c6b187751633..72754d9f2fd53 100644 --- a/modular_ss220/translations/_translations.dm +++ b/modular_ss220/translations/_translations.dm @@ -1,6 +1,8 @@ GLOBAL_LIST_EMPTY(ru_attack_verbs) GLOBAL_LIST_EMPTY(ru_eat_verbs) GLOBAL_LIST_EMPTY(ru_say_verbs) +GLOBAL_LIST_EMPTY(ru_emote_names) +GLOBAL_LIST_EMPTY(ru_emote_messages) /datum/modpack/translations name = "Переводы" @@ -8,6 +10,7 @@ GLOBAL_LIST_EMPTY(ru_say_verbs) author = "Vallat, Larentoun, dj-34" /datum/modpack/translations/post_initialize() + // Verbs var/toml_path = "[PATH_TO_TRANSLATE_DATA]/ru_verbs.toml" if(!fexists(file(toml_path))) return @@ -24,3 +27,24 @@ GLOBAL_LIST_EMPTY(ru_say_verbs) var/list/say_verbs = verbs_toml_list["say_verbs"] for(var/say_key in say_verbs) GLOB.ru_say_verbs += list("[say_key]" = say_verbs[say_key]) + + // Emotes + var/emote_path = "[PATH_TO_TRANSLATE_DATA]/ru_emotes.toml" + if(!fexists(file(emote_path))) + return + var/list/emotes_toml_list = rustg_read_toml_file(emote_path) + + var/list/emote_messages = emotes_toml_list["emote_messages"] + for(var/emote_message_key in emote_messages) + GLOB.ru_emote_messages += list("[emote_message_key]" = emote_messages[emote_message_key]) + + var/list/emote_names = emotes_toml_list["emote_names"] + for(var/emote_name_key in emote_names) + GLOB.ru_emote_names += list("[emote_name_key]" = emote_names[emote_name_key]) + + for(var/emote_key as anything in GLOB.emote_list) + var/list/emote_list = GLOB.emote_list[emote_key] + for(var/datum/emote/emote in emote_list) + emote.update_to_ru() + for(var/datum/keybinding/emote/emote_kb in GLOB.keybindings) + emote_kb.update_to_ru() diff --git a/modular_ss220/translations/_translations.dme b/modular_ss220/translations/_translations.dme index c1c04650c3e39..60b75e6f07fba 100644 --- a/modular_ss220/translations/_translations.dme +++ b/modular_ss220/translations/_translations.dme @@ -5,6 +5,7 @@ #include "_translations.dm" #include "code/pronouns.dm" +#include "code/translate_emotes.dm" #include "code/translate_verbs.dm" #include "code/ru_names/ru_name_base.dm" diff --git a/modular_ss220/translations/code/defines.dm b/modular_ss220/translations/code/defines.dm index d95358b5d0c94..3d48123b14ba0 100644 --- a/modular_ss220/translations/code/defines.dm +++ b/modular_ss220/translations/code/defines.dm @@ -1,2 +1 @@ -#define RU_NAMES_LENGTH 7 // 6 падежей, 1 base #define PATH_TO_TRANSLATE_DATA "modular_ss220/translations/code/translate_data" diff --git a/modular_ss220/translations/code/ru_names/ru_name_base.dm b/modular_ss220/translations/code/ru_names/ru_name_base.dm index b6082dc0490c3..7b720ef86222a 100644 --- a/modular_ss220/translations/code/ru_names/ru_name_base.dm +++ b/modular_ss220/translations/code/ru_names/ru_name_base.dm @@ -2,25 +2,34 @@ GLOBAL_LIST_EMPTY(ru_names) /atom // code\__DEFINES\bandastation\pronouns.dm for more info - /// List consists of ("name", "именительный", "родительный", "дательный", "винительный", "творительный", "предложный") + /// List consists of ("name", "именительный", "родительный", "дательный", "винительный", "творительный", "предложный", "gender") var/list/ru_names -/proc/ru_names_toml(name, prefix, suffix) +/// Хелпер для создания склонений +/proc/ru_names_list(base, nominative, genitive, dative, accusative, instrumental, prepositional, gender) + if(!base || !nominative || !genitive || !dative || !accusative || !instrumental || !prepositional) + CRASH("ru_names_list() received incomplete declent list!") + return list("base" = base, NOMINATIVE = nominative, GENITIVE = genitive, DATIVE = dative, ACCUSATIVE = accusative, INSTRUMENTAL = instrumental, PREPOSITIONAL = prepositional, "gender" = gender) + +/proc/ru_names_toml(name, prefix, suffix, override_base) + . = list() if(!length(GLOB.ru_names)) var/toml_path = "[PATH_TO_TRANSLATE_DATA]/ru_names.toml" if(!fexists(file(toml_path))) GLOB.ru_names = list("ERROR" = "File not found!") - return + return . GLOB.ru_names = rustg_read_toml_file("[PATH_TO_TRANSLATE_DATA]/ru_names.toml") if(GLOB.ru_names[name]) - return RU_NAMES_LIST( - "[prefix][name][suffix]", + var/base = override_base || "[prefix][name][suffix]" + . = ru_names_list( + base, "[prefix][GLOB.ru_names[name]["nominative"]][suffix]", "[prefix][GLOB.ru_names[name]["genitive"]][suffix]", "[prefix][GLOB.ru_names[name]["dative"]][suffix]", "[prefix][GLOB.ru_names[name]["accusative"]][suffix]", "[prefix][GLOB.ru_names[name]["instrumental"]][suffix]", - "[prefix][GLOB.ru_names[name]["prepositional"]][suffix]") + "[prefix][GLOB.ru_names[name]["prepositional"]][suffix]", + gender = "[GLOB.ru_names[name]["gender"]]",) /atom/Initialize(mapload, ...) . = ..() @@ -38,9 +47,11 @@ GLOBAL_LIST_EMPTY(ru_names) /atom/ru_names_rename(list/new_list) if(!length(new_list)) return - if(length(new_list) != RU_NAMES_LENGTH) - CRASH("proc/ru_names_rename() received incorrect list!") ru_names = new_list + if(new_list["gender"]) + gender = new_list["gender"] + else + gender = src::gender /** * Процедура выбора правильного падежа для любого предмета, если у него указан словарь «ru_names», примерно такой: @@ -54,6 +65,8 @@ GLOBAL_LIST_EMPTY(ru_names) var/list/list_to_use = ru_names_override || ru_names if(length(list_to_use) && list_to_use["base"] == ru_names["base"] && list_to_use[case_id]) return list_to_use[case_id] + if(case_id == "gender") + return return name /// Used for getting initial values, such as for recipies where resulted atom is not yet created. diff --git a/modular_ss220/translations/code/translate_data/ru_emotes.toml b/modular_ss220/translations/code/translate_data/ru_emotes.toml new file mode 100644 index 0000000000000..adde2b6b8a912 --- /dev/null +++ b/modular_ss220/translations/code/translate_data/ru_emotes.toml @@ -0,0 +1,347 @@ +[emote_messages] +"activates their slow clap processor." = "activates their slow clap processor." +"acts out a burp." = "изображает отрыжку." +"acts out a roar." = "изображает рык." +"acts out a scream!" = "изображает крик!" +"acts out an exaggerated cough!" = "изображает преувеличенный кашель!" +"acts out an exaggerated silent sigh." = "изображает преувеличенный бесшумный вздох." +"acts out an exaggerated silent sneeze." = "изображает преувеличенный бесшумный чих." +"acts out an exaggerated silent yawn." = "изображает преувеличенный бесшумный зевок." +"acts out chuckling." = "изображает смешок." +"appears hurt." = "кажется, задет." +"appears to groan!" = "изображает болезненный стон!" +"appears to moan!" = "кажется, стонет!" +"beeps at %t." = "издает сигнал в сторону %t." +"beeps." = "издает сигнал." +"blares an alarm!" = "blares an alarm!" +"blinks rapidly." = "быстро моргает." +"blinks their lights." = "blinks their lights." +"blinks." = "моргает." +"bloops!" = "bloops!" +"blushes." = "краснеет." +"boops." = "boops." +"bounces in place." = "подпрыгивает на месте." +"bows to %t." = "кланяется %t." +"bows." = "кланяется." +"breathes in." = "делает вдох." +"breathes out." = "выдыхает." +"burps." = "рыгает." +"buzzes at %t." = "buzzes at %t." +"buzzes twice." = "buzzes twice." +"buzzes." = "buzzes." +"chimes." = "chimes." +"chirps!" = "chirps!" +"chitters pleasantly!" = "chitters pleasantly!" +"chitters." = "chitters." +"chokes silently!" = "бесшумно давится!" +"chokes!" = "давится!" +"chuckles." = "усмехается." +"clacks happily!" = "clacks happily!" +"claps." = "хлопает." +"clears their throat." = "прочищает горло." +"clucks happily!" = "clucks happily!" +"collapses!" = "падает!" +"coughs!" = "кашляет!" +"cracks their knuckles." = "хрустит пальцами." +"cries." = "плачет." +"crosses their arms." = "скрещивает свои руки." +"dances around happily." = "радостно танцует." +"drools." = "пускает слюни." +"faints." = "теряет сознание." +"flaps their wings ANGRILY!" = "сердито хлопает крыльями!" +"flaps their wings." = "хлопает крыльями." +"frowns." = "хмурится." +"gags silently." = "gags silently." +"gags." = "gags." +"gasps in shock!" = "вздыхает в шоке!" +"gasps in silent shock!" = "вздыхает в молчаливом шоке!" +"gasps silently!" = "бесшумно задыхается!" +"gasps!" = "задыхается!" +"giggles silently!" = "бесшумно хихикает!" +"giggles." = "хихикает." +"gives daps to %t." = "give daps to %t." +"glares at %t." = "сверлит взглядом %t." +"glares." = "сверлит взглядом." +"gnarls and shows its teeth..." = "оскаливается и показывает зубы..." +"gnarls silently, baring its teeth..." = "бесшумно оскаливается, показывая зубы..." +"goes pale for a second." = "на мгновение бледнеет." +"grimaces." = "строит гримасу." +"grins smugly." = "самодовольно улыбается." +"grins." = "ухмыляется." +"groans!" = "болезненно стонет!" +"grumbles silently!" = "бесшумно ворчит!" +"grumbles!" = "ворчит!" +"gurgles silently and uncomfortably." = "бесшумно и неприятно булькает." +"hisses softly." = "тихо шипит." +"hisses." = "шипит." +"honks happily!" = "honks happily!" +"honks." = "honks." +"hops around happily!" = "hops around happily!" +"hugs %t." = "обнимает %t." +"hugs themself." = "обнимает себя." +"is strumming the air and headbanging like a safari chimp." = "невероятно играет на воображаемой гитаре." +"jiggles!" = "трясется!" +"jumps!" = "jumps!" +"laughs silently!" = "бесшумно смеется!" +"laughs." = "смеется." +"lets out a distressed noise." = "lets out a distressed noise." +"lets out a faint chimper as it collapses and stops moving..." = "издает слабый визг, когда рушится и перестает двигаться..." +"lets out a sickly hiss of air and falls limply to the floor..." = "с тошнотворным шипением выдыхает воздух и падает на пол..." +"lets out a waning guttural screech, and collapses onto the floor..." = "издает ослабевающий гортанный крик и падает на пол..." +"lights up for a bit, then stops." = "на мгновение светится." +"looks at %t." = "смотрит на %t." +"looks." = "смотрит." +"makes a rude gesture!" = "делает грубый жест!" +"makes an uncomfortable gurgle." = "издает неприятное бульканье." +"meows!" = "meows!" +"moans!" = "стонет!" +"moos happily!" = "moos happily!" +"mumbles silently!" = "бесшумно бормочет!" +"mumbles!" = "бормочет!" +"nods at %t." = "кивает %t." +"nods." = "кивает." +"oinks!" = "oinks!" +"oogas at %t." = "oogas at %t." +"oogas." = "oogas." +"pings at %t." = "pings at %t." +"pings." = "pings." +"plays a loud tone." = "plays a loud tone." +"plays a sad trombone..." = "plays a sad trombone..." +"points at %t." = "указывает на %t." +"points." = "указывает." +"pouts silently." = "бесшумно надувает губы." +"pouts." = "надувает губы." +"purrs." = "purrs." +"pushes up their glasses." = "pushes up their glasses." +"puts their hands on their head and falls to the ground, they surrender%s!" = "ложит руки за голову и падает на землю, они сдаются!" +"raises %t fingers." = "показывает %t пальцев." +"raises a hand." = "поднимает руку." +"raises an eyebrow." = "приподнимает бровь." +"roars!" = "рычит!" +"roars." = "рычит." +"rolls." = "катится." +"sadly can't find anybody to give daps to, and daps themself. Shameful." = "sadly can't find anybody to give daps to, and daps themself. Shameful." +"salutes to %t." = "салютует %t." +"salutes." = "салютует." +"says a swear word!" = "ругается!" +"scowls." = "сердито смотрит." +"scratches." = "чешется." +"screams!" = "кричит!" +"screeches silently." = "бесшумно визжит." +"screeches!" = "визжит!" +"screeches, its screen flickering as its systems slowly halt." = "скрипит, экран мерцает, пока системы медленно выключаются." +"seizes up and falls limp, their eyes dead and lifeless..." = "цепенеет и расслабляется, взгляд становится пустым и безжизненным..." +"shakes hands with %t." = "дает рукопожатие %t." +"shakes their head." = "качает своей головой." +"shakes their own hands." = "дает рукопожатие себе." +"shivers." = "дрожит." +"shrugs." = "пожимает плечами." +"shudders violently for a moment before falling still, its eyes slowly darkening." = "на мгновение вздрагивает и замирает, глаза медленно темнеют." +"sighs." = "вздыхает." +"signs the number %t." = "показывает число %t." +"sings a tune." = "подпевает мелодию." +"sits down." = "садится." +"sleeps soundly." = "бесшумно храпит." +"slowly smiles!" = "slowly smiles!" +"smiles weakly." = "слабо улыбается." +"smiles." = "улыбается." +"snaps their fingers at %t." = "щелкает пальцами в сторону %t." +"snaps their fingers." = "щелкает пальцами." +"sneezes." = "чихает." +"sniffs silently." = "бесшумно шмыгает носом." +"sniffs." = "шмыгает носом." +"snores." = "храпит." +"sobs silently." = "бесшумно плачет." +"softly roars." = "тихо рычит." +"sounds an alarm." = "sounds an alarm." +"squeak!" = "squeak!" +"squeaks!" = "squeaks!" +"stares at %t." = "уставился на %t." +"stares." = "уставился." +"sticks its tongue out contentedly!" = "sticks its tongue out contentedly!" +"stops moving..." = "перестает двигаться..." +"stretches their arms." = "протягивает свои руки." +"sulks down sadly." = "грустно обижается." +"sways around dizzily." = "покачивается." +"symphathetically yawns." = "symphathetically yawns." +"taunts!" = "taunts!" +"their tail." = "хвостом." +"their wings." = "their wings." +"tilts their head to the side." = "наклоняет голову на бок." +"trembles!" = "дрожит в страхе!" +"twitches violently." = "сильно дергается." +"twitches." = "дергается." +"vibrates!" = "вибрирует!" +"waves their tail." = "машет хвостом." +"waves." = "машет рукой." +"whickers." = "whickers." +"whimpers." = "хнычет." +"whistles silently!" = "whistles silently!" +"whistles." = "whistles." +"winks." = "подмигивает." +"woofs happily!" = "woofs happily!" +"yaps happily!" = "yaps happily!" +"yawns." = "зевает." + +[emote_names] +airguitar = "гитарист" +alarm = "насторожить" +alert = "предупредить" +awesome = "Э.: крутость" +beep = "сигналить" +blank = "Э.: пусто" +blink = "моргнуть" +"blink (rapid)" = "моргнуть (быстро)" +bloop = "bloop" +blueglow = "Э.: синее свечение" +blush = "краснеть" +boop = "boop" +bounce = "подпрыгнуть" +bow = "поклон" +bsod = "Э.: BSoD" +burp = "рыгнуть" +buzz = "жужжать" +buzz2 = "жужжать (раздражённо)" +chime = "chime" +chirp = "чирикать" +chitter = "chitter" +choke = "подавиться" +chuckle = "усмехаться" +circle = "рука (кольцо)" +clack = "clack" +clap = "хлопать" +clear = "прочистить горло" +cluck = "cluck" +collapse = "упасть" +confused = "Э.: замешательство" +cough = "покашлять" +crack = "хрустеть пальцами" +cross = "скрестить руки" +cry = "плакать" +dance = "танцевать" +dap = "dap" +deathgasp = "последнее дыхание" +dorfy = "Э.: Dorfy" +drool = "пускать слюни" +exhale = "выдох" +eyebrow = "приподнять бровь" +facepalm = "Э.: Facepalm" +faint = "потерять сознание" +flap = "крылья (хлопать)" +"flap (angry)" = "крылья (сердито хлопать)" +flash = "flash" +flip = "кувырок" +friendcomputer = "Э.: дружелюбный компьютер" +frown = "похмуриться" +gag = "gag" +gasp = "задохнуться" +"gasp (shock)" = "вздох (шок)" +giggle = "похихикать" +glare = "сверление взглядом" +glasses = "glasses" +gnarl = "оскалиться" +grimace = "гримасничать" +grin = "ухмыльнуться" +groan = "простонать от боли" +grumble = "ворчать" +gurgle = "булькать" +hand = "рука" +handshake = "рукопожатие" +happy = "Э.: радостно" +help = "help" +hiss = "шипеть" +honk = "honk" +hop = "hop" +hug = "обнять" +inhale = "вдох" +jiggle = "трястись" +jump = "jump" +kiss = "поцелуй" +laugh = "смеяться" +light = "светиться" +look = "смотреть" +me = "me" +meow = "meow" +moan = "стонать" +moo = "moo" +moodangry = "Н.: злой" +moodcat = "Н.: кот" +moodnone = "Н.: никакое" +moodpout = "Н.: надутый" +moodsad = "Н.: грустный" +moodsmile = "Н.: улыбающееся" +moodsneaky = "Н.: хитрое" +mumble = "бормотать" +neutral = "Э.: нейтральность" +nod = "кивнуть" +noogie = "рука (терка)" +notice = "notice" +oink = "oink" +ooga = "ooga" +pale = "бледнеть" +ping = "ping" +point = "указать" +pout = "надуть губы" +purr = "purr" +raise = "поднять руку" +redglow = "Э.: красное свечение" +roar = "рычать" +roll = "катиться" +sad = "Э.: грусть" +salute = "салютировать" +scowl = "смотреть (сердито)" +scratch = "чесаться" +scream = "кричать" +screech = "визжать" +shake = "качать головой" +shiver = "дрожь" +shoesteal = "рука (ботинкокрад)" +shrug = "пожать плечами" +sigh = "вздох" +sign = "показать число" +signal = "показать пальцы" +sit = "сесть" +slap = "рука (шлепок)" +slowclap = "slowclap" +smile = "улыбнуться" +"smile (weak)" = "улыбнуться (слабо)" +smug = "улыбнуться (самодовольно)" +snap = "щелкнуть пальцами" +sneeze = "чихнуть" +sniff = "шмыгнуть" +snore = "храпеть" +snuffle = "нюхать" +spin = "крутиться" +squeak = "squeak" +squeaks = "squeaks" +ssmile = "ssmile" +stare = "уставиться" +stretch = "протянуть руки" +sulk = "обидеться" +surrender = "сдаться" +sway = "покачаться" +swear = "ругаться" +tail = "махать хвостом" +taunt = "taunt" +thinking = "Э.: задумчивость" +tilt = "наклонить голову" +tongue = "tongue" +tremble = "дрожь (страх)" +trollface = "Э.: Trollface" +tunesing = "подпевать" +twitch = "дернуться (сильно)" +"twitch (slight)" = "дернуться" +unsure = "Э.: неуверенность" +veryhappy = "Э.: радостно (очень)" +vibrate = "вибрировать" +wag = "махать хвостом" +warn = "warn" +wave = "помахать рукой" +whicker = "whicker" +whimper = "хныкать" +whistle = "whistle" +wing = "крылья" +wink = "подмигнуть" +woof = "woof" +yap = "yap" +yawn = "зевнуть" diff --git a/modular_ss220/translations/code/translate_data/ru_names.toml b/modular_ss220/translations/code/translate_data/ru_names.toml index 166f16e4042e9..aadfbc9f1b0ae 100644 --- a/modular_ss220/translations/code/translate_data/ru_names.toml +++ b/modular_ss220/translations/code/translate_data/ru_names.toml @@ -5,14 +5,9 @@ #accusative = "винительный" #instrumental = "творительный" #prepositional = "предложный" +#gender = "male" -["jaws of life"] -nominative = "челюсти жизни" -genitive = "челюстей жизни" -dative = "челюстям жизни" -accusative = "челюсти жизни" -instrumental = "челюстями жизни" -prepositional = "челюстях жизни" +# MARK: Uncategorized [holopad] nominative = "голопад" @@ -21,6 +16,7 @@ dative = "голопаду" accusative = "голопад" instrumental = "голопадом" prepositional = "голопаде" +gender = "male" ["secure holopad"] nominative = "защищенный голопад" @@ -94,22 +90,6 @@ instrumental = "воздушной сигнализацией" nominative = "воздушная сигнализация" prepositional = "воздушной сигнализации" -[alien] -accusative = "чужого" -dative = "чужому" -genitive = "чужого" -instrumental = "чужим" -nominative = "чужой" -prepositional = "чужом" - -["alien crowbar"] -accusative = "инопланетный лом" -dative = "инопланетному лому" -genitive = "инопланетного лома" -instrumental = "инопланетным ломом" -nominative = "инопланетный лом" -prepositional = "инопланетном ломе" - ["alien embryo"] accusative = "эмбрион Чужих" dative = "эмбриону Чужих" @@ -118,78 +98,6 @@ instrumental = "эмбрионом Чужих" nominative = "эмбрион Чужих" prepositional = "эмбрионе Чужих" -["alien hunter"] -accusative = "охотника Чужих" -dative = "охотнику Чужих" -genitive = "охотника Чужих" -instrumental = "охотником Чужих" -nominative = "охотник Чужих" -prepositional = "охотнике Чужих" - -["alien larva"] -accusative = "грудолома Чужих" -dative = "грудолому Чужих" -genitive = "грудолома Чужих" -instrumental = "грудоломом Чужих" -nominative = "грудолом Чужих" -prepositional = "грудоломе Чужих" - -["alien praetorian"] -accusative = "преторианца Чужих" -dative = "преторианцу Чужих" -genitive = "преторианца Чужих" -instrumental = "преторианцем Чужих" -nominative = "преторианец Чужих" -prepositional = "преторианце Чужих" - -["alien queen"] -accusative = "королеву Чужих" -dative = "королеве Чужих" -genitive = "королевы Чужих" -instrumental = "королевой Чужих" -nominative = "королева Чужих" -prepositional = "королеве Чужих" - -["alien screwdriver"] -accusative = "инопланетную отвёртку" -dative = "инопланетной отвёртке" -genitive = "инопланетной отвёртки" -instrumental = "инопланетной отвёрткой" -nominative = "инопланетная отвёртка" -prepositional = "инопланетной отвёртке" - -["alien sentinel"] -accusative = "стража Чужих" -dative = "стражу Чужих" -genitive = "стража Чужих" -instrumental = "стражем Чужих" -nominative = "страж Чужих" -prepositional = "страже Чужих" - -["alien welding tool"] -accusative = "инопланетный сварочный инструмент" -dative = "инопланетному сварочному инструменту" -genitive = "инопланетного сварочного инструмента" -instrumental = "инопланетным сварочным инструментом" -nominative = "инопланетный сварочный инструмент" -prepositional = "инопланетном сварочном инструменте" - -["alien wirecutters"] -accusative = "инопланетных кусачек" -dative = "инопланетным кусачкам" -genitive = "инопланетных кусачек" -instrumental = "инопланетными кусачками" -nominative = "инопланетные кусачки" -prepositional = "инопланетных кусачках" - -["alien wrench"] -accusative = "инопланетный гаечный ключ" -dative = "инопланетному гаечному ключу" -genitive = "инопланетного гаечного ключа" -instrumental = "инопланетным гаечным ключом" -nominative = "инопланетный гаечный ключ" -prepositional = "инопланетном гаечном ключе" - ["area power controller"] accusative = "локальный контроллер питания" dative = "локальному контроллеру питания" @@ -198,14 +106,6 @@ instrumental = "локальным контроллером питания" nominative = "локальный контроллер питания" prepositional = "локальном контроллере питания" -["automated screwdriver"] -accusative = "автоматическую отвёртку" -dative = "автоматической отвёртке" -genitive = "автоматической отвёртки" -instrumental = "автоматической отвёрткой" -nominative = "автоматическая отвёртка" -prepositional = "автоматической отвёртке" - [bananium] accusative = "бананиум" dative = "бананиуму" @@ -230,14 +130,6 @@ instrumental = "пустым кофе-картриджем" nominative = "пустой кофе-картридж" prepositional = "пустом кофе-картридже" -["bolter wrench"] -accusative = "затворный гаечный ключ" -dative = "затворному гаечному ключу" -genitive = "затворного гаечного ключа" -instrumental = "затворным гаечным ключом" -nominative = "затворный гаечный ключ" -prepositional = "затворном гаечном ключе" - ["bright shard"] accusative = "яркий осколок" dative = "яркому осколку" @@ -326,14 +218,6 @@ instrumental = "картриджем кофеварки - Caffè Generico" nominative = "картридж кофеварки - Caffè Generico" prepositional = "картридже кофеварки - Caffè Generico" -["combat wrench"] -accusative = "боевой гаечный ключ" -dative = "боевому гаечному ключу" -genitive = "боевого гаечного ключа" -instrumental = "боевым гаечным ключом" -nominative = "боевой гаечный ключ" -prepositional = "боевом гаечном ключе" - ["command intercom"] accusative = "интерком командования" dative = "интеркому командования" @@ -406,14 +290,6 @@ instrumental = "двойным крышлыком" nominative = "двойной крышлык" prepositional = "двойном крышлыке" -["double-barreled shotgun"] -accusative = "двуствольный дробовик" -dative = "двуствольному дробовику" -genitive = "двуствольного дробовика" -instrumental = "двуствольным дробовиком" -nominative = "двуствольный дробовик" -prepositional = "двуствольном дробовике" - ["drink showcase"] accusative = "витрину дла напитков" dative = "витрине дла напитков" @@ -430,22 +306,6 @@ instrumental = "сушилкой" nominative = "сушилка" prepositional = "сушилке" -["emergency crowbar"] -accusative = "аварийный лом" -dative = "аварийному лому" -genitive = "аварийного лома" -instrumental = "аварийным ломом" -nominative = "аварийный лом" -prepositional = "аварийном ломе" - -["emergency welding tool"] -accusative = "аварийный сварочный инструмент" -dative = "аварийному сварочному инструменту" -genitive = "аварийного сварочного инструмента" -instrumental = "аварийным сварочным инструментом" -nominative = "аварийный сварочный инструмент" -prepositional = "аварийном сварочном инструменте" - ["engineering crate"] accusative = "инженерный ящик" dative = "инженерному ящику" @@ -454,14 +314,6 @@ instrumental = "инженерным ящиком" nominative = "инженерный ящик" prepositional = "инженерном ящиком" -["experimental welding tool"] -accusative = "экспериментальный сварочный инструмент" -dative = "экспериментальному сварочному инструменту" -genitive = "экспериментального сварочного инструмента" -instrumental = "экспериментальным сварочным инструментом" -nominative = "экспериментальный сварочный инструмент" -prepositional = "экспериментальном сварочном инструменте" - ["fishing rod"] accusative = "удочку" dative = "удочке" @@ -558,14 +410,6 @@ instrumental = "шуруповёртом" nominative = "шуруповёрт" prepositional = "шуруповёрте" -["heavy crowbar"] -accusative = "тяжелый лом" -dative = "тяжелому лому" -genitive = "тяжелого лома" -instrumental = "тяжелым ломом" -nominative = "тяжелый лом" -prepositional = "тяжелом ломе" - [helmet] accusative = "шлем" dative = "шлему" @@ -574,22 +418,6 @@ instrumental = "шлемом" nominative = "шлем" prepositional = "шлеме" -["hydraulic crowbar"] -accusative = "гидравлический лом" -dative = "гидравлическому лому" -genitive = "гидравлического лома" -instrumental = "гидравлическим ломом" -nominative = "гидравлический лом" -prepositional = "гидравлическом ломе" - -["hydraulic wrench"] -accusative = "гидравлический гаечный ключ" -dative = "гидравлическому гаечному ключу" -genitive = "гидравлического гаечного ключа" -instrumental = "гидравлическим гаечным ключом" -nominative = "гидравлический гаечный ключ" -prepositional = "гидравлическом гаечном ключе" - ["ice cream vat"] accusative = "машину для мороженного" dative = "машине для мороженного" @@ -606,30 +434,6 @@ instrumental = "кофемашиной Impressa" nominative = "кофемашина Impressa" prepositional = "кофемашине Impressa" -["industrial welding tool"] -accusative = "промышленный сварочный инструмент" -dative = "промышленному сварочному инструменту" -genitive = "промышленного сварочного инструмента" -instrumental = "промышленным сварочным инструментом" -nominative = "промышленный сварочный инструмент" -prepositional = "промышленном сварочном инструменте" - -["insulated gloves"] -accusative = "пару изоляционных перчаток" -dative = "паре изоляционных перчаток" -genitive = "пары изоляционных перчаток" -instrumental = "парой изоляционных перчаток" -nominative = "пара изоляционных перчаток" -prepositional = "паре изоляционных перчаток" - -["integrated welding tool"] -accusative = "интегрированный сварочный инструмент" -dative = "интегрированному сварочному инструменту" -genitive = "интегрированного сварочного инструмента" -instrumental = "интегрированным сварочным инструментом" -nominative = "интегрированный сварочный инструмент" -prepositional = "интегрированном сварочном инструменте" - ["intercom frame"] accusative = "каркас интеркома" dative = "каркасу интеркома" @@ -646,14 +450,6 @@ instrumental = "железом" nominative = "железо" prepositional = "железе" -["jaws of death"] -accusative = "челюсти смерти" -dative = "челюстям смерти" -genitive = "челюстей смерти" -instrumental = "челюстями смерти" -nominative = "челюсти смерти" -prepositional = "челюстях смерти" - ["kitchen sink"] accusative = "кухонную раковину" dative = "кухонной раковине" @@ -662,14 +458,6 @@ instrumental = "кухонной раковиной" nominative = "кухонная раковина" prepositional = "кухонной раковине" -["large crowbar"] -accusative = "большой лом" -dative = "большому лому" -genitive = "большого лома" -instrumental = "большим ломом" -nominative = "большой лом" -prepositional = "большом ломе" - ["lizard plushie"] accusative = "плюшевую ящерицу" dative = "плюшевой ящерице" @@ -702,14 +490,6 @@ instrumental = "медицинским шприцемётом" nominative = "медицинский шприцемёт" prepositional = "медицинском шприцемёте" -["medical wrench"] -accusative = "медицинский гаечный ключ" -dative = "медицинскому гаечному ключу" -genitive = "медицинского гаечного ключа" -instrumental = "медицинским гаечным ключом" -nominative = "медицинский гаечный ключ" -prepositional = "медицинском гаечном ключе" - ["microwave oven"] accusative = "микроволновку" dative = "микроволновке" @@ -758,14 +538,6 @@ instrumental = "мифрилом" nominative = "мифрил" prepositional = "мифриле" -["old crowbar"] -accusative = "старый лом" -dative = "старому лому" -genitive = "старого лома" -instrumental = "старым ломом" -nominative = "старый лом" -prepositional = "старом ломе" - ["operating table"] accusative = "операционный стол" dative = "операционному столу" @@ -862,14 +634,6 @@ instrumental = "вантузом" nominative = "вантуз" prepositional = "вантузе" -["pocket crowbar"] -accusative = "карманный лом" -dative = "карманному лому" -genitive = "карманного лома" -instrumental = "карманным ломом" -nominative = "карманный лом" -prepositional = "карманном ломе" - ["potted plant"] accusative = "комнатное растение" dative = "комнатному растению" @@ -878,14 +642,6 @@ instrumental = "комнатным растением" nominative = "комнатное растение" prepositional = "комнатном растении" -["powered wirecutters"] -accusative = "электрических кусачек" -dative = "электрическим кусачкам" -genitive = "электрических кусачек" -instrumental = "электрическими кусачками" -nominative = "электрические кусачки" -prepositional = "электрических кусачках" - ["purple shard"] accusative = "фиолетовый осколок" dative = "фиолетовому осколку" @@ -950,14 +706,6 @@ instrumental = "усиленной стеной" nominative = "усиленная стена" prepositional = "усиленной стене" -[screwdriver] -accusative = "отвёртку" -dative = "отвёртке" -genitive = "отвёртки" -instrumental = "отвёрткой" -nominative = "отвёртка" -prepositional = "отвёртке" - [shard] accusative = "осколок" dative = "осколку" @@ -1126,14 +874,6 @@ instrumental = "широкополосным интеркомом синдика nominative = "широкополосный интерком синдиката" prepositional = "широкополосном интеркоме синдиката" -["telescopic baton"] -accusative = "телескопическую дубинку" -dative = "телескопической дубинке" -genitive = "телескопической дубинки" -instrumental = "телескопической дубинкой" -nominative = "телескопическая дубинка" -prepositional = "телескопической дубинке" - [titanium] accusative = "титан" dative = "титану" @@ -1150,14 +890,6 @@ instrumental = "титановым стеклом" nominative = "титановое стекло" prepositional = "титановом стекле" -["upgraded industrial welding tool"] -accusative = "улучшенный сварочный инструмент" -dative = "улучшенному сварочному инструменту" -genitive = "улучшенного сварочного инструмента" -instrumental = "улучшенным сварочным инструментом" -nominative = "улучшенный сварочный инструмент" -prepositional = "улучшенном сварочном инструменте" - [uranium] accusative = "уран" dative = "урану" @@ -1174,30 +906,6 @@ instrumental = "стеной" nominative = "стена" prepositional = "стене" -["welding tool"] -accusative = "сварочный инструмент" -dative = "сварочному инструменту" -genitive = "сварочного инструмента" -instrumental = "сварочным инструментом" -nominative = "сварочный инструмент" -prepositional = "сварочном инструменте" - -[wirebrush] -accusative = "проволочную щётку" -dative = "проволочной щётке" -genitive = "проволочной щётки" -instrumental = "проволочной щёткой" -nominative = "проволочная щётка" -prepositional = "проволочной щётке" - -[wirecutters] -accusative = "кусачек" -dative = "кусачкам" -genitive = "кусачек" -instrumental = "кусачками" -nominative = "кусачки" -prepositional = "кусачках" - ["wireless microwave oven"] accusative = "беспроводную микроволновку" dative = "беспроводной микроволновке" @@ -1206,18 +914,1242 @@ instrumental = "беспроводной микроволновкой" nominative = "беспроводная микроволновка" prepositional = "беспроводной микроволновке" +["briefcase"] +nominative = "портфель" +genitive = "портфеля" +dative = "портфелю" +accusative = "портфель" +instrumental = "портфелем" +prepositional = "портфеле" + +["suture"] +nominative = "шов" +genitive = "шва" +dative = "шву" +accusative = "шов" +instrumental = "швом" +prepositional = "шве" + +["slice of"] +nominative = "кусочек" +genitive = "кусочка" +dative = "кусочку" +accusative = "кусочек" +instrumental = "кусочком" +prepositional = "кусочке" +gender = "male" + +["hologram"] +nominative = "голограмма" +genitive = "голограммы" +dative = "голограмме" +accusative = "голограмму" +instrumental = "голограммой" +prepositional = "голограмме" +gender = "female" + +# MARK: Mobs. Uncategorized + +# MARK: Mobs. Aliens + +[alien] +nominative = "чужой" +genitive = "чужого" +dative = "чужому" +accusative = "чужого" +instrumental = "чужим" +prepositional = "чужом" +gender = "female" + +["alien drone"] +nominative = "дрон Чужих" +genitive = "дрона Чужих" +dative = "дрону Чужих" +accusative = "дрона Чужих" +instrumental = "дроном Чужих" +prepositional = "дроне Чужих" +gender = "female" + +["alien sentinel"] +nominative = "страж Чужих" +genitive = "стража Чужих" +dative = "стражу Чужих" +accusative = "стража Чужих" +instrumental = "стражем Чужих" +prepositional = "страже Чужих" +gender = "female" + +["alien hunter"] +nominative = "охотник Чужих" +genitive = "охотника Чужих" +dative = "охотнику Чужих" +accusative = "охотника Чужих" +instrumental = "охотником Чужих" +prepositional = "охотнике Чужих" +gender = "female" + +["alien larva"] +nominative = "грудолом Чужих" +genitive = "грудолома Чужих" +dative = "грудолому Чужих" +accusative = "грудолома Чужих" +instrumental = "грудоломом Чужих" +prepositional = "грудоломе Чужих" +gender = "female" + +["alien praetorian"] +nominative = "преторианец Чужих" +genitive = "преторианца Чужих" +dative = "преторианцу Чужих" +accusative = "преторианца Чужих" +instrumental = "преторианцем Чужих" +prepositional = "преторианце Чужих" +gender = "female" + +["alien queen"] +nominative = "королева Чужих" +genitive = "королевы Чужих" +dative = "королеве Чужих" +accusative = "королеву Чужих" +instrumental = "королевой Чужих" +prepositional = "королеве Чужих" +gender = "female" + +["alien princess"] +nominative = "принцесса Чужих" +genitive = "принцессы Чужих" +dative = "принцессе Чужих" +accusative = "принцессу Чужих" +instrumental = "принцессой Чужих" +prepositional = "принцессе Чужих" +gender = "female" + +# MARK: Machinery Uncategorized + +["slot machine"] +nominative = "слот-машина" +genitive = "слот-машины" +dative = "слот-машине" +accusative = "слот-машину" +instrumental = "слот-машиной" +prepositional = "слот-машине" +gender = "female" + +["restaurant portal"] +nominative = "ресторанный портал" +genitive = "ресторанного портала" +dative = "ресторанному порталу" +accusative = "ресторанный портал" +instrumental = "ресторанным порталом" +prepositional = "ресторанном портале" +gender = "male" + +["chem dispenser"] +nominative = "химический раздатчик" +genitive = "химического раздатчика" +dative = "химическому раздатчику" +accusative = "химического раздатчика" +instrumental = "химическим раздатчиком" +prepositional = "химическом раздатчике" +gender = "male" + +# MARK: Materials + ["wooden plank"] -accusative = "деревянную доску" -dative = "деревянной доске" +nominative = "деревянная доска" genitive = "деревянной доски" +dative = "деревянной доске" +accusative = "деревянную доску" instrumental = "деревянной доской" -nominative = "деревянная доска" prepositional = "деревянной доске" +gender = "female" + +# MARK: Structures + +["stool"] +nominative = "табурет" +genitive = "табурета" +dative = "табурету" +accusative = "табурет" +instrumental = "табуретом" +prepositional = "табурете" +gender = "male" + +["water tank"] +nominative = "бак с водой" +genitive = "бака с водой" +dative = "баку с водой" +accusative = "бак с водой" +instrumental = "баком с водой" +prepositional = "баке с водой" +gender = "male" + +["fuel tank"] +nominative = "бак с топливом" +genitive = "бака с топливом" +dative = "баку с топливом" +accusative = "бак с топливом" +instrumental = "баком с топливом" +prepositional = "баке с топливом" +gender = "male" + +# MARK: Weapons + +["temperature gun"] +nominative = "температурная винтовка" +genitive = "температурной винтовки" +dative = "температурной винтовке" +accusative = "температурную винтовку" +instrumental = "температурной винтовкой" +prepositional = "температурной винтовке" +gender = "male" + +["security temperature gun"] +nominative = "температурная винтовка охраны" +genitive = "температурной винтовки охраны" +dative = "температурной винтовке охраны" +accusative = "температурную винтовку охраны" +instrumental = "температурной винтовкой охраны" +prepositional = "температурной винтовке охраны" +gender = "male" + +["X-01 MultiPhase Energy Gun"] +nominative = "X-01 мультифазовый энергетический пистолет" +genitive = "X-01 мультифазового энергетического пистолета" +dative = "X-01 мультифазовому энергетическому пистолету" +accusative = "X-01 мультифазовый энергетический пистолет" +instrumental = "X-01 мультифазовым энергетическим пистолетом" +prepositional = "X-01 мультифазовом энергетическом пистолете" +gender = "male" + +["ion rifle"] +nominative = "ионная винтовка" +genitive = "ионной винтовки" +dative = "ионной винтовке" +accusative = "ионную винтовку" +instrumental = "ионной винтовкой" +prepositional = "ионной винтовке" +gender = "male" + +["ion carbine"] +nominative = "ионный карабин" +genitive = "ионного карабина" +dative = "ионному карабину" +accusative = "ионный карабин" +instrumental = "ионным карабином" +prepositional = "ионном карабине" +gender = "male" + +["X-ray laser gun"] +nominative = "рентгеновский карабин" +genitive = "рентгеновского карабина" +dative = "рентгеновскому карабину" +accusative = "рентгеновский карабин" +instrumental = "рентгеновским карабином" +prepositional = "рентгеновском карабине" +gender = "male" + +["advanced energy gun"] +nominative = "продвинутый энергетический карабин" +genitive = "продвинутого энергетического карабина" +dative = "продвинутому энергетическому карабину" +accusative = "продвинутый энергетический карабин" +instrumental = "продвинутым энергетическим карабином" +prepositional = "продвинутом энергетическом карабине" +gender = "male" + +["proto-kinetic accelerator"] +nominative = "протокинетический акселератор" +genitive = "протокинетического акселератора" +dative = "протокинетическому акселератору" +accusative = "протокинетический акселератор" +instrumental = "протокинетическим акселератором" +prepositional = "протокинетическом акселераторе" +gender = "male" + +["disabler"] +nominative = "дизейблер" +genitive = "дизейблера" +dative = "дизейблеру" +accusative = "дизейблер" +instrumental = "дизейблером" +prepositional = "дизейблере" +gender = "male" + +["energy gun"] +nominative = "энергетический карабин" +genitive = "энергетического карабина" +dative = "энергетическому карабину" +accusative = "энергетический карабин" +instrumental = "энергетическим карабином" +prepositional = "энергетическом карабине" +gender = "male" + +["laser gun"] +nominative = "лазерный карабин" +genitive = "лазерного карабина" +dative = "лазерному карабину" +accusative = "лазерный карабин" +instrumental = "лазерным карабином" +prepositional = "лазерном карабине" +gender = "male" + +["laser carbine"] +nominative = "автоматический лазерный карабин" +genitive = "автоматического лазерного карабина" +dative = "автоматическому лазерному карабину" +accusative = "автоматический лазерный карабин" +instrumental = "автоматическим лазерным карабином" +prepositional = "автоматическом лазерном карабине" +gender = "male" + +["miniature energy gun"] +nominative = "миниатюрный энергетический пистолет" +genitive = "миниатюрного энергетического пистолета" +dative = "миниатюрному энергетическому пистолету" +accusative = "миниатюрный энергетический пистолет" +instrumental = "миниатюрным энергетическим пистолетом" +prepositional = "миниатюрном энергетическом пистолете" +gender = "male" + +["antique laser gun"] +nominative = "антикварный лазерный пистолет" +genitive = "антикварного лазерного пистолета" +dative = "антикварному лазерному пистолету" +accusative = "антикварный лазерный пистолет" +instrumental = "антикварным лазерным пистолетом" +prepositional = "антикварном лазерном пистолете" +gender = "male" + +["floral somatoray"] +nominative = "цветочный соматолуч" +genitive = "цветочного соматолуча" +dative = "цветочному соматолучу" +accusative = "цветочный соматолуч" +instrumental = "цветочным соматолучом" +prepositional = "цветочном соматолуче" +gender = "male" + +["bluespace wormhole projector"] +nominative = "блуспейс проектор червоточин" +genitive = "блуспейс проектора червоточи" +dative = "блуспейс проектору червоточин" +accusative = "блуспейс проектор червоточин" +instrumental = "блуспейс проектором червоточин" +prepositional = "блуспейс проекторе червоточин" +gender = "male" + +["energy crossbow"] +nominative = "энергетический арбалет" +genitive = "энергетического арбалета" +dative = "энергетическому арбалету" +accusative = "энергетический арбалет" +instrumental = "энергетическим арбалетом" +prepositional = "энергетическом арбалете" +gender = "male" + +["mini energy crossbow"] +nominative = "мини-энергетический арбалет" +genitive = "мини-энергетического арбалета" +dative = "мини-энергетическому арбалету" +accusative = "мини-энергетический арбалет" +instrumental = "мини-энергетическим арбалетом" +prepositional = "мини-энергетическом арбалете" +gender = "male" + +["pulse rifle"] +nominative = "пульсовый карабин" +genitive = "пульсового карабина" +dative = "пульсовому карабину" +accusative = "пульсовый карабин" +instrumental = "пульсовым карабином" +prepositional = "пульсовом карабине" +gender = "male" + +["laser musket"] +nominative = "лазерный мушкет" +genitive = "лазерного мушкета" +dative = "лазерному мушкету" +accusative = "лазерный мушкет" +instrumental = "лазерным мушкетом" +prepositional = "лазерном мушкете" +gender = "male" + +["heroic laser musket"] +nominative = "героический лазерный мушкет" +genitive = "героического лазерного мушкета" +dative = "героическому лазерному мушкету" +accusative = "героический лазерный мушкет" +instrumental = "героическим лазерным мушкетом" +prepositional = "героическом лазерном мушкете" +gender = "male" + +["smoothbore disabler"] +nominative = "гладкоствольный дизейблер" +genitive = "гладкоствольного дизейблера" +dative = "гладкоствольному дизейблеру" +accusative = "гладкоствольного дизейблера" +instrumental = "гладкоствольным дизейблером" +prepositional = "гладкоствольном дизейблере" +gender = "male" + +["elite smoothbore disabler"] +nominative = "элитный гладкоствольный дизейблер" +genitive = "элитного гладкоствольного дизейблера" +dative = "элитному гладкоствольному дизейблеру" +accusative = "элитного гладкоствольного дизейблера" +instrumental = "элитным гладкоствольным дизейблером" +prepositional = "элитном гладкоствольном дизейблере" +gender = "male" + +["alien pistol"] +nominative = "инопланетный пистолет" +genitive = "инопланетного пистолета" +dative = "инопланетному пистолету" +accusative = "инопланетный пистолет" +instrumental = "инопланетным пистолетом" +prepositional = "инопланетном пистолете" +gender = "male" + +["riot shotgun"] +nominative = "служебный дробовик" +genitive = "служебного дробовика" +dative = "служебному дробовику" +accusative = "служебный дробовик" +instrumental = "служебным дробовиком" +prepositional = "служебном дробовике" +gender = "male" + +["combat shotgun"] +nominative = "боевой дробовик" +genitive = "боевого дробовика" +dative = "боевому дробовику" +accusative = "боевой дробовик" +instrumental = "боевым дробовиком" +prepositional = "боевом дробовике" +gender = "male" + +["stun baton"] +nominative = "оглушающая дубинка" +genitive = "оглушающей дубинки" +dative = "оглушающей дубинке" +accusative = "оглушающую дубинку" +instrumental = "оглушающей дубинкой" +prepositional = "оглушающей дубинке" +gender = "female" + +["stunprod"] +nominative = "оглушающий прут" +genitive = "оглушающего прута" +dative = "оглушающему пруту" +accusative = "оглушающий прут" +instrumental = "оглушающим прутом" +prepositional = "оглушающем пруте" +gender = "male" + +["advanced baton"] +nominative = "высокотехнологическая дубинка" +genitive = "высокотехнологической дубинки" +dative = "высокотехнологической дубинке" +accusative = "высокотехнологическую дубинку" +instrumental = "высокотехнологической дубинкой" +prepositional = "высокотехнологической дубинке" +gender = "male" + +["plasma cutter"] +nominative = "плазменный резак" +genitive = "плазменного резака" +dative = "плазменному резаку" +accusative = "плазменного резака" +instrumental = "плазменным резаком" +prepositional = "плазменном резаке" +gender = "male" + +["advanced plasma cutter"] +nominative = "продвинутый плазменный резак" +genitive = "продвинутого плазменного резака" +dative = "продвинутому плазменному резаку" +accusative = "продвинутого плазменного резака" +instrumental = "продвинутым плазменным резаком" +prepositional = "продвинутом плазменном резаке" +gender = "male" + +["disabler smg"] +nominative = "дизейблер пистолет-пулемёт" +genitive = "дизейблера пистолет-пулемёт" +dative = "дизейблеру пистолет-пулемёт" +accusative = "дизейблера пистолет-пулемёт" +instrumental = "дизейблером пистолет-пулемёт" +prepositional = "дизейблере пистолет-пулемёт" +gender = "male" + +["kitchen knife"] +nominative = "кухонный нож" +genitive = "кухонного ножа" +dative = "кухонному ножу" +accusative = "кухонный нож" +instrumental = "кухонным ножом" +prepositional = "кухонном ноже" +gender = "male" + +["survival knife"] +nominative = "нож для выживания" +genitive = "ножа для выживания" +dative = "ножу для выживания" +accusative = "нож для выживания" +instrumental = "ножом для выживания" +prepositional = "ноже для выживания" +gender = "male" + +["combat knife"] +nominative = "боевой нож" +genitive = "боевого ножа" +dative = "боевому ножу" +accusative = "боевой нож" +instrumental = "боевым ножом" +prepositional = "боевом ноже" +gender = "male" + +["double-barreled shotgun"] +nominative = "двуствольный дробовик" +genitive = "двуствольного дробовика" +dative = "двуствольному дробовику" +accusative = "двуствольный дробовик" +instrumental = "двуствольным дробовиком" +prepositional = "двуствольном дробовике" +gender = "male" +["sawn-off"] +nominative = "обрез" +genitive = "обреза" +dative = "обрезу" +accusative = "обрез" +instrumental = "обрезом" +prepositional = "обрезе" +gender = "male" + +["telescopic baton"] +nominative = "телескопическая дубинка" +genitive = "телескопической дубинки" +dative = "телескопической дубинке" +accusative = "телескопическую дубинку" +instrumental = "телескопической дубинкой" +prepositional = "телескопической дубинке" +gender = "female" + +# MARK: Kitchen + +["pepper mill"] +nominative = "перцемолка" +genitive = "перцемолки" +dative = "перцемолке" +accusative = "перцемолку" +instrumental = "перцемолкой" +prepositional = "перцемолке" +gender = "female" + +# MARK: Botany + +["watering can"] +nominative = "лейка" +genitive = "лейки" +dative = "лейке" +accusative = "лейку" +instrumental = "лейкой" +prepositional = "лейке" +gender = "female" + +["cultivator"] +nominative = "рыхлитель" +genitive = "рыхлителя" +dative = "рыхлителю" +accusative = "рыхлитель" +instrumental = "рыхлителем" +prepositional = "рыхлителе" +gender = "male" + +["spade"] +nominative = "лопатка" +genitive = "лопатки" +dative = "лопатке" +accusative = "лопатку" +instrumental = "лопаткой" +prepositional = "лопатке" +gender = "female" + +["hatchet"] +nominative = "топорик" +genitive = "топорика" +dative = "топорику" +accusative = "топорик" +instrumental = "топориком" +prepositional = "топорике" +gender = "male" + +["plant bag"] +nominative = "сумка для растений" +genitive = "сумки для растений" +dative = "сумке для растений" +accusative = "сумку для растений" +instrumental = "сумкой для растений" +prepositional = "сумке для растений" +gender = "female" + +["secateurs"] +nominative = "секатор" +genitive = "секатора" +dative = "секатору" +accusative = "секатор" +instrumental = "секатором" +prepositional = "секаторе" +gender = "male" + +["hydroponics tray"] +nominative = "ботанический лоток" +genitive = "ботанического лотка" +dative = "ботаническому лотку" +accusative = "ботанический лоток" +instrumental = "ботаническим лотком" +prepositional = "ботаническом лотке" +gender = "male" + +["seed extractor"] +nominative = "экстрактор семян" +genitive = "экстрактора семян" +dative = "экстрактору семян" +accusative = "экстрактор семян" +instrumental = "экстрактором семян" +prepositional = "экстракторе семян" +gender = "male" + +["biogenerator"] +nominative = "биогенератор" +genitive = "биогенератора" +dative = "биогенератору" +accusative = "биогенератор" +instrumental = "биогенератором" +prepositional = "биогенераторе" +gender = "male" + +# MARK: Tools +# Fire Extinguisher +["fire extinguisher"] +nominative = "огнетушитель" +genitive = "огнетушителя" +dative = "огнетушителю" +accusative = "огнетушитель" +instrumental = "огнетушителем" +prepositional = "огнетушителе" +gender = "male" + +["pocket fire extinguisher"] +nominative = "карманный огнетушитель" +genitive = "карманного огнетушителя" +dative = "карманному огнетушителю" +accusative = "карманный огнетушитель" +instrumental = "карманным огнетушителем" +prepositional = "карманном огнетушителе" +gender = "male" + +["advanced fire extinguisher"] +nominative = "продвинутый огнетушитель" +genitive = "продвинутого огнетушителя" +dative = "продвинутому огнетушителю" +accusative = "продвинутый огнетушитель" +instrumental = "продвинутым огнетушителем" +prepositional = "продвинутом огнетушителе" +gender = "male" + +# Wrench [wrench] -accusative = "гаечный ключ" -dative = "гаечному ключу" +nominative = "гаечный ключ" genitive = "гаечного ключа" +dative = "гаечному ключу" +accusative = "гаечный ключ" instrumental = "гаечным ключом" -nominative = "гаечный ключ" prepositional = "гаечном ключе" +gender = "male" + +["alien wrench"] +nominative = "инопланетный гаечный ключ" +genitive = "инопланетного гаечного ключа" +dative = "инопланетному гаечному ключу" +accusative = "инопланетный гаечный ключ" +instrumental = "инопланетным гаечным ключом" +prepositional = "инопланетном гаечном ключе" +gender = "male" + +["medical wrench"] +nominative = "медицинский гаечный ключ" +genitive = "медицинского гаечного ключа" +dative = "медицинскому гаечному ключу" +accusative = "медицинский гаечный ключ" +instrumental = "медицинским гаечным ключом" +prepositional = "медицинском гаечном ключе" +gender = "male" + +["combat wrench"] +nominative = "боевой гаечный ключ" +genitive = "боевого гаечного ключа" +dative = "боевому гаечному ключу" +accusative = "боевой гаечный ключ" +instrumental = "боевым гаечным ключом" +prepositional = "боевом гаечном ключе" +gender = "male" + +["bolter wrench"] +nominative = "затворный гаечный ключ" +genitive = "затворного гаечного ключа" +dative = "затворному гаечному ключу" +accusative = "затворный гаечный ключ" +instrumental = "затворным гаечным ключом" +prepositional = "затворном гаечном ключе" +gender = "male" + +["hydraulic wrench"] +nominative = "гидравлический гаечный ключ" +genitive = "гидравлического гаечного ключа" +dative = "гидравлическому гаечному ключу" +accusative = "гидравлический гаечный ключ" +instrumental = "гидравлическим гаечным ключом" +prepositional = "гидравлическом гаечном ключе" +gender = "male" + +# Wirecutters +[wirecutters] +nominative = "кусачки" +genitive = "кусачек" +dative = "кусачкам" +accusative = "кусачек" +instrumental = "кусачками" +prepositional = "кусачках" +gender = "plural" + +["powered wirecutters"] +nominative = "электрические кусачки" +genitive = "электрических кусачек" +dative = "электрическим кусачкам" +accusative = "электрические кусачки" +instrumental = "электрическими кусачками" +prepositional = "электрических кусачках" +gender = "plural" + +["alien wirecutters"] +nominative = "инопланетные кусачки" +genitive = "инопланетных кусачек" +dative = "инопланетным кусачкам" +accusative = "инопланетные кусачки" +instrumental = "инопланетными кусачками" +prepositional = "инопланетных кусачках" +gender = "plural" + +# Crowbar +["pocket crowbar"] +nominative = "карманный лом" +genitive = "карманного лома" +dative = "карманному лому" +accusative = "карманный лом" +instrumental = "карманным ломом" +prepositional = "карманном ломе" +gender = "male" + +["large crowbar"] +nominative = "большой лом" +genitive = "большого лома" +dative = "большому лому" +accusative = "большой лом" +instrumental = "большим ломом" +prepositional = "большом ломе" +gender = "male" + +["alien crowbar"] +nominative = "инопланетный лом" +genitive = "инопланетного лома" +dative = "инопланетному лому" +accusative = "инопланетный лом" +instrumental = "инопланетным ломом" +prepositional = "инопланетном ломе" +gender = "male" + +["old crowbar"] +nominative = "старый лом" +genitive = "старого лома" +dative = "старому лому" +accusative = "старый лом" +instrumental = "старым ломом" +prepositional = "старом ломе" +gender = "male" + +["hydraulic crowbar"] +nominative = "гидравлический лом" +genitive = "гидравлического лома" +dative = "гидравлическому лому" +accusative = "гидравлический лом" +instrumental = "гидравлическим ломом" +prepositional = "гидравлическом ломе" +gender = "male" + +["heavy crowbar"] +nominative = "тяжелый лом" +genitive = "тяжелого лома" +dative = "тяжелому лому" +accusative = "тяжелый лом" +instrumental = "тяжелым ломом" +prepositional = "тяжелом ломе" +gender = "male" + +["emergency crowbar"] +genitive = "аварийного лома" +nominative = "аварийный лом" +dative = "аварийному лому" +accusative = "аварийный лом" +instrumental = "аварийным ломом" +prepositional = "аварийном ломе" +gender = "male" + +# Welding Tool +["welding tool"] +nominative = "сварочный инструмент" +genitive = "сварочного инструмента" +dative = "сварочному инструменту" +accusative = "сварочный инструмент" +instrumental = "сварочным инструментом" +prepositional = "сварочном инструменте" +gender = "male" + +["alien welding tool"] +nominative = "инопланетный сварочный инструмент" +genitive = "инопланетного сварочного инструмента" +dative = "инопланетному сварочному инструменту" +accusative = "инопланетный сварочный инструмент" +instrumental = "инопланетным сварочным инструментом" +prepositional = "инопланетном сварочном инструменте" +gender = "male" + +["upgraded industrial welding tool"] +nominative = "улучшенный сварочный инструмент" +genitive = "улучшенного сварочного инструмента" +dative = "улучшенному сварочному инструменту" +accusative = "улучшенный сварочный инструмент" +instrumental = "улучшенным сварочным инструментом" +prepositional = "улучшенном сварочном инструменте" +gender = "male" + +["integrated welding tool"] +nominative = "интегрированный сварочный инструмент" +genitive = "интегрированного сварочного инструмента" +dative = "интегрированному сварочному инструменту" +accusative = "интегрированный сварочный инструмент" +instrumental = "интегрированным сварочным инструментом" +prepositional = "интегрированном сварочном инструменте" +gender = "male" + +["emergency welding tool"] +nominative = "аварийный сварочный инструмент" +genitive = "аварийного сварочного инструмента" +dative = "аварийному сварочному инструменту" +accusative = "аварийный сварочный инструмент" +instrumental = "аварийным сварочным инструментом" +prepositional = "аварийном сварочном инструменте" +gender = "male" + +["experimental welding tool"] +nominative = "экспериментальный сварочный инструмент" +genitive = "экспериментального сварочного инструмента" +dative = "экспериментальному сварочному инструменту" +accusative = "экспериментальный сварочный инструмент" +instrumental = "экспериментальным сварочным инструментом" +prepositional = "экспериментальном сварочном инструменте" +gender = "male" + +["industrial welding tool"] +accusative = "промышленный сварочный инструмент" +genitive = "промышленного сварочного инструмента" +dative = "промышленному сварочному инструменту" +nominative = "промышленный сварочный инструмент" +instrumental = "промышленным сварочным инструментом" +prepositional = "промышленном сварочном инструменте" +gender = "male" + +# Screwdriver +[screwdriver] +nominative = "отвёртка" +genitive = "отвёртки" +dative = "отвёртке" +accusative = "отвёртку" +instrumental = "отвёрткой" +prepositional = "отвёртке" +gender = "female" + +["automated screwdriver"] +nominative = "автоматическая отвёртка" +genitive = "автоматической отвёртки" +dative = "автоматической отвёртке" +accusative = "автоматическую отвёртку" +instrumental = "автоматической отвёрткой" +prepositional = "автоматической отвёртке" +gender = "female" + +["alien screwdriver"] +nominative = "инопланетная отвёртка" +genitive = "инопланетной отвёртки" +dative = "инопланетной отвёртке" +accusative = "инопланетную отвёртку" +instrumental = "инопланетной отвёрткой" +prepositional = "инопланетной отвёртке" +gender = "female" + +# Other +["jaws of life"] +nominative = "челюсти жизни" +genitive = "челюстей жизни" +dative = "челюстям жизни" +accusative = "челюсти жизни" +instrumental = "челюстями жизни" +prepositional = "челюстях жизни" +gender = "plural" + +["jaws of death"] +nominative = "челюсти смерти" +genitive = "челюстей смерти" +dative = "челюстям смерти" +accusative = "челюсти смерти" +instrumental = "челюстями смерти" +prepositional = "челюстях смерти" +gender = "plural" + +# MARK: Engineering + +["insulated gloves"] +nominative = "изоляционные перчатки" +genitive = "изоляционных перчаток" +dative = "изоляционным перчаткам" +accusative = "изоляционные перчатки" +instrumental = "изоляционными перчатками" +prepositional = "изоляционных перчатках" +gender = "plural" + +[wirebrush] +nominative = "проволочная щётка" +genitive = "проволочной щётки" +dative = "проволочной щётке" +accusative = "проволочную щётку" +instrumental = "проволочной щёткой" +prepositional = "проволочной щётке" +gender = "female" + +# MARK: Janitor + +["galoshes"] +nominative = "галоши" +genitive = "галош" +dative = "галошам" +accusative = "галоши" +instrumental = "галошами" +prepositional = "галошах" +gender = "plural" + +# MARK: Stock parts +# Tier 1 +["capacitor"] +nominative = "конденсатор" +genitive = "конденсатора" +dative = "конденсатору" +accusative = "конденсатор" +instrumental = "конденсатором" +prepositional = "конденсаторе" +gender = "male" + +["scanning module"] +nominative = "сканирующий модуль" +genitive = "сканирующего модуля" +dative = "сканирующему модулю" +accusative = "сканирующий модуль" +instrumental = "сканирующим модулем" +prepositional = "сканирующем модуле" +gender = "male" + +["micro-servo"] +nominative = "микросервопривод" +genitive = "микросервопривода" +dative = "микросервоприводу" +accusative = "микросервопривод" +instrumental = "микросервоприводом" +prepositional = "микросервоприводе" +gender = "male" + +["micro-laser"] +nominative = "микролазер" +genitive = "микролазера" +dative = "микролазеру" +accusative = "микролазер" +instrumental = "микролазером" +prepositional = "микролазере" +gender = "male" + +["matter bin"] +nominative = "емкость материи" +genitive = "емкости материи" +dative = "емкости материи" +accusative = "емкость материи" +instrumental = "емкостью материи" +prepositional = "емкости материи" +gender = "female" + +# Tier 2 +["advanced capacitor"] +nominative = "улучшенный конденсатор" +genitive = "улучшенного конденсатора" +dative = "улучшенному конденсатору" +accusative = "улучшенный конденсатор" +instrumental = "улучшенным конденсатором" +prepositional = "улучшенном конденсаторе" +gender = "male" + +["advanced scanning module"] +nominative = "улучшенный сканирующий модуль" +genitive = "улучшенного сканирующего модуля" +dative = "улучшенному сканирующему модулю" +accusative = "улучшенный сканирующий модуль" +instrumental = "улучшенным сканирующим модулем" +prepositional = "улучшенном сканирующем модуле" +gender = "male" + +["nano-servo"] +nominative = "наносервопривод" +genitive = "наносервопривода" +dative = "наносервоприводу" +accusative = "наносервопривод" +instrumental = "наносервоприводом" +prepositional = "наносервоприводе" +gender = "male" + +["high-power micro-laser"] +nominative = "мощный микролазер" +genitive = "мощного микролазера" +dative = "мощному микролазеру" +accusative = "мощный микролазер" +instrumental = "мощным микролазером" +prepositional = "мощном микролазере" +gender = "male" + +["advanced matter bin"] +nominative = "улучшенная емкость материи" +genitive = "улучшенной емкости материи" +dative = "улучшенной емкости материи" +accusative = "улучшенную емкость материи" +instrumental = "улучшенной емкостью материи" +prepositional = "улучшенной емкости материи" +gender = "female" + +# Tier 3 +["super capacitor"] +nominative = "суперконденсатор" +genitive = "суперконденсатора" +dative = "суперконденсатору" +accusative = "суперконденсатор" +instrumental = "суперконденсатором" +prepositional = "суперконденсаторе" +gender = "male" + +["phasic scanning module"] +nominative = "фазовый сканирующий модуль" +genitive = "фазового сканирующего модуля" +dative = "фазовому сканирующему модулю" +accusative = "фазовый сканирующий модуль" +instrumental = "фазовым сканирующим модулем" +prepositional = "фазовом сканирующем модуле" +gender = "male" + +["pico-servo"] +nominative = "пикосервопривод" +genitive = "пикосервопривода" +dative = "пикосервоприводу" +accusative = "пикосервопривод" +instrumental = "пикосервоприводом" +prepositional = "пикосервоприводе" +gender = "male" + +["ultra-high-power micro-laser"] +nominative = "сверхмощный микролазер" +genitive = "сверхмощного микролазера" +dative = "сверхмощному микролазеру" +accusative = "сверхмощный микролазер" +instrumental = "сверхмощным микролазером" +prepositional = "сверхмощном микролазере" +gender = "male" + +["super matter bin"] +nominative = "суперемкость материи" +genitive = "суперемкости материи" +dative = "суперемкости материи" +accusative = "суперемкость материи" +instrumental = "суперемкостью материи" +prepositional = "суперемкости материи" +gender = "female" + +# Tier 4 +["quadratic capacitor"] +nominative = "квадратичный конденсатор" +genitive = "квадратичного конденсатора" +dative = "квадратичному конденсатору" +accusative = "квадратичный конденсатор" +instrumental = "квадратичным конденсатором" +prepositional = "квадратичном конденсаторе" +gender = "male" + +["triphasic scanning module"] +nominative = "трёхфазный сканирующий модуль" +genitive = "трёхфазного сканирующего модуля" +dative = "трёхфазному сканирующему модулю" +accusative = "трёхфазный сканирующий модуль" +instrumental = "трёхфазным сканирующим модулем" +prepositional = "о трёхфазном сканирующем модуле" +gender = "male" + +["femto-servo"] +nominative = "фемтосервопривод" +genitive = "фемтосервопривода" +dative = "фемтосервоприводу" +accusative = "фемтосервопривод" +instrumental = "фемтосервоприводом" +prepositional = "фемтосервоприводе" +gender = "male" + +["quad-ultra micro-laser"] +nominative = "квадроультра микролазер" +genitive = "квадроультра микролазера" +dative = "квадроультра микролазеру" +accusative = "квадроультра микролазер" +instrumental = "квадроультра микролазером" +prepositional = "квадроультра микролазере" +gender = "male" + +["bluespace matter bin"] +nominative = "блуспейс емкость материи" +genitive = "блуспейс емкости материи" +dative = "блуспейс емкости материи" +accusative = "блуспейс емкость материи" +instrumental = "блуспейс емкостью материи" +prepositional = "блуспейс емкости материи" +gender = "female" + +# RPED +["rapid part exchange device"] +nominative = "быстрозаменитель компонентов" +genitive = "быстрозаменителя компонентов" +dative = "быстрозаменителю компонентов" +accusative = "быстрозаменитель компонентов" +instrumental = "быстрозаменителем компонентов" +prepositional = "быстрозаменителе компонентов" +gender = "male" + +["bluespace rapid part exchange device"] +nominative = "блуспейс быстрозаменитель компонентов" +genitive = "блуспейс быстрозаменителя компонентов" +dative = "блуспейс быстрозаменителю компонентов" +accusative = "блуспейс быстрозаменитель компонентов" +instrumental = "блуспейс быстрозаменителем компонентов" +prepositional = "блуспейс быстрозаменителе компонентов" +gender = "male" + +# MARK: Organs + +["chest"] +nominative = "грудь" +genitive = "груди" +dative = "груди" +accusative = "грудь" +instrumental = "грудью" +prepositional = "груди" +gender = "female" + +["head"] +nominative = "голова" +genitive = "головы" +dative = "голове" +accusative = "голову" +instrumental = "головой" +prepositional = "голове" +gender = "female" + +["right arm"] +nominative = "правая рука" +genitive = "правой руки" +dative = "правой руке" +accusative = "правую руку" +instrumental = "правой рукой" +prepositional = "правой руке" +gender = "female" + +["right hand"] +nominative = "правое запястье" +genitive = "правого запястья" +dative = "правому запястью" +accusative = "правое запястье" +instrumental = "правым запястьем" +prepositional = "правом запястье" +gender = "female" + +["left arm"] +nominative = "левая рука" +genitive = "левой руки" +dative = "левой руке" +accusative = "левую руку" +instrumental = "левой рукой" +prepositional = "левой руке" +gender = "female" + +["left hand"] +nominative = "левое запястье" +genitive = "левое запястье" +dative = "левой руке" +accusative = "левую руку" +instrumental = "левой рукой" +prepositional = "левой руке" +gender = "female" + +["left leg"] +nominative = "левая нога" +genitive = "левой ноги" +dative = "левой ноге" +accusative = "левую ногу" +instrumental = "левой ногой" +prepositional = "левой ноге" +gender = "female" + +["left foot"] +nominative = "левая стопа" +genitive = "левой стопы" +dative = "левой стопе" +accusative = "левую стопу" +instrumental = "левой стопой" +prepositional = "левой стопе" +gender = "female" + +["right leg"] +nominative = "правая нога" +genitive = "правой ноги" +dative = "правой ноге" +accusative = "правую ногу" +instrumental = "правой ногой" +prepositional = "правой ноге" +gender = "female" + +["right foot"] +nominative = "правая стопа" +genitive = "правой стопы" +dative = "правой стопе" +accusative = "правую стопу" +instrumental = "правой стопой" +prepositional = "правой стопе" +gender = "female" + +["groin"] +nominative = "паховая область" +genitive = "паховой области" +dative = "паховой области" +accusative = "паховую область" +instrumental = "паховой областью" +prepositional = "паховой области" +gender = "female" diff --git a/modular_ss220/translations/code/translate_data/ru_verbs.toml b/modular_ss220/translations/code/translate_data/ru_verbs.toml index ff26a1690bf31..50695465d2e43 100644 --- a/modular_ss220/translations/code/translate_data/ru_verbs.toml +++ b/modular_ss220/translations/code/translate_data/ru_verbs.toml @@ -28,8 +28,8 @@ "brushes off" = "отмахивает" "bludgeon" = "дубасите" "bludgeons" = "дубасит" -"bust" = "презентуете бюст" -"busts" = "презентует бюст" +"bust" = "бюстируете" +"busts" = "бюстирует" "beckon" = "подзываете" "beckons" = "подзывает" "saw" = "пилите" @@ -37,7 +37,7 @@ "tear" = "разрываете" "tears" = "разрывает" "lacerate" = "терзаете" -"lacerates" = "терзать" +"lacerates" = "терзает" "cut" = "разрезаете" "cuts" = "разрезает" "chop" = "рубите" @@ -59,11 +59,11 @@ "judge" = "судите" "judges" = "судит" "dump" = "сбрасываете" -"dumps" = "сбрастывает" +"dumps" = "сбрасывает" "colour" = "раскрашиваете" "colours" = "раскрашивает" -"stab" = "вонзаетесь" -"stabs" = "вонзается" +"stab" = "вонзаете" +"stabs" = "вонзает" "slice" = "рассекаете" "slices" = "рассекает" "rip" = "распарываете" @@ -107,7 +107,7 @@ "carry" = "переносите" "carries" = "переносит" "impale" = "прокалываете" -"impales" = "прокалываете" +"impales" = "прокалывает" "pierce" = "пронзаете" "pierces" = "пронзает" "whomp" = "шлепаете" @@ -118,14 +118,14 @@ "eats" = "кушает" "fin slap" = "шлепаете плавником" "fin slaps" = "шлепает плавником" -"rent" = "сдаете" -"rents" = "сдает" -"claw" = "скребете" -"claws" = "скребет" +"rent" = "сдаёте" +"rents" = "сдаёт" +"claw" = "скребёте" +"claws" = "скребёт" "hiss" = "шипите на" "hisses" = "шипит на" -"tail slap" = "шлепаете хвостом" -"tail slaps" = "шлепает хвостом" +"tail slap" = "шлёпаете хвостом" +"tail slaps" = "шлёпает хвостом" "shoot" = "отстреливаете" "shoots" = "отстреливает" "nuke" = "ядрите" @@ -203,7 +203,7 @@ "grasp" = "сжимаете" "grasps" = "сжимает" "curse" = "проклинаете" -"curses" = "пролкинает" +"curses" = "проклинает" "club" = "дубасите" "clubs" = "дубасит" "vendor" = "вендорите" @@ -234,8 +234,8 @@ "skates" = "отскейтбордывает" "swat" = "прибиваете" "swats" = "прибивает" -"wallop" = "задаете трепку" -"wallops" = "задает трепку" +"wallop" = "задаёте трепку" +"wallops" = "задаёт трепку" "sock" = "влепливаете" "socks" = "влепливает" "touche" = "тушетуете" @@ -394,8 +394,8 @@ "winds" = "выветривает" "vacuum" = "вакуумируете" "vacuums" = "вакуумирует" -"shear" = "стрижете" -"shears" = "стрижет" +"shear" = "стрижёте" +"shears" = "стрижёт" "correct" = "вправляете" "corrects" = "вправляет" "properly set" = "поправляете" @@ -404,9 +404,11 @@ "pumps" = "фильтрует" "siphon" = "откачиваете" "siphons" = "откачивает" +"slash" = "режете" +"slashes" = "режет" # MARK: Organs "bashed" = "колотите" -"slashed" = "режите" +"slashed" = "режете" "kicked" = "пинаете" "stomped" = "растаптываете" "thump" = "стучите" @@ -453,8 +455,8 @@ # MARK: Basic "cheer up" = "подбадриваете" "cheers up" = "подбадривает" -"limply slap" = "слабо шлепаете" -"limply slaps" = "слабо шлепает" +"limply slap" = "слабо шлёпаете" +"limply slaps" = "слабо шлёпает" "YA-HONK" = "ЙА-ХОНКАЕТЕ" "YA-HONKs" = "ЙА-ХОНКАЕТ" "steal the girlfriend of" = "крадете девушку" @@ -635,18 +637,23 @@ "stares down" = "пристально смотрит на" "growl at" = "рычите на" "growls at" = "рычит на" -# MARK: Obj "ineffectively pierce" = "неэффективно пробиваете" "ineffectively pierces" = "неэффективно пробивает" # MARK: Eat Verbs [eat_verbs] -"bite" = "кусает" -"chew" = "жуёт" -"nibble" = "покусывает" -"gnaw" = "грызёт" -"gobble" = "пожирает" -"chomp" = "лопает" +"bite" = "кусаете" +"bites" = "кусает" +"chew" = "жуёте" +"chews" = "жуёт" +"nibble" = "покусываете" +"nibbles" = "покусывает" +"gnaw" = "грызёте" +"gnaws" = "грызёт" +"gobble" = "пожираете" +"gobbles" = "пожирает" +"chomp" = "лопаете" +"chomps" = "лопает" # MARK: Say Verbs [say_verbs] diff --git a/modular_ss220/translations/code/translate_emotes.dm b/modular_ss220/translations/code/translate_emotes.dm new file mode 100644 index 0000000000000..6932fa833bd1b --- /dev/null +++ b/modular_ss220/translations/code/translate_emotes.dm @@ -0,0 +1,23 @@ +/proc/ru_emote_name(emote_name) + return GLOB.ru_emote_names[lowertext(emote_name)] || emote_name + +/proc/ru_emote_message(emote_message) + return GLOB.ru_emote_messages[emote_message] || emote_message + +/datum/emote/proc/update_to_ru() + name = ru_emote_name(name) + message = ru_emote_message(message) + message_mime = ru_emote_message(message_mime) + message_alien = ru_emote_message(message_alien) + message_larva = ru_emote_message(message_larva) + message_robot = ru_emote_message(message_robot) + message_AI = ru_emote_message(message_AI) + message_monkey = ru_emote_message(message_monkey) + message_simple = ru_emote_message(message_simple) + message_observer = ru_emote_message(message_observer) + message_param = ru_emote_message(message_param) + +/datum/keybinding/emote/proc/update_to_ru() + // Need to finish the name list first, I'm not doing it right now + // name = capitalize(ru_emote_name(src::name)) + return diff --git a/modular_ss220/translations/code/~undefs.dm b/modular_ss220/translations/code/~undefs.dm index e83a6897e386a..dc5d069a16ab1 100644 --- a/modular_ss220/translations/code/~undefs.dm +++ b/modular_ss220/translations/code/~undefs.dm @@ -1,2 +1 @@ -#undef RU_NAMES_LENGTH #undef PATH_TO_TRANSLATE_DATA diff --git a/paradise.dme b/paradise.dme index 1b6236845d96a..5996d70381f27 100644 --- a/paradise.dme +++ b/paradise.dme @@ -433,7 +433,6 @@ #include "code\datums\components\cult_held_body.dm" #include "code\datums\components\deadchat_control.dm" #include "code\datums\components\debris.dm" -#include "code\datums\components\decal.dm" #include "code\datums\components\defibrillator.dm" #include "code\datums\components\ducttape.dm" #include "code\datums\components\edit_complainer.dm" @@ -529,6 +528,7 @@ #include "code\datums\elements\atmos_requirements.dm" #include "code\datums\elements\body_temperature.dm" #include "code\datums\elements\bombable_turf.dm" +#include "code\datums\elements\decal_element.dm" #include "code\datums\elements\earhealing.dm" #include "code\datums\elements\rad_insulation.dm" #include "code\datums\elements\ridable.dm" @@ -565,6 +565,7 @@ #include "code\datums\outfits\plasmamen_outfits.dm" #include "code\datums\outfits\vv_outfit.dm" #include "code\datums\ruins\lavaland.dm" +#include "code\datums\ruins\ruin_placer.dm" #include "code\datums\ruins\space_ruins.dm" #include "code\datums\ruins\bridges\bridges.dm" #include "code\datums\spell_cooldown\spell_charges.dm" @@ -835,7 +836,6 @@ #include "code\game\machinery\cell_charger.dm" #include "code\game\machinery\clonepod.dm" #include "code\game\machinery\clonescanner.dm" -#include "code\game\machinery\constructable_frame.dm" #include "code\game\machinery\cryopod.dm" #include "code\game\machinery\dance_machine.dm" #include "code\game\machinery\defib_mount.dm" @@ -853,6 +853,7 @@ #include "code\game\machinery\hologram.dm" #include "code\game\machinery\iv_drip.dm" #include "code\game\machinery\lightswitch.dm" +#include "code\game\machinery\machine_frame.dm" #include "code\game\machinery\machinery.dm" #include "code\game\machinery\magnetic_module.dm" #include "code\game\machinery\mass_driver.dm" @@ -1026,7 +1027,6 @@ #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" #include "code\game\objects\effects\spawners\depot_spawners.dm" #include "code\game\objects\effects\spawners\detgun_spawner.dm" #include "code\game\objects\effects\spawners\gibspawner.dm" @@ -1034,9 +1034,9 @@ #include "code\game\objects\effects\spawners\lootdrop.dm" #include "code\game\objects\effects\spawners\mess_spawners.dm" #include "code\game\objects\effects\spawners\random_barrier.dm" -#include "code\game\objects\effects\spawners\turf_spawners.dm" #include "code\game\objects\effects\spawners\vaultspawner.dm" #include "code\game\objects\effects\spawners\windowspawner.dm" +#include "code\game\objects\effects\spawners\random\decal_spawners.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" @@ -1044,7 +1044,9 @@ #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\spawners\random\pool\pool_spawner.dm" +#include "code\game\objects\effects\spawners\random\pool\spawn_pool.dm" +#include "code\game\objects\effects\spawners\random\pool\spawn_pool_manager.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" @@ -1161,6 +1163,7 @@ #include "code\game\objects\items\tools\welder.dm" #include "code\game\objects\items\tools\wirecutters.dm" #include "code\game\objects\items\tools\wrench.dm" +#include "code\game\objects\items\weapons\agent_id.dm" #include "code\game\objects\items\weapons\AI_modules.dm" #include "code\game\objects\items\weapons\alien_specific.dm" #include "code\game\objects\items\weapons\batons.dm" @@ -1414,6 +1417,7 @@ #include "code\game\verbs\switch_server.dm" #include "code\game\verbs\webmap.dm" #include "code\game\verbs\who.dm" +#include "code\goonstation\modules\power\power_transmission_laser\transmission_laser.dm" #include "code\modules\admin\admin_investigate.dm" #include "code\modules\admin\admin_memo.dm" #include "code\modules\admin\admin_ranks.dm" @@ -1592,10 +1596,10 @@ #include "code\modules\asset_cache\assets\asset_common.dm" #include "code\modules\asset_cache\assets\asset_emoji.dm" #include "code\modules\asset_cache\assets\asset_icon_ref_map.dm" +#include "code\modules\asset_cache\assets\asset_job_icons.dm" #include "code\modules\asset_cache\assets\asset_jquery.dm" #include "code\modules\asset_cache\assets\asset_materials.dm" #include "code\modules\asset_cache\assets\asset_nanomap.dm" -#include "code\modules\asset_cache\assets\asset_orbit_icons.dm" #include "code\modules\asset_cache\assets\asset_panels.dm" #include "code\modules\asset_cache\assets\asset_paper.dm" #include "code\modules\asset_cache\assets\asset_rpd.dm" @@ -1665,6 +1669,7 @@ #include "code\modules\awaymissions\mission_code\ruins\derelict5.dm" #include "code\modules\awaymissions\mission_code\ruins\gps_ruin.dm" #include "code\modules\awaymissions\mission_code\ruins\moonoutpost19.dm" +#include "code\modules\awaymissions\mission_code\ruins\nian_freighter.dm" #include "code\modules\awaymissions\mission_code\ruins\oldstation.dm" #include "code\modules\awaymissions\mission_code\ruins\processing_facility.dm" #include "code\modules\awaymissions\mission_code\ruins\snowbiodome.dm" @@ -1756,6 +1761,7 @@ #include "code\modules\clothing\masks\gasmask.dm" #include "code\modules\clothing\masks\misc_masks.dm" #include "code\modules\clothing\masks\voicemodulator.dm" +#include "code\modules\clothing\neck\cloaks.dm" #include "code\modules\clothing\patreon\hats.dm" #include "code\modules\clothing\patreon\patreon_glasses.dm" #include "code\modules\clothing\shoes\colour.dm" @@ -1869,7 +1875,6 @@ #include "code\modules\events\koi_mirgration.dm" #include "code\modules\events\mass_hallucination.dm" #include "code\modules\events\meaty_gore.dm" -#include "code\modules\events\meaty_ops.dm" #include "code\modules\events\meaty_ores.dm" #include "code\modules\events\meteors_event.dm" #include "code\modules\events\money_spam.dm" @@ -2398,6 +2403,7 @@ #include "code\modules\mob\living\simple_animal\hostile\carp.dm" #include "code\modules\mob\living\simple_animal\hostile\creature.dm" #include "code\modules\mob\living\simple_animal\hostile\deathsquid.dm" +#include "code\modules\mob\living\simple_animal\hostile\drakehound.dm" #include "code\modules\mob\living\simple_animal\hostile\faithless.dm" #include "code\modules\mob\living\simple_animal\hostile\feral_cat.dm" #include "code\modules\mob\living\simple_animal\hostile\floorcluwne.dm" @@ -2574,6 +2580,8 @@ #include "code\modules\pda\cart.dm" #include "code\modules\pda\cart_apps.dm" #include "code\modules\pda\core_apps.dm" +#include "code\modules\pda\games.dm" +#include "code\modules\pda\games\minesweeper.dm" #include "code\modules\pda\messenger.dm" #include "code\modules\pda\messenger_plugins.dm" #include "code\modules\pda\nanobank.dm" diff --git a/rustlibs.dll b/rustlibs.dll index 8e3733e8bf7c3..963afa5910ed4 100644 Binary files a/rustlibs.dll and b/rustlibs.dll differ diff --git a/rustlibs_prod.dll b/rustlibs_prod.dll new file mode 100644 index 0000000000000..355c4be354089 Binary files /dev/null and b/rustlibs_prod.dll differ diff --git a/sound/instruments/guitar/Ab2.ogg b/sound/instruments/guitar/Ab2.ogg new file mode 100644 index 0000000000000..a473a2c7e21e0 Binary files /dev/null and b/sound/instruments/guitar/Ab2.ogg differ diff --git a/sound/instruments/guitar/An2.ogg b/sound/instruments/guitar/An2.ogg new file mode 100644 index 0000000000000..87b13c655e1c4 Binary files /dev/null and b/sound/instruments/guitar/An2.ogg differ diff --git a/sound/instruments/guitar/Bb2.ogg b/sound/instruments/guitar/Bb2.ogg new file mode 100644 index 0000000000000..5020c31525591 Binary files /dev/null and b/sound/instruments/guitar/Bb2.ogg differ diff --git a/sound/instruments/guitar/Bn2.ogg b/sound/instruments/guitar/Bn2.ogg new file mode 100644 index 0000000000000..d5d72c573bee7 Binary files /dev/null and b/sound/instruments/guitar/Bn2.ogg differ diff --git a/sound/instruments/guitar/Cb3.ogg b/sound/instruments/guitar/Cb3.ogg new file mode 100644 index 0000000000000..87466e99099c0 Binary files /dev/null and b/sound/instruments/guitar/Cb3.ogg differ diff --git a/sound/instruments/guitar/Cn3.ogg b/sound/instruments/guitar/Cn3.ogg new file mode 100644 index 0000000000000..610011e763292 Binary files /dev/null and b/sound/instruments/guitar/Cn3.ogg differ diff --git a/sound/instruments/guitar/Db3.ogg b/sound/instruments/guitar/Db3.ogg new file mode 100644 index 0000000000000..3c1375b7afd3a Binary files /dev/null and b/sound/instruments/guitar/Db3.ogg differ diff --git a/sound/instruments/guitar/Dn3.ogg b/sound/instruments/guitar/Dn3.ogg new file mode 100644 index 0000000000000..4fc8cd101699c Binary files /dev/null and b/sound/instruments/guitar/Dn3.ogg differ diff --git a/sound/instruments/guitar/Eb3.ogg b/sound/instruments/guitar/Eb3.ogg new file mode 100644 index 0000000000000..6ad99d2189b03 Binary files /dev/null and b/sound/instruments/guitar/Eb3.ogg differ diff --git a/sound/instruments/guitar/En2.ogg b/sound/instruments/guitar/En2.ogg new file mode 100644 index 0000000000000..34fc445f86b5f Binary files /dev/null and b/sound/instruments/guitar/En2.ogg differ diff --git a/sound/instruments/guitar/Fb2.ogg b/sound/instruments/guitar/Fb2.ogg new file mode 100644 index 0000000000000..61cbcd966730e Binary files /dev/null and b/sound/instruments/guitar/Fb2.ogg differ diff --git a/sound/instruments/guitar/Fn2.ogg b/sound/instruments/guitar/Fn2.ogg new file mode 100644 index 0000000000000..c25552bb2d799 Binary files /dev/null and b/sound/instruments/guitar/Fn2.ogg differ diff --git a/sound/instruments/guitar/Gb2.ogg b/sound/instruments/guitar/Gb2.ogg new file mode 100644 index 0000000000000..ebd3de36a2a02 Binary files /dev/null and b/sound/instruments/guitar/Gb2.ogg differ diff --git a/sound/instruments/guitar/Gn2.ogg b/sound/instruments/guitar/Gn2.ogg new file mode 100644 index 0000000000000..d2d731c9bdd71 Binary files /dev/null and b/sound/instruments/guitar/Gn2.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/pgm_clean/c3.ogg b/sound/instruments/synthesis_samples/guitar/pgm_clean/c3.ogg new file mode 100644 index 0000000000000..d146459c1d9f0 Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/pgm_clean/c3.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/pgm_clean/c4.ogg b/sound/instruments/synthesis_samples/guitar/pgm_clean/c4.ogg new file mode 100644 index 0000000000000..c248375eb072e Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/pgm_clean/c4.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/pgm_clean/c5.ogg b/sound/instruments/synthesis_samples/guitar/pgm_clean/c5.ogg new file mode 100644 index 0000000000000..de3f5c7bf0031 Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/pgm_clean/c5.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/pgm_clean/c6.ogg b/sound/instruments/synthesis_samples/guitar/pgm_clean/c6.ogg new file mode 100644 index 0000000000000..2262fc40c0651 Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/pgm_clean/c6.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/pgm_clean/c7.ogg b/sound/instruments/synthesis_samples/guitar/pgm_clean/c7.ogg new file mode 100644 index 0000000000000..8f6a7c3c17054 Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/pgm_clean/c7.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn3.ogg b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn3.ogg new file mode 100644 index 0000000000000..f8976a2857d93 Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn3.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn4.ogg b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn4.ogg new file mode 100644 index 0000000000000..bb80c989bea70 Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn4.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn5.ogg b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn5.ogg new file mode 100644 index 0000000000000..0dfd2b7c8738f Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn5.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn6.ogg b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn6.ogg new file mode 100644 index 0000000000000..baed4e2ad3f92 Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn6.ogg differ diff --git a/tgui/bin/tgui_.ps1 b/tgui/bin/tgui_.ps1 index 87b919b1d6a56..c023b5e8fd66c 100644 --- a/tgui/bin/tgui_.ps1 +++ b/tgui/bin/tgui_.ps1 @@ -97,8 +97,7 @@ function task-clean { function task-validate-build { $diff = git diff --text public/* if ($diff) { - Write-Output "Error: our build differs from the build committed into git." - Write-Output "Please rebuild tgui." + Write-Output "::error file=tgui/public/tgui.bundle.js,title=Rebuild tgui bundle::Our build differs from the build committed into git." exit 1 } Write-Output "tgui: build is ok" diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-default.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-default.scss index 2b755c700cf61..29e97c1bc4266 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-default.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-default.scss @@ -584,6 +584,7 @@ h2.alert { color: #8282fb; } +// SS220 EDIT - .com-zvezhan -> .com-srus .com_srus { color: #7c4848; } diff --git a/tgui/packages/tgui/components/ImageButton.tsx b/tgui/packages/tgui/components/ImageButton.tsx index 37f0eb637d3a7..1c6a32c57a614 100644 --- a/tgui/packages/tgui/components/ImageButton.tsx +++ b/tgui/packages/tgui/components/ImageButton.tsx @@ -46,6 +46,8 @@ type Props = Partial<{ dmIcon: string | null; /** Parameter `icon_state` of component `DmIcon`. */ dmIconState: string | null; + /** Parameter `direction` of component `DmIcon`. */ + dmDirection: number | null; /** * Changes the layout of the button, making it fill the entire horizontally available space. * Allows the use of `title` @@ -81,6 +83,7 @@ export const ImageButton = (props: Props) => { color, disabled, dmFallback, + dmDirection, dmIcon, dmIconState, fluid, @@ -141,6 +144,7 @@ export const ImageButton = (props: Props) => { ( + + + + + + + + + + + + act('change_fingerprints', { new_fingerprints: value })} onClick={() => act('change_fingerprints', { option: 'Primary' })} + onRClick={(event) => { + event.preventDefault(); + act('change_fingerprints', { option: 'Secondary' }); + }} + tooltip={tooltipTextRandom} /> - + {BLOOD_TYPES.map((type) => ( @@ -157,53 +212,66 @@ export const AgentCardInfo = (props, context) => { act('change_dna_hash', { new_dna: value })} onClick={() => act('change_dna_hash', { option: 'Primary' })} - tooltip="Ввести своё ДНК." + onRClick={(event) => { + event.preventDefault(); + act('change_dna_hash', { option: 'Secondary' }); + }} + tooltip={tooltipTextRandom} /> act('change_money_account', { new_account: value })} onClick={() => act('change_money_account', { option: 'Primary' })} - tooltip="Ввести случайный набор цифр." + onRClick={(event) => { + event.preventDefault(); + act('change_money_account', { option: 'Secondary' }); + }} + tooltip={tooltipTextRandom} /> - - - -
+ +
- + act('delete_info')} /> - + act('clear_access')} /> - -
@@ -213,24 +281,29 @@ export const AgentCardInfo = (props, context) => { }; export const AgentCardAppearances = (props, context) => { - const { act, data } = useBackend(context); - const [selectedAppearance, setSelectedAppearance] = useSharedState(context, 'selectedAppearance', ''); - const { icon, appearances } = data; - + const { act, data } = useBackend(context); + const [selectedAppearance, setSelectedAppearance] = useSharedState(context, 'selectedAppearance', null); + const { appearances, id_icon } = data; return ( -
+
{appearances.map((appearance) => ( { setSelectedAppearance(appearance); - act('change_appearance', { new_appearance: appearance }); + act('change_appearance', { + new_appearance: appearance, + }); }} /> ))} diff --git a/tgui/packages/tgui/interfaces/Orbit.js b/tgui/packages/tgui/interfaces/Orbit.js index 119172ce7ae98..7a48e568ad51b 100644 --- a/tgui/packages/tgui/interfaces/Orbit.js +++ b/tgui/packages/tgui/interfaces/Orbit.js @@ -61,7 +61,7 @@ const OrbitedButton = (props, context) => { tooltip={ thing.assigned_role ? ( - {' '} + {' '} {thing.assigned_role} ) : ( diff --git a/tgui/packages/tgui/interfaces/ParticleAccelerator.js b/tgui/packages/tgui/interfaces/ParticleAccelerator.js index 5da78981a881f..0a22a0886cc7c 100644 --- a/tgui/packages/tgui/interfaces/ParticleAccelerator.js +++ b/tgui/packages/tgui/interfaces/ParticleAccelerator.js @@ -1,16 +1,55 @@ import { useBackend } from '../backend'; -import { Box, Button, LabeledList, Section } from '../components'; +import { + Box, + Button, + Grid, + LabeledList, + Section, + Stack, + ImageButton, + Flex, + Table, + Tooltip, + DmIcon, +} from '../components'; +import { capitalize } from 'common/string'; +import { GridColumn } from '../components/Grid'; +import { TableRow } from '../components/Table'; import { Window } from '../layouts'; +import { classes } from 'common/react'; +import { StationAlertConsole } from './StationAlertConsole'; + +const dir2text = (dir) => { + switch (dir) { + case 1.0: + return 'north'; + case 2.0: + return 'south'; + case 4.0: + return 'east'; + case 8.0: + return 'west'; + case 5.0: + return 'northeast'; + case 6.0: + return 'southeast'; + case 9.0: + return 'northwest'; + case 10.0: + return 'southwest'; + } + return ''; +}; export const ParticleAccelerator = (props, context) => { const { act, data } = useBackend(context); - const { assembled, power, strength, max_strength } = data; + const { assembled, power, strength, max_strength, icon, layout_1, layout_2, layout_3, orientation } = data; return ( - - + +
act('scan')} />} + buttons={
+ {assembled ? ( + '' + ) : ( +
+ {orientation === 0 ? ( + '' + ) : orientation === 'north' || orientation === 'south' ? ( + + ) : ( + + )} +
+ )} ); }; + +const LayoutHorizontal = (props, context) => { + const { act, data } = useBackend(context); + const { assembled, power, strength, max_strength, icon, layout_1, layout_2, layout_3, orientation } = data; + return ( + + + {(orientation === 'east' ? layout_1 : layout_3).slice().map((item) => ( + + + {item.name}
{`Status: ${item.status}`} +
+ {`Direction: ${dir2text(item.dir)}`} + + } + > + + + + ))} + + + {layout_2.slice().map((item) => ( + + + {item.name}
{`Status: ${item.status}`} +
+ {`Direction: ${dir2text(item.dir)}`} + + } + > + + + + ))} + + + {(orientation === 'east' ? layout_3 : layout_1).slice().map((item) => ( + + + {item.name}
{`Status: ${item.status}`} +
+ {`Direction: ${dir2text(item.dir)}`} + + } + > + + + + ))} + +
+ ); +}; + +const LayoutVertical = (props, context) => { + const { act, data } = useBackend(context); + const { assembled, power, strength, max_strength, icon, layout_1, layout_2, layout_3, orientation } = data; + return ( + + + {(orientation === 'north' ? layout_1 : layout_3).slice().map((item) => ( + + + {item.name}
{`Status: ${item.status}`} +
+ {`Direction: ${dir2text(item.dir)}`} + + } + > + + + + ))} + + + {layout_2.slice().map((item) => ( + + + {item.name}
{`Status: ${item.status}`} +
+ {`Direction: ${dir2text(item.dir)}`} + + } + > + + + + ))} + + + {(orientation === 'north' ? layout_3 : layout_1).slice().map((item) => ( + + + {item.name}
{`Status: ${item.status}`} +
+ {`Direction: ${dir2text(item.dir)}`} + + } + > + + + + ))} + + + ); +}; diff --git a/tgui/packages/tgui/interfaces/StripMenu.tsx b/tgui/packages/tgui/interfaces/StripMenu.tsx index 4d6f9a69d7324..38553001b81c3 100644 --- a/tgui/packages/tgui/interfaces/StripMenu.tsx +++ b/tgui/packages/tgui/interfaces/StripMenu.tsx @@ -95,7 +95,7 @@ const SLOTS: Record< > = { eyes: { displayName: 'eyewear', - gridSpot: getGridSpotKey([1, 0]), + gridSpot: getGridSpotKey([0, 0]), image: 'inventory-glasses.png', }, @@ -111,6 +111,12 @@ const SLOTS: Record< image: 'inventory-mask.png', }, + neck: { + displayName: 'neck', + gridSpot: getGridSpotKey([1, 0]), + image: 'inventory-neck.png', + }, + pet_collar: { displayName: 'collar', gridSpot: getGridSpotKey([1, 1]), @@ -237,7 +243,7 @@ const ALTERNATIVE_SLOTS: Record< > = { eyes: { displayName: 'eyewear', - gridSpot: getGridSpotKey([1, 0]), + gridSpot: getGridSpotKey([0, 0]), image: 'inventory-glasses.png', }, @@ -253,6 +259,12 @@ const ALTERNATIVE_SLOTS: Record< image: 'inventory-mask.png', }, + neck: { + displayName: 'neck', + gridSpot: getGridSpotKey([1, 0]), + image: 'inventory-neck.png', + }, + pet_collar: { displayName: 'collar', gridSpot: getGridSpotKey([1, 1]), diff --git a/tgui/packages/tgui/interfaces/goonstation_PTL/index.js b/tgui/packages/tgui/interfaces/goonstation_PTL/index.js new file mode 100644 index 0000000000000..3c0c828e82627 --- /dev/null +++ b/tgui/packages/tgui/interfaces/goonstation_PTL/index.js @@ -0,0 +1,177 @@ +/** + * @file + * @copyright 2020 + * @author Sovexe (https://github.com/Sovexe) + * @license ISC + */ + +import { useBackend } from '../../backend'; +import { Box, Button, Knob, LabeledList, NoticeBox, NumberInput, ProgressBar, Section, Stack } from '../../components'; +import { formatMoney, formatSiUnit, formatPower } from '../../format'; +import { Window } from '../../layouts'; + +export const goonstation_PTL = (props, context) => { + const { data } = useBackend(context); + const { total_earnings, total_energy, name = 'Power Transmission Laser' } = data; + return ( + + + + + + Earned Credits : {total_earnings ? formatMoney(total_earnings) : 0} + Energy Sold : {total_energy ? formatSiUnit(total_energy, 0, 'J') : '0 J'} + + + ); +}; + +const Status = (props, context) => { + const { data } = useBackend(context); + const { max_capacity, held_power, input_total, max_grid_load } = data; + + return ( +
+ + + {held_power ? formatSiUnit(held_power, 0, 'J') : '0 J'} + + + + + + + +
+ ); +}; + +const InputControls = (props, context) => { + const { act, data } = useBackend(context); + const { input_total, accepting_power, sucking_power, input_number, power_format } = data; + + return ( +
+ + act('toggle_input')}> + {accepting_power ? 'Enabled' : 'Disabled'} + + } + > + + {(sucking_power && 'Online') || (accepting_power && 'Idle') || 'Offline'} + + + {input_total ? formatPower(input_total) : '0 W'} + + + act('set_input', { set_input })} + /> + + + + + +
+ ); +}; + +const OutputControls = (props, context) => { + const { act, data } = useBackend(context); + const { output_total, firing, accepting_power, output_number, output_multiplier, target, held_power } = data; + + return ( +
+ + + + + + } + > + + {(firing && 'Online') || (accepting_power && 'Idle') || 'Offline'} + + + + {output_total + ? output_total < 0 + ? '-' + formatPower(Math.abs(output_total)) + : formatPower(output_total) + : '0 W'} + + + + act('set_output', { set_output })} + /> + + + +
+ ); +}; diff --git a/tgui/packages/tgui/interfaces/pda/pda_games.js b/tgui/packages/tgui/interfaces/pda/pda_games.js new file mode 100644 index 0000000000000..cd2ef28f395d7 --- /dev/null +++ b/tgui/packages/tgui/interfaces/pda/pda_games.js @@ -0,0 +1,33 @@ +import { useBackend } from '../../backend'; +import { Box, Button, ImageButton, Section } from '../../components'; +import { Icon, IconStack } from '../../components/Icon'; + +export const pda_games = (props, context) => { + const { act, data } = useBackend(context); + const { games } = data; + + const GetAppImage = (AppName) => { + switch (AppName) { + case 'Minesweeper': + return ( + + + + + ); + default: + return ; + } + }; + + return ( + + {games.map((game) => ( + + ))} + + ); +}; diff --git a/tgui/packages/tgui/interfaces/pda/pda_minesweeper.js b/tgui/packages/tgui/interfaces/pda/pda_minesweeper.js new file mode 100644 index 0000000000000..f143e2abdc5bb --- /dev/null +++ b/tgui/packages/tgui/interfaces/pda/pda_minesweeper.js @@ -0,0 +1,168 @@ +import { useBackend, useLocalState } from '../../backend'; +import { Box, Button, Stack, Section, Table, Icon } from '../../components'; + +export const pda_minesweeper = (props, context) => { + const { act, data } = useBackend(context); + + const [currentWindow, setWindow] = useLocalState(context, 'window', 'Game'); + + const AltWindow = { + 'Game': 'Leaderboard', + 'Leaderboard': 'Game', + }; + + return ( + + {currentWindow === 'Game' ? : } + + + + + ); +}; + +export const MineSweeperGame = (props, context) => { + const { act, data } = useBackend(context); + const { matrix, flags, bombs } = data; + + const NumColor = { + 1: 'blue', + 2: 'green', + 3: 'red', + 4: 'darkblue', + 5: 'brown', + 6: 'lightblue', + 7: 'black', + 8: 'white', + }; + + const handleClick = (row, cell, mode) => { + act('Square', { + 'X': row, + 'Y': cell, + 'mode': mode, + }); + }; + + return ( + + + {Object.keys(matrix).map((row) => ( + + {Object.keys(matrix[row]).map((cell) => ( + + ))} + + ))} + + + + + : {bombs} + + + + : {flags} + + + + + ); +}; + +export const MineSweeperLeaderboard = (props, context) => { + const { act, data } = useBackend(context); + const { leaderboard } = data; + const [sortId, _setSortId] = useLocalState(context, 'sortId', 'time'); + const [sortOrder, _setSortOrder] = useLocalState(context, 'sortOrder', false); + + return ( + + + Nick + Time + + {leaderboard && + leaderboard + .sort((a, b) => { + const i = sortOrder ? 1 : -1; + return a[sortId].localeCompare(b[sortId]) * i; + }) + .map((player, i) => ( + + {player.name} + {player.time} + + ))} +
+ ); +}; + +const SortButton = (properties, context) => { + const [sortId, setSortId] = useLocalState(context, 'sortId', 'time'); + const [sortOrder, setSortOrder] = useLocalState(context, 'sortOrder', false); + const { id, children } = properties; + return ( + + + + ); +}; diff --git a/tgui/packages/tgui/styles/interfaces/pda_minesweeper.scss b/tgui/packages/tgui/styles/interfaces/pda_minesweeper.scss new file mode 100644 index 0000000000000..038380faa44a4 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/pda_minesweeper.scss @@ -0,0 +1,40 @@ +@use '../base.scss'; +@use '../functions.scss' as *; + +.Minesweeper__closed { + vertical-align: middle; + background-color: lighten(base.$color-bg, 20%); + border: base.em(2px) outset lighten(base.$color-bg, 80%); +} + +.Minesweeper__open { + vertical-align: middle; + text-align: center; + font-size: medium; + background-color: lighten(base.$color-bg, 50%) !important; +} + +.Minesweeper__list { + tr > td { + text-align: center; + } + + tr:not(:first-child) { + height: 2em; + line-height: 1.75em; + transition: background-color 50ms; + cursor: pointer; + + &:hover, + &:focus { + background-color: rgba(base.$color-bg, 1); + } + } +} + +.Minesweeper__infobox { + max-height: 8em; + border: base.em(3px) outset lighten(base.$color-bg, 25%); + user-select: none; + -ms-user-select: none; // Remove with Byond 516 release +} diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss index 44bd254d93c7c..a510db31eb105 100644 --- a/tgui/packages/tgui/styles/main.scss +++ b/tgui/packages/tgui/styles/main.scss @@ -63,6 +63,7 @@ @include meta.load-css('./interfaces/OreRedemption.scss'); @include meta.load-css('./interfaces/PanDEMIC.scss'); @include meta.load-css('./interfaces/PDA.scss'); +@include meta.load-css('./interfaces/pda_minesweeper.scss'); @include meta.load-css('./interfaces/PdaPainter.scss'); @include meta.load-css('./interfaces/PoolController.scss'); @include meta.load-css('./interfaces/ReagentsEditor.scss'); diff --git a/tgui/public/tgui-panel.bundle.js b/tgui/public/tgui-panel.bundle.js index 6bf2d29478c7e..8d49bac390183 100644 --- a/tgui/public/tgui-panel.bundle.js +++ b/tgui/public/tgui-panel.bundle.js @@ -1,12 +1,12 @@ -(function(){(function(){var xn={96376:function(y,e,t){"use strict";e.__esModule=!0,e.createPopper=void 0,e.popperGenerator=g;var n=i(t(74758)),r=i(t(28811)),o=i(t(98309)),a=i(t(44896)),s=i(t(33118)),u=i(t(10579)),l=i(t(56500)),p=i(t(17633));e.detectOverflow=p.default;var f=t(75573);function i(h){return h&&h.__esModule?h:{default:h}}var d={placement:"bottom",modifiers:[],strategy:"absolute"};function c(){for(var h=arguments.length,m=new Array(h),b=0;b0&&(0,r.round)(i.width)/l.offsetWidth||1,c=l.offsetHeight>0&&(0,r.round)(i.height)/l.offsetHeight||1);var g=(0,n.isElement)(l)?(0,o.default)(l):window,v=g.visualViewport,h=!(0,a.default)()&&f,m=(i.left+(h&&v?v.offsetLeft:0))/d,b=(i.top+(h&&v?v.offsetTop:0))/c,I=i.width/d,O=i.height/c;return{width:I,height:O,top:b,right:m+I,bottom:b+O,left:m,x:m,y:b}}},49035:function(y,e,t){"use strict";e.__esModule=!0,e.default=O;var n=t(46206),r=h(t(87991)),o=h(t(79752)),a=h(t(98309)),s=h(t(44896)),u=h(t(40600)),l=h(t(16599)),p=t(75573),f=h(t(37786)),i=h(t(57819)),d=h(t(4206)),c=h(t(12972)),g=h(t(81666)),v=t(63618);function h(T){return T&&T.__esModule?T:{default:T}}function m(T,E){var C=(0,f.default)(T,!1,E==="fixed");return C.top=C.top+T.clientTop,C.left=C.left+T.clientLeft,C.bottom=C.top+T.clientHeight,C.right=C.left+T.clientWidth,C.width=T.clientWidth,C.height=T.clientHeight,C.x=C.left,C.y=C.top,C}function b(T,E,C){return E===n.viewport?(0,g.default)((0,r.default)(T,C)):(0,p.isElement)(E)?m(E,C):(0,g.default)((0,o.default)((0,u.default)(T)))}function I(T){var E=(0,a.default)((0,i.default)(T)),C=["absolute","fixed"].indexOf((0,l.default)(T).position)>=0,S=C&&(0,p.isHTMLElement)(T)?(0,s.default)(T):T;return(0,p.isElement)(S)?E.filter(function(A){return(0,p.isElement)(A)&&(0,d.default)(A,S)&&(0,c.default)(A)!=="body"}):[]}function O(T,E,C,S){var A=E==="clippingParents"?I(T):[].concat(E),P=[].concat(A,[C]),M=P[0],R=P.reduce(function(V,j){var $=b(T,j,S);return V.top=(0,v.max)($.top,V.top),V.right=(0,v.min)($.right,V.right),V.bottom=(0,v.min)($.bottom,V.bottom),V.left=(0,v.max)($.left,V.left),V},b(T,M,S));return R.width=R.right-R.left,R.height=R.bottom-R.top,R.x=R.left,R.y=R.top,R}},74758:function(y,e,t){"use strict";e.__esModule=!0,e.default=d;var n=f(t(37786)),r=f(t(13390)),o=f(t(12972)),a=t(75573),s=f(t(79697)),u=f(t(40600)),l=f(t(10798)),p=t(63618);function f(c){return c&&c.__esModule?c:{default:c}}function i(c){var g=c.getBoundingClientRect(),v=(0,p.round)(g.width)/c.offsetWidth||1,h=(0,p.round)(g.height)/c.offsetHeight||1;return v!==1||h!==1}function d(c,g,v){v===void 0&&(v=!1);var h=(0,a.isHTMLElement)(g),m=(0,a.isHTMLElement)(g)&&i(g),b=(0,u.default)(g),I=(0,n.default)(c,m,v),O={scrollLeft:0,scrollTop:0},T={x:0,y:0};return(h||!h&&!v)&&(((0,o.default)(g)!=="body"||(0,l.default)(b))&&(O=(0,r.default)(g)),(0,a.isHTMLElement)(g)?(T=(0,n.default)(g,!0),T.x+=g.clientLeft,T.y+=g.clientTop):b&&(T.x=(0,s.default)(b))),{x:I.left+O.scrollLeft-T.x,y:I.top+O.scrollTop-T.y,width:I.width,height:I.height}}},16599:function(y,e,t){"use strict";e.__esModule=!0,e.default=o;var n=r(t(95115));function r(a){return a&&a.__esModule?a:{default:a}}function o(a){return(0,n.default)(a).getComputedStyle(a)}},40600:function(y,e,t){"use strict";e.__esModule=!0,e.default=r;var n=t(75573);function r(o){return(((0,n.isElement)(o)?o.ownerDocument:o.document)||window.document).documentElement}},79752:function(y,e,t){"use strict";e.__esModule=!0,e.default=l;var n=u(t(40600)),r=u(t(16599)),o=u(t(79697)),a=u(t(43750)),s=t(63618);function u(p){return p&&p.__esModule?p:{default:p}}function l(p){var f,i=(0,n.default)(p),d=(0,a.default)(p),c=(f=p.ownerDocument)==null?void 0:f.body,g=(0,s.max)(i.scrollWidth,i.clientWidth,c?c.scrollWidth:0,c?c.clientWidth:0),v=(0,s.max)(i.scrollHeight,i.clientHeight,c?c.scrollHeight:0,c?c.clientHeight:0),h=-d.scrollLeft+(0,o.default)(p),m=-d.scrollTop;return(0,r.default)(c||i).direction==="rtl"&&(h+=(0,s.max)(i.clientWidth,c?c.clientWidth:0)-g),{width:g,height:v,x:h,y:m}}},3073:function(y,e){"use strict";e.__esModule=!0,e.default=t;function t(n){return{scrollLeft:n.scrollLeft,scrollTop:n.scrollTop}}},28811:function(y,e,t){"use strict";e.__esModule=!0,e.default=o;var n=r(t(37786));function r(a){return a&&a.__esModule?a:{default:a}}function o(a){var s=(0,n.default)(a),u=a.offsetWidth,l=a.offsetHeight;return Math.abs(s.width-u)<=1&&(u=s.width),Math.abs(s.height-l)<=1&&(l=s.height),{x:a.offsetLeft,y:a.offsetTop,width:u,height:l}}},12972:function(y,e){"use strict";e.__esModule=!0,e.default=t;function t(n){return n?(n.nodeName||"").toLowerCase():null}},13390:function(y,e,t){"use strict";e.__esModule=!0,e.default=u;var n=s(t(43750)),r=s(t(95115)),o=t(75573),a=s(t(3073));function s(l){return l&&l.__esModule?l:{default:l}}function u(l){return l===(0,r.default)(l)||!(0,o.isHTMLElement)(l)?(0,n.default)(l):(0,a.default)(l)}},44896:function(y,e,t){"use strict";e.__esModule=!0,e.default=d;var n=p(t(95115)),r=p(t(12972)),o=p(t(16599)),a=t(75573),s=p(t(87031)),u=p(t(57819)),l=p(t(35366));function p(c){return c&&c.__esModule?c:{default:c}}function f(c){return!(0,a.isHTMLElement)(c)||(0,o.default)(c).position==="fixed"?null:c.offsetParent}function i(c){var g=/firefox/i.test((0,l.default)()),v=/Trident/i.test((0,l.default)());if(v&&(0,a.isHTMLElement)(c)){var h=(0,o.default)(c);if(h.position==="fixed")return null}var m=(0,u.default)(c);for((0,a.isShadowRoot)(m)&&(m=m.host);(0,a.isHTMLElement)(m)&&["html","body"].indexOf((0,r.default)(m))<0;){var b=(0,o.default)(m);if(b.transform!=="none"||b.perspective!=="none"||b.contain==="paint"||["transform","perspective"].indexOf(b.willChange)!==-1||g&&b.willChange==="filter"||g&&b.filter&&b.filter!=="none")return m;m=m.parentNode}return null}function d(c){for(var g=(0,n.default)(c),v=f(c);v&&(0,s.default)(v)&&(0,o.default)(v).position==="static";)v=f(v);return v&&((0,r.default)(v)==="html"||(0,r.default)(v)==="body"&&(0,o.default)(v).position==="static")?g:v||i(c)||g}},57819:function(y,e,t){"use strict";e.__esModule=!0,e.default=s;var n=a(t(12972)),r=a(t(40600)),o=t(75573);function a(u){return u&&u.__esModule?u:{default:u}}function s(u){return(0,n.default)(u)==="html"?u:u.assignedSlot||u.parentNode||((0,o.isShadowRoot)(u)?u.host:null)||(0,r.default)(u)}},24426:function(y,e,t){"use strict";e.__esModule=!0,e.default=u;var n=s(t(57819)),r=s(t(10798)),o=s(t(12972)),a=t(75573);function s(l){return l&&l.__esModule?l:{default:l}}function u(l){return["html","body","#document"].indexOf((0,o.default)(l))>=0?l.ownerDocument.body:(0,a.isHTMLElement)(l)&&(0,r.default)(l)?l:u((0,n.default)(l))}},87991:function(y,e,t){"use strict";e.__esModule=!0,e.default=u;var n=s(t(95115)),r=s(t(40600)),o=s(t(79697)),a=s(t(89331));function s(l){return l&&l.__esModule?l:{default:l}}function u(l,p){var f=(0,n.default)(l),i=(0,r.default)(l),d=f.visualViewport,c=i.clientWidth,g=i.clientHeight,v=0,h=0;if(d){c=d.width,g=d.height;var m=(0,a.default)();(m||!m&&p==="fixed")&&(v=d.offsetLeft,h=d.offsetTop)}return{width:c,height:g,x:v+(0,o.default)(l),y:h}}},95115:function(y,e){"use strict";e.__esModule=!0,e.default=t;function t(n){if(n==null)return window;if(n.toString()!=="[object Window]"){var r=n.ownerDocument;return r&&r.defaultView||window}return n}},43750:function(y,e,t){"use strict";e.__esModule=!0,e.default=o;var n=r(t(95115));function r(a){return a&&a.__esModule?a:{default:a}}function o(a){var s=(0,n.default)(a),u=s.pageXOffset,l=s.pageYOffset;return{scrollLeft:u,scrollTop:l}}},79697:function(y,e,t){"use strict";e.__esModule=!0,e.default=s;var n=a(t(37786)),r=a(t(40600)),o=a(t(43750));function a(u){return u&&u.__esModule?u:{default:u}}function s(u){return(0,n.default)((0,r.default)(u)).left+(0,o.default)(u).scrollLeft}},75573:function(y,e,t){"use strict";e.__esModule=!0,e.isElement=o,e.isHTMLElement=a,e.isShadowRoot=s;var n=r(t(95115));function r(u){return u&&u.__esModule?u:{default:u}}function o(u){var l=(0,n.default)(u).Element;return u instanceof l||u instanceof Element}function a(u){var l=(0,n.default)(u).HTMLElement;return u instanceof l||u instanceof HTMLElement}function s(u){if(typeof ShadowRoot=="undefined")return!1;var l=(0,n.default)(u).ShadowRoot;return u instanceof l||u instanceof ShadowRoot}},89331:function(y,e,t){"use strict";e.__esModule=!0,e.default=o;var n=r(t(35366));function r(a){return a&&a.__esModule?a:{default:a}}function o(){return!/^((?!chrome|android).)*safari/i.test((0,n.default)())}},10798:function(y,e,t){"use strict";e.__esModule=!0,e.default=o;var n=r(t(16599));function r(a){return a&&a.__esModule?a:{default:a}}function o(a){var s=(0,n.default)(a),u=s.overflow,l=s.overflowX,p=s.overflowY;return/auto|scroll|overlay|hidden/.test(u+p+l)}},87031:function(y,e,t){"use strict";e.__esModule=!0,e.default=o;var n=r(t(12972));function r(a){return a&&a.__esModule?a:{default:a}}function o(a){return["table","td","th"].indexOf((0,n.default)(a))>=0}},98309:function(y,e,t){"use strict";e.__esModule=!0,e.default=u;var n=s(t(24426)),r=s(t(57819)),o=s(t(95115)),a=s(t(10798));function s(l){return l&&l.__esModule?l:{default:l}}function u(l,p){var f;p===void 0&&(p=[]);var i=(0,n.default)(l),d=i===((f=l.ownerDocument)==null?void 0:f.body),c=(0,o.default)(i),g=d?[c].concat(c.visualViewport||[],(0,a.default)(i)?i:[]):i,v=p.concat(g);return d?v:v.concat(u((0,r.default)(g)))}},46206:function(y,e){"use strict";e.__esModule=!0,e.write=e.viewport=e.variationPlacements=e.top=e.start=e.right=e.reference=e.read=e.popper=e.placements=e.modifierPhases=e.main=e.left=e.end=e.clippingParents=e.bottom=e.beforeWrite=e.beforeRead=e.beforeMain=e.basePlacements=e.auto=e.afterWrite=e.afterRead=e.afterMain=void 0;var t=e.top="top",n=e.bottom="bottom",r=e.right="right",o=e.left="left",a=e.auto="auto",s=e.basePlacements=[t,n,r,o],u=e.start="start",l=e.end="end",p=e.clippingParents="clippingParents",f=e.viewport="viewport",i=e.popper="popper",d=e.reference="reference",c=e.variationPlacements=s.reduce(function(A,P){return A.concat([P+"-"+u,P+"-"+l])},[]),g=e.placements=[].concat(s,[a]).reduce(function(A,P){return A.concat([P,P+"-"+u,P+"-"+l])},[]),v=e.beforeRead="beforeRead",h=e.read="read",m=e.afterRead="afterRead",b=e.beforeMain="beforeMain",I=e.main="main",O=e.afterMain="afterMain",T=e.beforeWrite="beforeWrite",E=e.write="write",C=e.afterWrite="afterWrite",S=e.modifierPhases=[v,h,m,b,I,O,T,E,C]},95996:function(y,e,t){"use strict";e.__esModule=!0;var n={popperGenerator:!0,detectOverflow:!0,createPopperBase:!0,createPopper:!0,createPopperLite:!0};e.popperGenerator=e.detectOverflow=e.createPopperLite=e.createPopperBase=e.createPopper=void 0;var r=t(46206);Object.keys(r).forEach(function(l){l==="default"||l==="__esModule"||Object.prototype.hasOwnProperty.call(n,l)||l in e&&e[l]===r[l]||(e[l]=r[l])});var o=t(39805);Object.keys(o).forEach(function(l){l==="default"||l==="__esModule"||Object.prototype.hasOwnProperty.call(n,l)||l in e&&e[l]===o[l]||(e[l]=o[l])});var a=t(96376);e.popperGenerator=a.popperGenerator,e.detectOverflow=a.detectOverflow,e.createPopperBase=a.createPopper;var s=t(83312);e.createPopper=s.createPopper;var u=t(2473);e.createPopperLite=u.createPopper},19975:function(y,e,t){"use strict";e.__esModule=!0,e.default=void 0;var n=o(t(12972)),r=t(75573);function o(l){return l&&l.__esModule?l:{default:l}}function a(l){var p=l.state;Object.keys(p.elements).forEach(function(f){var i=p.styles[f]||{},d=p.attributes[f]||{},c=p.elements[f];!(0,r.isHTMLElement)(c)||!(0,n.default)(c)||(Object.assign(c.style,i),Object.keys(d).forEach(function(g){var v=d[g];v===!1?c.removeAttribute(g):c.setAttribute(g,v===!0?"":v)}))})}function s(l){var p=l.state,f={popper:{position:p.options.strategy,left:"0",top:"0",margin:"0"},arrow:{position:"absolute"},reference:{}};return Object.assign(p.elements.popper.style,f.popper),p.styles=f,p.elements.arrow&&Object.assign(p.elements.arrow.style,f.arrow),function(){Object.keys(p.elements).forEach(function(i){var d=p.elements[i],c=p.attributes[i]||{},g=Object.keys(p.styles.hasOwnProperty(i)?p.styles[i]:f[i]),v=g.reduce(function(h,m){return h[m]="",h},{});!(0,r.isHTMLElement)(d)||!(0,n.default)(d)||(Object.assign(d.style,v),Object.keys(c).forEach(function(h){d.removeAttribute(h)}))})}}var u=e.default={name:"applyStyles",enabled:!0,phase:"write",fn:a,effect:s,requires:["computeStyles"]}},52744:function(y,e,t){"use strict";e.__esModule=!0,e.default=void 0;var n=i(t(83104)),r=i(t(28811)),o=i(t(4206)),a=i(t(44896)),s=i(t(41199)),u=t(28595),l=i(t(43286)),p=i(t(81447)),f=t(46206);function i(h){return h&&h.__esModule?h:{default:h}}var d=function(){function h(m,b){return m=typeof m=="function"?m(Object.assign({},b.rects,{placement:b.placement})):m,(0,l.default)(typeof m!="number"?m:(0,p.default)(m,f.basePlacements))}return h}();function c(h){var m,b=h.state,I=h.name,O=h.options,T=b.elements.arrow,E=b.modifiersData.popperOffsets,C=(0,n.default)(b.placement),S=(0,s.default)(C),A=[f.left,f.right].indexOf(C)>=0,P=A?"height":"width";if(!(!T||!E)){var M=d(O.padding,b),R=(0,r.default)(T),V=S==="y"?f.top:f.left,j=S==="y"?f.bottom:f.right,$=b.rects.reference[P]+b.rects.reference[S]-E[S]-b.rects.popper[P],G=E[S]-b.rects.reference[S],H=(0,a.default)(T),F=H?S==="y"?H.clientHeight||0:H.clientWidth||0:0,L=$/2-G/2,x=M[V],U=F-R[P]-M[j],K=F/2-R[P]/2+L,W=(0,u.within)(x,K,U),q=S;b.modifiersData[I]=(m={},m[q]=W,m.centerOffset=W-K,m)}}function g(h){var m=h.state,b=h.options,I=b.element,O=I===void 0?"[data-popper-arrow]":I;O!=null&&(typeof O=="string"&&(O=m.elements.popper.querySelector(O),!O)||(0,o.default)(m.elements.popper,O)&&(m.elements.arrow=O))}var v=e.default={name:"arrow",enabled:!0,phase:"main",fn:c,effect:g,requires:["popperOffsets"],requiresIfExists:["preventOverflow"]}},59894:function(y,e,t){"use strict";e.__esModule=!0,e.default=void 0,e.mapToStyles=c;var n=t(46206),r=f(t(44896)),o=f(t(95115)),a=f(t(40600)),s=f(t(16599)),u=f(t(83104)),l=f(t(45)),p=t(63618);function f(h){return h&&h.__esModule?h:{default:h}}var i={top:"auto",right:"auto",bottom:"auto",left:"auto"};function d(h,m){var b=h.x,I=h.y,O=m.devicePixelRatio||1;return{x:(0,p.round)(b*O)/O||0,y:(0,p.round)(I*O)/O||0}}function c(h){var m,b=h.popper,I=h.popperRect,O=h.placement,T=h.variation,E=h.offsets,C=h.position,S=h.gpuAcceleration,A=h.adaptive,P=h.roundOffsets,M=h.isFixed,R=E.x,V=R===void 0?0:R,j=E.y,$=j===void 0?0:j,G=typeof P=="function"?P({x:V,y:$}):{x:V,y:$};V=G.x,$=G.y;var H=E.hasOwnProperty("x"),F=E.hasOwnProperty("y"),L=n.left,x=n.top,U=window;if(A){var K=(0,r.default)(b),W="clientHeight",q="clientWidth";if(K===(0,o.default)(b)&&(K=(0,a.default)(b),(0,s.default)(K).position!=="static"&&C==="absolute"&&(W="scrollHeight",q="scrollWidth")),K=K,O===n.top||(O===n.left||O===n.right)&&T===n.end){x=n.bottom;var ut=M&&K===U&&U.visualViewport?U.visualViewport.height:K[W];$-=ut-I.height,$*=S?1:-1}if(O===n.left||(O===n.top||O===n.bottom)&&T===n.end){L=n.right;var ct=M&&K===U&&U.visualViewport?U.visualViewport.width:K[q];V-=ct-I.width,V*=S?1:-1}}var Q=Object.assign({position:C},A&&i),X=P===!0?d({x:V,y:$},(0,o.default)(b)):{x:V,y:$};if(V=X.x,$=X.y,S){var at;return Object.assign({},Q,(at={},at[x]=F?"0":"",at[L]=H?"0":"",at.transform=(U.devicePixelRatio||1)<=1?"translate("+V+"px, "+$+"px)":"translate3d("+V+"px, "+$+"px, 0)",at))}return Object.assign({},Q,(m={},m[x]=F?$+"px":"",m[L]=H?V+"px":"",m.transform="",m))}function g(h){var m=h.state,b=h.options,I=b.gpuAcceleration,O=I===void 0?!0:I,T=b.adaptive,E=T===void 0?!0:T,C=b.roundOffsets,S=C===void 0?!0:C,A={placement:(0,u.default)(m.placement),variation:(0,l.default)(m.placement),popper:m.elements.popper,popperRect:m.rects.popper,gpuAcceleration:O,isFixed:m.options.strategy==="fixed"};m.modifiersData.popperOffsets!=null&&(m.styles.popper=Object.assign({},m.styles.popper,c(Object.assign({},A,{offsets:m.modifiersData.popperOffsets,position:m.options.strategy,adaptive:E,roundOffsets:S})))),m.modifiersData.arrow!=null&&(m.styles.arrow=Object.assign({},m.styles.arrow,c(Object.assign({},A,{offsets:m.modifiersData.arrow,position:"absolute",adaptive:!1,roundOffsets:S})))),m.attributes.popper=Object.assign({},m.attributes.popper,{"data-popper-placement":m.placement})}var v=e.default={name:"computeStyles",enabled:!0,phase:"beforeWrite",fn:g,data:{}}},36692:function(y,e,t){"use strict";e.__esModule=!0,e.default=void 0;var n=r(t(95115));function r(u){return u&&u.__esModule?u:{default:u}}var o={passive:!0};function a(u){var l=u.state,p=u.instance,f=u.options,i=f.scroll,d=i===void 0?!0:i,c=f.resize,g=c===void 0?!0:c,v=(0,n.default)(l.elements.popper),h=[].concat(l.scrollParents.reference,l.scrollParents.popper);return d&&h.forEach(function(m){m.addEventListener("scroll",p.update,o)}),g&&v.addEventListener("resize",p.update,o),function(){d&&h.forEach(function(m){m.removeEventListener("scroll",p.update,o)}),g&&v.removeEventListener("resize",p.update,o)}}var s=e.default={name:"eventListeners",enabled:!0,phase:"write",fn:function(){function u(){}return u}(),effect:a,data:{}}},23798:function(y,e,t){"use strict";e.__esModule=!0,e.default=void 0;var n=p(t(71376)),r=p(t(83104)),o=p(t(86459)),a=p(t(17633)),s=p(t(9041)),u=t(46206),l=p(t(45));function p(c){return c&&c.__esModule?c:{default:c}}function f(c){if((0,r.default)(c)===u.auto)return[];var g=(0,n.default)(c);return[(0,o.default)(c),g,(0,o.default)(g)]}function i(c){var g=c.state,v=c.options,h=c.name;if(!g.modifiersData[h]._skip){for(var m=v.mainAxis,b=m===void 0?!0:m,I=v.altAxis,O=I===void 0?!0:I,T=v.fallbackPlacements,E=v.padding,C=v.boundary,S=v.rootBoundary,A=v.altBoundary,P=v.flipVariations,M=P===void 0?!0:P,R=v.allowedAutoPlacements,V=g.options.placement,j=(0,r.default)(V),$=j===V,G=T||($||!M?[(0,n.default)(V)]:f(V)),H=[V].concat(G).reduce(function(et,k){return et.concat((0,r.default)(k)===u.auto?(0,s.default)(g,{placement:k,boundary:C,rootBoundary:S,padding:E,flipVariations:M,allowedAutoPlacements:R}):k)},[]),F=g.rects.reference,L=g.rects.popper,x=new Map,U=!0,K=H[0],W=0;W=0,X=Q?"width":"height",at=(0,a.default)(g,{placement:q,boundary:C,rootBoundary:S,altBoundary:A,padding:E}),ft=Q?ct?u.right:u.left:ct?u.bottom:u.top;F[X]>L[X]&&(ft=(0,n.default)(ft));var dt=(0,n.default)(ft),_=[];if(b&&_.push(at[ut]<=0),O&&_.push(at[ft]<=0,at[dt]<=0),_.every(function(et){return et})){K=q,U=!1;break}x.set(q,_)}if(U)for(var rt=M?3:1,it=function(){function et(k){var tt=H.find(function(nt){var pt=x.get(nt);if(pt)return pt.slice(0,k).every(function(Et){return Et})});if(tt)return K=tt,"break"}return et}(),mt=rt;mt>0;mt--){var ot=it(mt);if(ot==="break")break}g.placement!==K&&(g.modifiersData[h]._skip=!0,g.placement=K,g.reset=!0)}}var d=e.default={name:"flip",enabled:!0,phase:"main",fn:i,requiresIfExists:["offset"],data:{_skip:!1}}},83761:function(y,e,t){"use strict";e.__esModule=!0,e.default=void 0;var n=t(46206),r=o(t(17633));function o(p){return p&&p.__esModule?p:{default:p}}function a(p,f,i){return i===void 0&&(i={x:0,y:0}),{top:p.top-f.height-i.y,right:p.right-f.width+i.x,bottom:p.bottom-f.height+i.y,left:p.left-f.width-i.x}}function s(p){return[n.top,n.right,n.bottom,n.left].some(function(f){return p[f]>=0})}function u(p){var f=p.state,i=p.name,d=f.rects.reference,c=f.rects.popper,g=f.modifiersData.preventOverflow,v=(0,r.default)(f,{elementContext:"reference"}),h=(0,r.default)(f,{altBoundary:!0}),m=a(v,d),b=a(h,c,g),I=s(m),O=s(b);f.modifiersData[i]={referenceClippingOffsets:m,popperEscapeOffsets:b,isReferenceHidden:I,hasPopperEscaped:O},f.attributes.popper=Object.assign({},f.attributes.popper,{"data-popper-reference-hidden":I,"data-popper-escaped":O})}var l=e.default={name:"hide",enabled:!0,phase:"main",requiresIfExists:["preventOverflow"],fn:u}},39805:function(y,e,t){"use strict";e.__esModule=!0,e.preventOverflow=e.popperOffsets=e.offset=e.hide=e.flip=e.eventListeners=e.computeStyles=e.arrow=e.applyStyles=void 0;var n=i(t(19975));e.applyStyles=n.default;var r=i(t(52744));e.arrow=r.default;var o=i(t(59894));e.computeStyles=o.default;var a=i(t(36692));e.eventListeners=a.default;var s=i(t(23798));e.flip=s.default;var u=i(t(83761));e.hide=u.default;var l=i(t(61410));e.offset=l.default;var p=i(t(40107));e.popperOffsets=p.default;var f=i(t(75137));e.preventOverflow=f.default;function i(d){return d&&d.__esModule?d:{default:d}}},61410:function(y,e,t){"use strict";e.__esModule=!0,e.default=void 0,e.distanceAndSkiddingToXY=a;var n=o(t(83104)),r=t(46206);function o(l){return l&&l.__esModule?l:{default:l}}function a(l,p,f){var i=(0,n.default)(l),d=[r.left,r.top].indexOf(i)>=0?-1:1,c=typeof f=="function"?f(Object.assign({},p,{placement:l})):f,g=c[0],v=c[1];return g=g||0,v=(v||0)*d,[r.left,r.right].indexOf(i)>=0?{x:v,y:g}:{x:g,y:v}}function s(l){var p=l.state,f=l.options,i=l.name,d=f.offset,c=d===void 0?[0,0]:d,g=r.placements.reduce(function(b,I){return b[I]=a(I,p.rects,c),b},{}),v=g[p.placement],h=v.x,m=v.y;p.modifiersData.popperOffsets!=null&&(p.modifiersData.popperOffsets.x+=h,p.modifiersData.popperOffsets.y+=m),p.modifiersData[i]=g}var u=e.default={name:"offset",enabled:!0,phase:"main",requires:["popperOffsets"],fn:s}},40107:function(y,e,t){"use strict";e.__esModule=!0,e.default=void 0;var n=r(t(89951));function r(s){return s&&s.__esModule?s:{default:s}}function o(s){var u=s.state,l=s.name;u.modifiersData[l]=(0,n.default)({reference:u.rects.reference,element:u.rects.popper,strategy:"absolute",placement:u.placement})}var a=e.default={name:"popperOffsets",enabled:!0,phase:"read",fn:o,data:{}}},75137:function(y,e,t){"use strict";e.__esModule=!0,e.default=void 0;var n=t(46206),r=c(t(83104)),o=c(t(41199)),a=c(t(28066)),s=t(28595),u=c(t(28811)),l=c(t(44896)),p=c(t(17633)),f=c(t(45)),i=c(t(34780)),d=t(63618);function c(h){return h&&h.__esModule?h:{default:h}}function g(h){var m=h.state,b=h.options,I=h.name,O=b.mainAxis,T=O===void 0?!0:O,E=b.altAxis,C=E===void 0?!1:E,S=b.boundary,A=b.rootBoundary,P=b.altBoundary,M=b.padding,R=b.tether,V=R===void 0?!0:R,j=b.tetherOffset,$=j===void 0?0:j,G=(0,p.default)(m,{boundary:S,rootBoundary:A,padding:M,altBoundary:P}),H=(0,r.default)(m.placement),F=(0,f.default)(m.placement),L=!F,x=(0,o.default)(H),U=(0,a.default)(x),K=m.modifiersData.popperOffsets,W=m.rects.reference,q=m.rects.popper,ut=typeof $=="function"?$(Object.assign({},m.rects,{placement:m.placement})):$,ct=typeof ut=="number"?{mainAxis:ut,altAxis:ut}:Object.assign({mainAxis:0,altAxis:0},ut),Q=m.modifiersData.offset?m.modifiersData.offset[m.placement]:null,X={x:0,y:0};if(K){if(T){var at,ft=x==="y"?n.top:n.left,dt=x==="y"?n.bottom:n.right,_=x==="y"?"height":"width",rt=K[x],it=rt+G[ft],mt=rt-G[dt],ot=V?-q[_]/2:0,et=F===n.start?W[_]:q[_],k=F===n.start?-q[_]:-W[_],tt=m.elements.arrow,nt=V&&tt?(0,u.default)(tt):{width:0,height:0},pt=m.modifiersData["arrow#persistent"]?m.modifiersData["arrow#persistent"].padding:(0,i.default)(),Et=pt[ft],st=pt[dt],yt=(0,s.within)(0,W[_],nt[_]),Pt=L?W[_]/2-ot-yt-Et-ct.mainAxis:et-yt-Et-ct.mainAxis,Ct=L?-W[_]/2+ot+yt+st+ct.mainAxis:k+yt+st+ct.mainAxis,lt=m.elements.arrow&&(0,l.default)(m.elements.arrow),gt=lt?x==="y"?lt.clientTop||0:lt.clientLeft||0:0,It=(at=Q==null?void 0:Q[x])!=null?at:0,Lt=rt+Pt-It-gt,Vt=rt+Ct-It,Ot=(0,s.within)(V?(0,d.min)(it,Lt):it,rt,V?(0,d.max)(mt,Vt):mt);K[x]=Ot,X[x]=Ot-rt}if(C){var vt,St=x==="x"?n.top:n.left,At=x==="x"?n.bottom:n.right,Tt=K[U],Nt=U==="y"?"height":"width",Ft=Tt+G[St],jt=Tt-G[At],Ht=[n.top,n.left].indexOf(H)!==-1,Kt=(vt=Q==null?void 0:Q[U])!=null?vt:0,Gt=Ht?Ft:Tt-W[Nt]-q[Nt]-Kt+ct.altAxis,Wt=Ht?Tt+W[Nt]+q[Nt]-Kt-ct.altAxis:jt,te=V&&Ht?(0,s.withinMaxClamp)(Gt,Tt,Wt):(0,s.within)(V?Gt:Ft,Tt,V?Wt:jt);K[U]=te,X[U]=te-Tt}m.modifiersData[I]=X}}var v=e.default={name:"preventOverflow",enabled:!0,phase:"main",fn:g,requiresIfExists:["offset"]}},2473:function(y,e,t){"use strict";e.__esModule=!0,e.defaultModifiers=e.createPopper=void 0;var n=t(96376);e.popperGenerator=n.popperGenerator,e.detectOverflow=n.detectOverflow;var r=u(t(36692)),o=u(t(40107)),a=u(t(59894)),s=u(t(19975));function u(f){return f&&f.__esModule?f:{default:f}}var l=e.defaultModifiers=[r.default,o.default,a.default,s.default],p=e.createPopper=(0,n.popperGenerator)({defaultModifiers:l})},83312:function(y,e,t){"use strict";e.__esModule=!0;var n={createPopper:!0,createPopperLite:!0,defaultModifiers:!0,popperGenerator:!0,detectOverflow:!0};e.defaultModifiers=e.createPopperLite=e.createPopper=void 0;var r=t(96376);e.popperGenerator=r.popperGenerator,e.detectOverflow=r.detectOverflow;var o=v(t(36692)),a=v(t(40107)),s=v(t(59894)),u=v(t(19975)),l=v(t(61410)),p=v(t(23798)),f=v(t(75137)),i=v(t(52744)),d=v(t(83761)),c=t(2473);e.createPopperLite=c.createPopper;var g=t(39805);Object.keys(g).forEach(function(b){b==="default"||b==="__esModule"||Object.prototype.hasOwnProperty.call(n,b)||b in e&&e[b]===g[b]||(e[b]=g[b])});function v(b){return b&&b.__esModule?b:{default:b}}var h=e.defaultModifiers=[o.default,a.default,s.default,u.default,l.default,p.default,f.default,i.default,d.default],m=e.createPopperLite=e.createPopper=(0,r.popperGenerator)({defaultModifiers:h})},9041:function(y,e,t){"use strict";e.__esModule=!0,e.default=u;var n=s(t(45)),r=t(46206),o=s(t(17633)),a=s(t(83104));function s(l){return l&&l.__esModule?l:{default:l}}function u(l,p){p===void 0&&(p={});var f=p,i=f.placement,d=f.boundary,c=f.rootBoundary,g=f.padding,v=f.flipVariations,h=f.allowedAutoPlacements,m=h===void 0?r.placements:h,b=(0,n.default)(i),I=b?v?r.variationPlacements:r.variationPlacements.filter(function(E){return(0,n.default)(E)===b}):r.basePlacements,O=I.filter(function(E){return m.indexOf(E)>=0});O.length===0&&(O=I);var T=O.reduce(function(E,C){return E[C]=(0,o.default)(l,{placement:C,boundary:d,rootBoundary:c,padding:g})[(0,a.default)(C)],E},{});return Object.keys(T).sort(function(E,C){return T[E]-T[C]})}},89951:function(y,e,t){"use strict";e.__esModule=!0,e.default=u;var n=s(t(83104)),r=s(t(45)),o=s(t(41199)),a=t(46206);function s(l){return l&&l.__esModule?l:{default:l}}function u(l){var p=l.reference,f=l.element,i=l.placement,d=i?(0,n.default)(i):null,c=i?(0,r.default)(i):null,g=p.x+p.width/2-f.width/2,v=p.y+p.height/2-f.height/2,h;switch(d){case a.top:h={x:g,y:p.y-f.height};break;case a.bottom:h={x:g,y:p.y+p.height};break;case a.right:h={x:p.x+p.width,y:v};break;case a.left:h={x:p.x-f.width,y:v};break;default:h={x:p.x,y:p.y}}var m=d?(0,o.default)(d):null;if(m!=null){var b=m==="y"?"height":"width";switch(c){case a.start:h[m]=h[m]-(p[b]/2-f[b]/2);break;case a.end:h[m]=h[m]+(p[b]/2-f[b]/2);break;default:}}return h}},10579:function(y,e){"use strict";e.__esModule=!0,e.default=t;function t(n){var r;return function(){return r||(r=new Promise(function(o){Promise.resolve().then(function(){r=void 0,o(n())})})),r}}},17633:function(y,e,t){"use strict";e.__esModule=!0,e.default=d;var n=i(t(49035)),r=i(t(40600)),o=i(t(37786)),a=i(t(89951)),s=i(t(81666)),u=t(46206),l=t(75573),p=i(t(43286)),f=i(t(81447));function i(c){return c&&c.__esModule?c:{default:c}}function d(c,g){g===void 0&&(g={});var v=g,h=v.placement,m=h===void 0?c.placement:h,b=v.strategy,I=b===void 0?c.strategy:b,O=v.boundary,T=O===void 0?u.clippingParents:O,E=v.rootBoundary,C=E===void 0?u.viewport:E,S=v.elementContext,A=S===void 0?u.popper:S,P=v.altBoundary,M=P===void 0?!1:P,R=v.padding,V=R===void 0?0:R,j=(0,p.default)(typeof V!="number"?V:(0,f.default)(V,u.basePlacements)),$=A===u.popper?u.reference:u.popper,G=c.rects.popper,H=c.elements[M?$:A],F=(0,n.default)((0,l.isElement)(H)?H:H.contextElement||(0,r.default)(c.elements.popper),T,C,I),L=(0,o.default)(c.elements.reference),x=(0,a.default)({reference:L,element:G,strategy:"absolute",placement:m}),U=(0,s.default)(Object.assign({},G,x)),K=A===u.popper?U:L,W={top:F.top-K.top+j.top,bottom:K.bottom-F.bottom+j.bottom,left:F.left-K.left+j.left,right:K.right-F.right+j.right},q=c.modifiersData.offset;if(A===u.popper&&q){var ut=q[m];Object.keys(W).forEach(function(ct){var Q=[u.right,u.bottom].indexOf(ct)>=0?1:-1,X=[u.top,u.bottom].indexOf(ct)>=0?"y":"x";W[ct]+=ut[X]*Q})}return W}},81447:function(y,e){"use strict";e.__esModule=!0,e.default=t;function t(n,r){return r.reduce(function(o,a){return o[a]=n,o},{})}},28066:function(y,e){"use strict";e.__esModule=!0,e.default=t;function t(n){return n==="x"?"y":"x"}},83104:function(y,e,t){"use strict";e.__esModule=!0,e.default=r;var n=t(46206);function r(o){return o.split("-")[0]}},34780:function(y,e){"use strict";e.__esModule=!0,e.default=t;function t(){return{top:0,right:0,bottom:0,left:0}}},41199:function(y,e){"use strict";e.__esModule=!0,e.default=t;function t(n){return["top","bottom"].indexOf(n)>=0?"x":"y"}},71376:function(y,e){"use strict";e.__esModule=!0,e.default=n;var t={left:"right",right:"left",bottom:"top",top:"bottom"};function n(r){return r.replace(/left|right|bottom|top/g,function(o){return t[o]})}},86459:function(y,e){"use strict";e.__esModule=!0,e.default=n;var t={start:"end",end:"start"};function n(r){return r.replace(/start|end/g,function(o){return t[o]})}},45:function(y,e){"use strict";e.__esModule=!0,e.default=t;function t(n){return n.split("-")[1]}},63618:function(y,e){"use strict";e.__esModule=!0,e.round=e.min=e.max=void 0;var t=e.max=Math.max,n=e.min=Math.min,r=e.round=Math.round},56500:function(y,e){"use strict";e.__esModule=!0,e.default=t;function t(n){var r=n.reduce(function(o,a){var s=o[a.name];return o[a.name]=s?Object.assign({},s,a,{options:Object.assign({},s.options,a.options),data:Object.assign({},s.data,a.data)}):a,o},{});return Object.keys(r).map(function(o){return r[o]})}},43286:function(y,e,t){"use strict";e.__esModule=!0,e.default=o;var n=r(t(34780));function r(a){return a&&a.__esModule?a:{default:a}}function o(a){return Object.assign({},(0,n.default)(),a)}},33118:function(y,e,t){"use strict";e.__esModule=!0,e.default=o;var n=t(46206);function r(a){var s=new Map,u=new Set,l=[];a.forEach(function(f){s.set(f.name,f)});function p(f){u.add(f.name);var i=[].concat(f.requires||[],f.requiresIfExists||[]);i.forEach(function(d){if(!u.has(d)){var c=s.get(d);c&&p(c)}}),l.push(f)}return a.forEach(function(f){u.has(f.name)||p(f)}),l}function o(a){var s=r(a);return n.modifierPhases.reduce(function(u,l){return u.concat(s.filter(function(p){return p.phase===l}))},[])}},81666:function(y,e){"use strict";e.__esModule=!0,e.default=t;function t(n){return Object.assign({},n,{left:n.x,top:n.y,right:n.x+n.width,bottom:n.y+n.height})}},35366:function(y,e){"use strict";e.__esModule=!0,e.default=t;function t(){var n=navigator.userAgentData;return n!=null&&n.brands&&Array.isArray(n.brands)?n.brands.map(function(r){return r.brand+"/"+r.version}).join(" "):navigator.userAgent}},28595:function(y,e,t){"use strict";e.__esModule=!0,e.within=r,e.withinMaxClamp=o;var n=t(63618);function r(a,s,u){return(0,n.max)(a,(0,n.min)(s,u))}function o(a,s,u){var l=r(a,s,u);return l>u?u:l}},22734:function(y){"use strict";/*! @license DOMPurify 2.5.4 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.5.4/LICENSE */(function(e,t){y.exports=t()})(void 0,function(){"use strict";function e(lt){"@babel/helpers - typeof";return e=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(gt){return typeof gt}:function(gt){return gt&&typeof Symbol=="function"&>.constructor===Symbol&>!==Symbol.prototype?"symbol":typeof gt},e(lt)}function t(lt,gt){return t=Object.setPrototypeOf||function(){function It(Lt,Vt){return Lt.__proto__=Vt,Lt}return It}(),t(lt,gt)}function n(){if(typeof Reflect=="undefined"||!Reflect.construct||Reflect.construct.sham)return!1;if(typeof Proxy=="function")return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){})),!0}catch(lt){return!1}}function r(lt,gt,It){return n()?r=Reflect.construct:r=function(){function Lt(Vt,Ot,vt){var St=[null];St.push.apply(St,Ot);var At=Function.bind.apply(Vt,St),Tt=new At;return vt&&t(Tt,vt.prototype),Tt}return Lt}(),r.apply(null,arguments)}function o(lt){return a(lt)||s(lt)||u(lt)||p()}function a(lt){if(Array.isArray(lt))return l(lt)}function s(lt){if(typeof Symbol!="undefined"&<[Symbol.iterator]!=null||lt["@@iterator"]!=null)return Array.from(lt)}function u(lt,gt){if(lt){if(typeof lt=="string")return l(lt,gt);var It=Object.prototype.toString.call(lt).slice(8,-1);if(It==="Object"&<.constructor&&(It=lt.constructor.name),It==="Map"||It==="Set")return Array.from(lt);if(It==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(It))return l(lt,gt)}}function l(lt,gt){(gt==null||gt>lt.length)&&(gt=lt.length);for(var It=0,Lt=new Array(gt);It1?It-1:0),Vt=1;Vt/gm),mt=h(/\${[\w\W]*}/gm),ot=h(/^data-[\-\w.\u00B7-\uFFFF]/),et=h(/^aria-[\-\w]+$/),k=h(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i),tt=h(/^(?:\w+script|data):/i),nt=h(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g),pt=h(/^html$/i),Et=h(/^[a-z][.\w]*(-[.\w]+)+$/i),st=function(){function lt(){return typeof window=="undefined"?null:window}return lt}(),yt=function(){function lt(gt,It){if(e(gt)!=="object"||typeof gt.createPolicy!="function")return null;var Lt=null,Vt="data-tt-policy-suffix";It.currentScript&&It.currentScript.hasAttribute(Vt)&&(Lt=It.currentScript.getAttribute(Vt));var Ot="dompurify"+(Lt?"#"+Lt:"");try{return gt.createPolicy(Ot,{createHTML:function(){function vt(St){return St}return vt}(),createScriptURL:function(){function vt(St){return St}return vt}()})}catch(vt){return null}}return lt}();function Pt(){var lt=arguments.length>0&&arguments[0]!==void 0?arguments[0]:st(),gt=function(){function D(w){return Pt(w)}return D}();if(gt.version="2.5.4",gt.removed=[],!lt||!lt.document||lt.document.nodeType!==9)return gt.isSupported=!1,gt;var It=lt.document,Lt=lt.document,Vt=lt.DocumentFragment,Ot=lt.HTMLTemplateElement,vt=lt.Node,St=lt.Element,At=lt.NodeFilter,Tt=lt.NamedNodeMap,Nt=Tt===void 0?lt.NamedNodeMap||lt.MozNamedAttrMap:Tt,Ft=lt.HTMLFormElement,jt=lt.DOMParser,Ht=lt.trustedTypes,Kt=St.prototype,Gt=U(Kt,"cloneNode"),Wt=U(Kt,"nextSibling"),te=U(Kt,"childNodes"),be=U(Kt,"parentNode");if(typeof Ot=="function"){var Me=Lt.createElement("template");Me.content&&Me.content.ownerDocument&&(Lt=Me.content.ownerDocument)}var _t=yt(Ht,It),Re=_t?_t.createHTML(""):"",ve=Lt,se=ve.implementation,sn=ve.createNodeIterator,cn=ve.createDocumentFragment,On=ve.getElementsByTagName,ln=It.importNode,fn={};try{fn=x(Lt).documentMode?Lt.documentMode:{}}catch(D){}var ne={};gt.isSupported=typeof be=="function"&&se&&se.createHTMLDocument!==void 0&&fn!==9;var Ke=rt,we=it,Le=mt,An=ot,dn=et,Pn=tt,vn=nt,Be=Et,he=k,$t=null,re=L({},[].concat(o(K),o(W),o(q),o(ct),o(X))),Xt=null,hn=L({},[].concat(o(at),o(ft),o(dt),o(_))),zt=Object.seal(Object.create(null,{tagNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},attributeNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},allowCustomizedBuiltInElements:{writable:!0,configurable:!1,enumerable:!0,value:!1}})),ce=null,De=null,pn=!0,We=!0,gn=!1,mn=!0,le=!1,Fe=!0,fe=!1,xe=!1,Oe=!1,kt=!1,Ve=!1,je=!1,ze=!0,ke=!1,pe="user-content-",Xe=!0,Ae=!1,Ce={},ge=null,Qe=L({},["annotation-xml","audio","colgroup","desc","foreignobject","head","iframe","math","mi","mn","mo","ms","mtext","noembed","noframes","noscript","plaintext","script","style","svg","template","thead","title","video","xmp"]),yn=null,Ze=L({},["audio","video","img","source","image","track"]),Je=null,oe=L({},["alt","class","for","id","label","name","pattern","placeholder","role","summary","title","value","style","xmlns"]),Ue="http://www.w3.org/1998/Math/MathML",He="http://www.w3.org/2000/svg",ue="http://www.w3.org/1999/xhtml",Te=ue,_e=!1,qe=null,tn=L({},[Ue,He,ue],A),me,Sn=["application/xhtml+xml","text/html"],Nn="text/html",Qt,Ie=null,En=255,Mn=Lt.createElement("form"),bn=function(){function D(w){return w instanceof RegExp||w instanceof Function}return D}(),ee=function(){function D(w){Ie&&Ie===w||((!w||e(w)!=="object")&&(w={}),w=x(w),me=Sn.indexOf(w.PARSER_MEDIA_TYPE)===-1?me=Nn:me=w.PARSER_MEDIA_TYPE,Qt=me==="application/xhtml+xml"?A:S,$t="ALLOWED_TAGS"in w?L({},w.ALLOWED_TAGS,Qt):re,Xt="ALLOWED_ATTR"in w?L({},w.ALLOWED_ATTR,Qt):hn,qe="ALLOWED_NAMESPACES"in w?L({},w.ALLOWED_NAMESPACES,A):tn,Je="ADD_URI_SAFE_ATTR"in w?L(x(oe),w.ADD_URI_SAFE_ATTR,Qt):oe,yn="ADD_DATA_URI_TAGS"in w?L(x(Ze),w.ADD_DATA_URI_TAGS,Qt):Ze,ge="FORBID_CONTENTS"in w?L({},w.FORBID_CONTENTS,Qt):Qe,ce="FORBID_TAGS"in w?L({},w.FORBID_TAGS,Qt):{},De="FORBID_ATTR"in w?L({},w.FORBID_ATTR,Qt):{},Ce="USE_PROFILES"in w?w.USE_PROFILES:!1,pn=w.ALLOW_ARIA_ATTR!==!1,We=w.ALLOW_DATA_ATTR!==!1,gn=w.ALLOW_UNKNOWN_PROTOCOLS||!1,mn=w.ALLOW_SELF_CLOSE_IN_ATTR!==!1,le=w.SAFE_FOR_TEMPLATES||!1,Fe=w.SAFE_FOR_XML!==!1,fe=w.WHOLE_DOCUMENT||!1,kt=w.RETURN_DOM||!1,Ve=w.RETURN_DOM_FRAGMENT||!1,je=w.RETURN_TRUSTED_TYPE||!1,Oe=w.FORCE_BODY||!1,ze=w.SANITIZE_DOM!==!1,ke=w.SANITIZE_NAMED_PROPS||!1,Xe=w.KEEP_CONTENT!==!1,Ae=w.IN_PLACE||!1,he=w.ALLOWED_URI_REGEXP||he,Te=w.NAMESPACE||ue,zt=w.CUSTOM_ELEMENT_HANDLING||{},w.CUSTOM_ELEMENT_HANDLING&&bn(w.CUSTOM_ELEMENT_HANDLING.tagNameCheck)&&(zt.tagNameCheck=w.CUSTOM_ELEMENT_HANDLING.tagNameCheck),w.CUSTOM_ELEMENT_HANDLING&&bn(w.CUSTOM_ELEMENT_HANDLING.attributeNameCheck)&&(zt.attributeNameCheck=w.CUSTOM_ELEMENT_HANDLING.attributeNameCheck),w.CUSTOM_ELEMENT_HANDLING&&typeof w.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements=="boolean"&&(zt.allowCustomizedBuiltInElements=w.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements),le&&(We=!1),Ve&&(kt=!0),Ce&&($t=L({},o(X)),Xt=[],Ce.html===!0&&(L($t,K),L(Xt,at)),Ce.svg===!0&&(L($t,W),L(Xt,ft),L(Xt,_)),Ce.svgFilters===!0&&(L($t,q),L(Xt,ft),L(Xt,_)),Ce.mathMl===!0&&(L($t,ct),L(Xt,dt),L(Xt,_))),w.ADD_TAGS&&($t===re&&($t=x($t)),L($t,w.ADD_TAGS,Qt)),w.ADD_ATTR&&(Xt===hn&&(Xt=x(Xt)),L(Xt,w.ADD_ATTR,Qt)),w.ADD_URI_SAFE_ATTR&&L(Je,w.ADD_URI_SAFE_ATTR,Qt),w.FORBID_CONTENTS&&(ge===Qe&&(ge=x(ge)),L(ge,w.FORBID_CONTENTS,Qt)),Xe&&($t["#text"]=!0),fe&&L($t,["html","head","body"]),$t.table&&(L($t,["tbody"]),delete ce.tbody),v&&v(w),Ie=w)}return D}(),Pe=L({},["mi","mo","mn","ms","mtext"]),en=L({},["foreignobject","annotation-xml"]),Rn=L({},["title","style","font","a","script"]),$e=L({},W);L($e,q),L($e,ut);var Ge=L({},ct);L(Ge,Q);var Cn=function(){function D(w){var Y=be(w);(!Y||!Y.tagName)&&(Y={namespaceURI:Te,tagName:"template"});var z=S(w.tagName),Z=S(Y.tagName);return qe[w.namespaceURI]?w.namespaceURI===He?Y.namespaceURI===ue?z==="svg":Y.namespaceURI===Ue?z==="svg"&&(Z==="annotation-xml"||Pe[Z]):!!$e[z]:w.namespaceURI===Ue?Y.namespaceURI===ue?z==="math":Y.namespaceURI===He?z==="math"&&en[Z]:!!Ge[z]:w.namespaceURI===ue?Y.namespaceURI===He&&!en[Z]||Y.namespaceURI===Ue&&!Pe[Z]?!1:!Ge[z]&&(Rn[z]||!$e[z]):!!(me==="application/xhtml+xml"&&qe[w.namespaceURI]):!1}return D}(),Zt=function(){function D(w){C(gt.removed,{element:w});try{w.parentNode.removeChild(w)}catch(Y){try{w.outerHTML=Re}catch(z){w.remove()}}}return D}(),ye=function(){function D(w,Y){try{C(gt.removed,{attribute:Y.getAttributeNode(w),from:Y})}catch(z){C(gt.removed,{attribute:null,from:Y})}if(Y.removeAttribute(w),w==="is"&&!Xt[w])if(kt||Ve)try{Zt(Y)}catch(z){}else try{Y.setAttribute(w,"")}catch(z){}}return D}(),Tn=function(){function D(w){var Y,z;if(Oe)w=""+w;else{var Z=P(w,/^[\r\n\t ]+/);z=Z&&Z[0]}me==="application/xhtml+xml"&&Te===ue&&(w=''+w+"");var ht=_t?_t.createHTML(w):w;if(Te===ue)try{Y=new jt().parseFromString(ht,me)}catch(Rt){}if(!Y||!Y.documentElement){Y=se.createDocument(Te,"template",null);try{Y.documentElement.innerHTML=_e?Re:ht}catch(Rt){}}var bt=Y.body||Y.documentElement;return w&&z&&bt.insertBefore(Lt.createTextNode(z),bt.childNodes[0]||null),Te===ue?On.call(Y,fe?"html":"body")[0]:fe?Y.documentElement:bt}return D}(),Ye=function(){function D(w){return sn.call(w.ownerDocument||w,w,At.SHOW_ELEMENT|At.SHOW_COMMENT|At.SHOW_TEXT|At.SHOW_PROCESSING_INSTRUCTION|At.SHOW_CDATA_SECTION,null,!1)}return D}(),nn=function(){function D(w){return w instanceof Ft&&(typeof w.__depth!="undefined"&&typeof w.__depth!="number"||typeof w.__removalCount!="undefined"&&typeof w.__removalCount!="number"||typeof w.nodeName!="string"||typeof w.textContent!="string"||typeof w.removeChild!="function"||!(w.attributes instanceof Nt)||typeof w.removeAttribute!="function"||typeof w.setAttribute!="function"||typeof w.namespaceURI!="string"||typeof w.insertBefore!="function"||typeof w.hasChildNodes!="function")}return D}(),Ne=function(){function D(w){return e(vt)==="object"?w instanceof vt:w&&e(w)==="object"&&typeof w.nodeType=="number"&&typeof w.nodeName=="string"}return D}(),ae=function(){function D(w,Y,z){ne[w]&&T(ne[w],function(Z){Z.call(gt,Y,z,Ie)})}return D}(),rn=function(){function D(w){var Y;if(ae("beforeSanitizeElements",w,null),nn(w)||j(/[\u0080-\uFFFF]/,w.nodeName))return Zt(w),!0;var z=Qt(w.nodeName);if(ae("uponSanitizeElement",w,{tagName:z,allowedTags:$t}),w.hasChildNodes()&&!Ne(w.firstElementChild)&&(!Ne(w.content)||!Ne(w.content.firstElementChild))&&j(/<[/\w]/g,w.innerHTML)&&j(/<[/\w]/g,w.textContent)||z==="select"&&j(/