diff --git a/.github/workflows/render_nanomaps.yml b/.github/workflows/render_nanomaps.yml
index 54b4fd223a0a..1dd4b192fb94 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,38 +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" 2>&1) || true
- echo "$result"
- if echo "$result" | grep -q "No commits between master and nanomap-render"; then
- echo "No NanoMaps update required, skipping."
- exit 78
- fi
+ - 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 feb648333925..7346f59ea6e5 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',
diff --git a/SQL/updates/61-62.sql b/SQL/updates/61-62.sql
new file mode 100644
index 000000000000..b298a807c188
--- /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/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm
index 3ff7e1339bef..2ee5cb133710 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 83aa2d85df09..0d7ed5db1878 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 9c204680046b..e766b75b4186 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 efea99776543..a235533119b5 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 89e6e5f92d59..48d956fc429c 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 7914ee1fcda7..1827a23d78ff 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 fc8f789a5413..b7833525cf87 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 98f108eed431..9089c4f18f22 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 e6788fd772a3..33830863b59d 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 639b40f05382..882d158d4aed 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 60b4f345c70b..51a2ea0e644c 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 fd3877912acc..38491260f676 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 848637b6e12e..5f3147451b9c 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 a2980f93f610..91e23038a885 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
index 976a7bfc5db3..43d323e0727f 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm
@@ -10,7 +10,7 @@
/turf/simulated/wall/mineral/plastitanium/nodiagonal,
/area/ruin/space/powered)
"dN" = (
-/obj/effect/landmark/damageturf,
+/obj/effect/mapping_helpers/turfs/damage,
/obj/machinery/disco,
/turf/simulated/floor/mineral/plastitanium,
/area/ruin/space/powered)
@@ -51,7 +51,7 @@
},
/area/ruin/space/powered)
"hM" = (
-/obj/effect/landmark/damageturf,
+/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
"iq" = (
@@ -108,7 +108,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/effect/spawner/random_spawners/blood_maybe,
+/obj/effect/spawner/random/blood/maybe,
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
"mk" = (
@@ -203,7 +203,7 @@
/area/ruin/space/powered)
"sB" = (
/obj/machinery/kitchen_machine/oven,
-/obj/effect/landmark/damageturf,
+/obj/effect/mapping_helpers/turfs/damage,
/obj/machinery/light{
dir = 1
},
@@ -326,7 +326,7 @@
/obj/effect/spawner/random/book{
pixel_x = -7
},
-/obj/effect/landmark/damageturf,
+/obj/effect/mapping_helpers/turfs/damage,
/obj/machinery/light/small,
/turf/simulated/floor/wood,
/area/ruin/space/powered)
@@ -338,7 +338,7 @@
/turf/simulated/floor/mineral/plastitanium,
/area/ruin/space/powered)
"Br" = (
-/obj/effect/landmark/damageturf,
+/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -383,7 +383,7 @@
/turf/simulated/floor/mineral/plastitanium,
/area/ruin/space/powered)
"EZ" = (
-/obj/effect/landmark/damageturf,
+/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "caution"
@@ -444,7 +444,7 @@
},
/area/ruin/space/powered)
"Ij" = (
-/obj/effect/landmark/damageturf,
+/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/mineral/plastitanium,
/area/ruin/space/powered)
"Ix" = (
@@ -549,7 +549,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/powered)
"MX" = (
-/obj/effect/spawner/random_spawners/blood_maybe,
+/obj/effect/spawner/random/blood/maybe,
/obj/machinery/light/small{
dir = 4;
pixel_y = 8
@@ -679,7 +679,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/obj/effect/spawner/random_spawners/blood_maybe,
+/obj/effect/spawner/random/blood/maybe,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
index efa050e7517e..6369571d51a8 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 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 612207
+#define SQL_VERSION 622207
// Vending machine stuff
#define CAT_NORMAL (1<<0)
@@ -550,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/power_defines.dm b/code/__DEFINES/power_defines.dm
index c7397a99d846..1c2f62aeaace 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 fd0a1d7d7bfd..8aaf307cdc4c 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/status_effects.dm b/code/__DEFINES/status_effects.dm
index c3f268824dfc..8bac4307c41a 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/__HELPERS/text.dm b/code/__HELPERS/text.dm
index cdfdf72d4295..4d37d42965c7 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -463,7 +463,13 @@
text = replacetext(text, "\[signfont\]", "")
text = replacetext(text, "\[/signfont\]", " [user ? user.real_name : "Anonymous"] [chameleon_pen.forge_name ? chameleon_pen.forge_name : "No name was provided"] [user ? user.real_name : "Anonymous"] \[LOOC] [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 18a1484f6698..956fa75b400c 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 342f4af31b71..7c13a9ed15ff 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/defines/procs/announcer_datum.dm b/code/defines/procs/announcer_datum.dm
index 39c97ec8990d..02273c747c96 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/areas/mining_areas.dm b/code/game/area/areas/mining_areas.dm
index c67f97320d98..029237a6521c 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/ss13_areas/engineering_areas.dm b/code/game/area/ss13_areas/engineering_areas.dm
index 8b3d82cb22f9..e47e128bffa9 100644
--- a/code/game/area/ss13_areas/engineering_areas.dm
+++ b/code/game/area/ss13_areas/engineering_areas.dm
@@ -85,6 +85,10 @@
name = "\improper Gravity Generator"
icon_state = "gravgen"
+/area/station/engineering/transmission_laser
+ name = "\improper Power Transmission Laser"
+ icon_state = "engi"
+
/area/station/engineering/ai_transit_tube
name = "\improper AI Minisat Tranit Tube"
icon_state = "ai"
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index b709a0815938..838de5d24408 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/miniantags/pulsedemon/pulsedemon.dm b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
index 904a3f5b6dec..6a768f9d6bac 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 cd2d04885f67..7f10d9416643 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant.dm
@@ -308,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/objective.dm b/code/game/gamemodes/objective.dm
index 865d2a47cb1d..39b823cc3e96 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -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/objectives_subtypes.dm b/code/game/gamemodes/objectives_subtypes.dm
index 656ce63148e5..07944a0db9b1 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 09dcd1352a96..ad5d6da9479c 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)Shuttle Escapees: [score_escapees] ([points_escapees] Points)Energy Exported: [score_gigajoules_exported] GigaJoulesWhole Station Powered: [power_bonus ? "Yes" : "No"] ([power_bonus * 2500] Points)Whole Station Cleaned: [mess_bonus ? "Yes" : "No"] ([mess_bonus * 1500] Points)[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 da1534bdbb57..b325cf00d0fa 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -293,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 f1d575b9f3e6..4864a68880b5 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/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm
index f60dc1aaee1f..3cc7ec9c483f 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/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm
index 6742c606111c..a40907d6e53e 100644
--- a/code/game/mecha/combat/gygax.dm
+++ b/code/game/mecha/combat/gygax.dm
@@ -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)
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 5e02b662dfa3..a1a29b0b6e27 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -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
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 9ab8e2b09051..4065b6acef8e 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/working/ripley.dm b/code/game/mecha/working/ripley.dm
index e73662442d67..c272b8cd5775 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/game/mecha/working/ripley.dm
@@ -196,14 +196,40 @@
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
+ name = "APLU \"Miner\""
+
+/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 = "An old, dusty mining ripley."
name = "APLU \"Miner\""
obj_integrity = 75 //Low starting health
-/obj/mecha/working/ripley/mining/Initialize(mapload)
+/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?
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 374a2fb1114d..bed724a33249 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/spawners/decorative_spawners.dm b/code/game/objects/effects/spawners/decorative_spawners.dm
deleted file mode 100644
index c01caca049a5..000000000000
--- 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 000000000000..e04e75efd7de
--- /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/wall_decal_spawners.dm b/code/game/objects/effects/spawners/random/wall_decal_spawners.dm
deleted file mode 100644
index 20e586a82aad..000000000000
--- 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 eeaf554b506a..000000000000
--- 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/items.dm b/code/game/objects/items.dm
index e8bfaabd196c..552a891de38a 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -873,6 +873,8 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
owner.update_inv_ears()
if(flags & ITEM_SLOT_MASK)
owner.update_inv_wear_mask()
+ if(flags & ITEM_SLOT_NECK)
+ owner.update_inv_neck()
if(flags & ITEM_SLOT_HEAD)
owner.update_inv_head()
if(flags & ITEM_SLOT_SHOES)
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 5088cb75ba25..cf87fa47a181 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -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/salvage.dm b/code/game/objects/items/salvage.dm
index a4903a6cb2ac..47a35d5c854a 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/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 6d001ae87f55..b29eca92e65b 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),
diff --git a/code/game/objects/items/weapons/melee/melee_misc.dm b/code/game/objects/items/weapons/melee/melee_misc.dm
index c3296817ff99..c051715815d7 100644
--- a/code/game/objects/items/weapons/melee/melee_misc.dm
+++ b/code/game/objects/items/weapons/melee/melee_misc.dm
@@ -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/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 72019a5b20ca..812e1f4ca132 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -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/garment.dm b/code/game/objects/items/weapons/storage/garment.dm
index 7dc9fc8bea69..cdeead6df5a3 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)
@@ -58,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)
@@ -83,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)
@@ -101,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)
@@ -122,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)
@@ -143,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)
@@ -225,6 +232,7 @@
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)
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index 498e169fc6ed..5f1ffdb28ece 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/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 3131a6acf88d..d782b59f3e5d 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -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, \
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 9f86412101b6..3b6a8c876337 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 c0191a2bbe68..19aca1380814 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 = ITEM_SLOT_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/railings.dm b/code/game/objects/structures/railings.dm
index 437fa7ddc6e4..4be0439ea3d3 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/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 6556a100f30f..22287c20f7bc 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/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm
index 7b07e15adf00..9b8af3672dff 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/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 000000000000..87da43ef1ad6
--- /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/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index 14657fde3221..30fb8dd2923c 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -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
diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index 51648d390449..c6793185540c 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/cult/team_cult.dm b/code/modules/antagonists/cult/team_cult.dm
index 8bf7e68cb7b3..7301d9abb9a6 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()
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index 71c9c97ca6c4..75ec9a627e90 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 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("[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 = ITEM_SLOT_HANDCUFFED
diff --git a/code/modules/mob/living/carbon/human/human_death.dm b/code/modules/mob/living/carbon/human/human_death.dm
index 3974719e7ec1..6a6b037d61b2 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 ceed21264053..dc716c7d532f 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 501eda399e79..e8933a1e8531 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 b37224d7c086..49cf383f55a5 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 e0c553591336..56e1ca7d20e1 100644
--- a/code/modules/mob/living/carbon/human/human_inventory.dm
+++ b/code/modules/mob/living/carbon/human/human_inventory.dm
@@ -24,6 +24,8 @@
return has_organ("chest")
if(ITEM_SLOT_MASK)
return has_organ("head")
+ if(ITEM_SLOT_NECK)
+ return has_organ("chest")
if(ITEM_SLOT_HANDCUFFED)
return has_organ("l_hand") && has_organ("r_hand")
if(ITEM_SLOT_LEGCUFFED)
@@ -96,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
@@ -222,6 +227,9 @@
wear_mask_update(I, toggle_off = TRUE)
update_misc_effects()
update_inv_wear_mask()
+ if(ITEM_SLOT_NECK)
+ neck = I
+ update_inv_neck()
if(ITEM_SLOT_HANDCUFFED)
handcuffed = I
update_inv_handcuffed()
@@ -356,6 +364,8 @@
return back
if(ITEM_SLOT_MASK)
return wear_mask
+ if(ITEM_SLOT_NECK)
+ return neck
if(ITEM_SLOT_HANDCUFFED)
return handcuffed
if(ITEM_SLOT_LEGCUFFED)
diff --git a/code/modules/mob/living/carbon/human/human_life.dm b/code/modules/mob/living/carbon/human/human_life.dm
index 1df47997fc71..83785afae091 100644
--- a/code/modules/mob/living/carbon/human/human_life.dm
+++ b/code/modules/mob/living/carbon/human/human_life.dm
@@ -353,6 +353,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
@@ -414,6 +417,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
@@ -528,6 +534,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 4a2c6548fe3c..f8350cd3adb7 100644
--- a/code/modules/mob/living/carbon/human/human_mob.dm
+++ b/code/modules/mob/living/carbon/human/human_mob.dm
@@ -1111,7 +1111,7 @@
if(!(dna.species.bodyflags & HAS_SKIN_TONE))
s_tone = 0
- 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)
+ 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)
diff --git a/code/modules/mob/living/carbon/human/human_stripping.dm b/code/modules/mob/living/carbon/human/human_stripping.dm
index fdb6e8a3d83f..83e5084757f1 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,
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 3916da7ae5df..b28bf42d048d 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()
@@ -1059,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()
..()
@@ -1232,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/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm
index c84b5b6d821a..05945f7e38b4 100644
--- a/code/modules/mob/living/carbon/human/species/_species.dm
+++ b/code/modules/mob/living/carbon/human/species/_species.dm
@@ -773,6 +773,8 @@
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
diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm
index 607005f0edbc..02595565f07c 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 = 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
+ 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/living.dm b/code/modules/mob/living/living.dm
index c39e6d73ef8c..3607507af6ce 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/silicon/ai/ai_mob.dm b/code/modules/mob/living/silicon/ai/ai_mob.dm
index 0e904215b1dd..76d828b0fdea 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 7b69e4392939..194786f6c296 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 6b9fba1c9379..e6b2c59c5bba 100644
--- a/code/modules/mob/living/silicon/robot/robot_mob.dm
+++ b/code/modules/mob/living/silicon/robot/robot_mob.dm
@@ -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()
@@ -481,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")
@@ -640,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
@@ -650,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 ca3cd3db10d5..298f709ddc17 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -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 17801c1a2e3b..d88415375b6e 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/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index 29f5fb080390..b01e6a895670 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 3217f7cdc2e2..6404381fbd7f 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 = ITEM_SLOT_ACCESSORY
- 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/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
index a16ab19c1368..91e135c65c5d 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/mob.dm b/code/modules/mob/mob.dm
index c551cf1ae3a6..144f5c43fd74 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -309,6 +309,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
ITEM_SLOT_JUMPSUIT,\
ITEM_SLOT_OUTER_SUIT,\
ITEM_SLOT_MASK,\
+ ITEM_SLOT_NECK,\
ITEM_SLOT_HEAD,\
ITEM_SLOT_SHOES,\
ITEM_SLOT_GLOVES,\
@@ -393,6 +394,15 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
else
return 0
return 1
+ 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
diff --git a/code/modules/mob/mob_misc_procs.dm b/code/modules/mob/mob_misc_procs.dm
index 741156312a22..9a8a694b9435 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,6 +544,8 @@
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) || istype(M, /mob/living/simple_animal/revenant)) && M.get_preference(PREFTOGGLE_CHAT_DEAD))
var/follow
@@ -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 6b193b3fe962..ddb279e0ac99 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 0efe10b40cf5..67d79a89c70b 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/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 1616104ccf2d..0f1f530f16e4 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -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
@@ -698,6 +699,82 @@
header = "
Mission Details: 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.
+ URGENT: An Aussec Armoury freighter has suffered an engine failure near the edge of the system, dropping out of hyperspace.
+ 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 = "
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/power/engines/singularity/particle_accelerator/particle_control.dm b/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm
index c833b1340c90..1e8456780c97 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/tesla/energy_ball.dm b/code/modules/power/engines/tesla/energy_ball.dm
index 7e526501faf6..6bf6a8f3efd9 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/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index a9469b07f277..e3faa00a0c7a 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -17,7 +17,7 @@
w_class = WEIGHT_CLASS_NORMAL
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/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
index 1371a3bf5224..c4060c3a187d 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/supply/supply_packs/pack_engineering.dm b/code/modules/supply/supply_packs/pack_engineering.dm
index 0c2d2df736e7..7953192f35eb 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/surgery.dm b/code/modules/surgery/surgery.dm
index 4ea5674385da..427bce2257d6 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/config/example/config.toml b/config/example/config.toml
index 16fae30d0125..50ef4fcecf1e 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 = 612207
+sql_version = 622207
# SQL server address. Can be an IP or DNS name
sql_address = "127.0.0.1"
# SQL server port
@@ -668,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",
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/Cyberiad_nanomap_z1.png b/icons/_nanomaps/BoxStation_nanomap_z1.png
similarity index 100%
rename from icons/_nanomaps/Cyberiad_nanomap_z1.png
rename to icons/_nanomaps/BoxStation_nanomap_z1.png
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/Delta_nanomap_z1.png b/icons/_nanomaps/DeltaStation_nanomap_z1.png
similarity index 100%
rename from icons/_nanomaps/Delta_nanomap_z1.png
rename to icons/_nanomaps/DeltaStation_nanomap_z1.png
diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi
index 993e5aa9a249..22c9c0dae1e0 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 0417843bf621..3f8518c5e123 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 63dd6d6c3332..7e1e860e3e27 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 000000000000..f4d1023e7f46
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 000000000000..90aeb6af2cea
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 66af08f0dbdd..2ba214672962 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
new file mode 100644
index 000000000000..0cfe1952e5a3
Binary files /dev/null and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/mob/lavaland/64x64megafauna.dmi b/icons/mob/lavaland/64x64megafauna.dmi
index 49320479b97b..c0585271636a 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 01413087b27a..e87cbff26696 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 912c460ee264..d5b142a429c6 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 97226b4778f2..319fb63f00bf 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 2d12d55ca882..f4b79e395786 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 1840b13b3eca..19aec858b015 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 5009239fc389..cd7ad64edee8 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 ec625f420ab9..140ceb8e5d09 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 ad82f1280802..b20dd3e0d758 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 e0ace87e5d1a..0d96bfe44f4c 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 da228456ee45..6283445e072d 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 3fa0025ab7bc..a031cf4db013 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 2e261c40cf3e..ce1a5b7db8e9 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 8b444e12e2a8..b0cb9551d7a2 100644
Binary files a/icons/mob/screen_white.dmi and b/icons/mob/screen_white.dmi differ
diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi
index d28eb469cbfd..6b10d61b77e9 100644
Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ
diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi
new file mode 100644
index 000000000000..c06d4875bcfd
Binary files /dev/null and b/icons/obj/clothing/neck.dmi differ
diff --git a/icons/obj/clothing/ties_overlay.dmi b/icons/obj/clothing/ties_overlay.dmi
index 1ac2a5373607..fe3433bdbb06 100644
Binary files a/icons/obj/clothing/ties_overlay.dmi and b/icons/obj/clothing/ties_overlay.dmi differ
diff --git a/icons/obj/food/candy.dmi b/icons/obj/food/candy.dmi
index dd7acd3200bc..53cc0b59f4c2 100644
Binary files a/icons/obj/food/candy.dmi and b/icons/obj/food/candy.dmi differ
diff --git a/icons/obj/machines/particle_accelerator.dmi b/icons/obj/machines/particle_accelerator.dmi
index 964886038b28..7f1bb9d653d5 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 ecea6a596076..e3a68d28e996 100644
Binary files a/icons/obj/machines/suit_storage.dmi and b/icons/obj/machines/suit_storage.dmi differ
diff --git a/icons/turf/overlays.dmi b/icons/turf/overlays.dmi
index 95951deb7261..4b9aa80e14eb 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 000000000000..9fa2ba237936
Binary files /dev/null and b/icons/ui_icons/inventory/neck.png differ
diff --git a/modular_ss220/maps220/code/RandomRuins/lavaland/lavaland_ruins.dm b/modular_ss220/maps220/code/RandomRuins/lavaland/lavaland_ruins.dm
index f87d12c36a75..cd20846ee34c 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 c9d1ace1919b..2cc84a260e85 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 7d41ab886445..f7642b0e785b 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/spawners.dm b/modular_ss220/maps220/code/spawners.dm
index 31fe9ed72847..3193e9299c41 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/objects/code/id_skins/id_skins_spawners.dm b/modular_ss220/objects/code/id_skins/id_skins_spawners.dm
index 3ae5313bbc82..f90a5aea5dad 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/platform.dm b/modular_ss220/objects/code/platform.dm
index c540f205826f..c7086e605748 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/paradise.dme b/paradise.dme
index a5b3885836e9..5996d70381f2 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -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,6 @@
#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"
@@ -1418,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"
@@ -1761,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"
diff --git a/tgui/bin/tgui_.ps1 b/tgui/bin/tgui_.ps1
index 87b919b1d6a5..c023b5e8fd66 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 2b755c700cf6..29e97c1bc426 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 37f0eb637d3a..1c6a32c57a61 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) => {
{
+ 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={ act('scan')} />}
>
@@ -42,7 +81,206 @@ export const ParticleAccelerator = (props, context) => {
+ {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}
+
+ ))}
+
+
+ {layout_2.slice().map((item) => (
+
+
+ {item.name}
+
+ ))}
+
+
+ {(orientation === 'east' ? layout_3 : layout_1).slice().map((item) => (
+
+
+ {item.name}
+
+ ))}
+
+
+ );
+};
+
+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}
+
+ ))}
+
+
+ {layout_2.slice().map((item) => (
+
+
+ {item.name}
+
+ ))}
+
+
+ {(orientation === 'north' ? layout_3 : layout_1).slice().map((item) => (
+
+
+ {item.name}
+
+ ))}
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/StripMenu.tsx b/tgui/packages/tgui/interfaces/StripMenu.tsx
index 4d6f9a69d732..38553001b81c 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 000000000000..3c0c828e8262
--- /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 })}
+ />
+ act('inputW')}>
+ W
+
+ act('inputKW')}>
+ KW
+
+ act('inputMW')}>
+ MW
+
+ act('inputGW')}>
+ GW
+
+
+
+ );
+};
+
+const OutputControls = (props, context) => {
+ const { act, data } = useBackend(context);
+ const { output_total, firing, accepting_power, output_number, output_multiplier, target, held_power } = data;
+
+ return (
+
+
+
+ act('target')}>
+ {target}
+
+ act('toggle_output')}
+ >
+ {firing ? 'Enabled' : 'Disabled'}
+
+
+ }
+ >
+
+ {(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 })}
+ />
+ act('outputMW')}>
+ MW
+
+ act('outputGW')}>
+ GW
+
+
+
+ );
+};
diff --git a/tgui/public/tgui-panel.bundle.js b/tgui/public/tgui-panel.bundle.js
index 6bf2d29478c7..8d49bac39018 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="=0;--Rt){var Mt=Gt(ht[Rt],!0);Mt.__removalCount=(w.__removalCount||0)+1,Z.insertBefore(Mt,Wt(w))}}return Zt(w),!0}return w instanceof St&&!Cn(w)||(z==="noscript"||z==="noembed"||z==="noframes")&&j(/<\/no(script|embed|frames)/i,w.innerHTML)?(Zt(w),!0):(le&&w.nodeType===3&&(Y=w.textContent,Y=M(Y,Ke," "),Y=M(Y,we," "),Y=M(Y,Le," "),w.textContent!==Y&&(C(gt.removed,{element:w.cloneNode()}),w.textContent=Y)),ae("afterSanitizeElements",w,null),!1)}return D}(),In=function(){function D(w,Y,z){if(ze&&(Y==="id"||Y==="name")&&(z in Lt||z in Mn||z==="__depth"||z==="__removalCount"))return!1;if(!(We&&!De[Y]&&j(An,Y))){if(!(pn&&j(dn,Y))){if(!Xt[Y]||De[Y]){if(!(wn(w)&&(zt.tagNameCheck instanceof RegExp&&j(zt.tagNameCheck,w)||zt.tagNameCheck instanceof Function&&zt.tagNameCheck(w))&&(zt.attributeNameCheck instanceof RegExp&&j(zt.attributeNameCheck,Y)||zt.attributeNameCheck instanceof Function&&zt.attributeNameCheck(Y))||Y==="is"&&zt.allowCustomizedBuiltInElements&&(zt.tagNameCheck instanceof RegExp&&j(zt.tagNameCheck,z)||zt.tagNameCheck instanceof Function&&zt.tagNameCheck(z))))return!1}else if(!Je[Y]){if(!j(he,M(z,vn,""))){if(!((Y==="src"||Y==="xlink:href"||Y==="href")&&w!=="script"&&R(z,"data:")===0&&yn[w])){if(!(gn&&!j(Pn,M(z,vn,"")))){if(z)return!1}}}}}}return!0}return D}(),wn=function(){function D(w){return w!=="annotation-xml"&&P(w,Be)}return D}(),N=function(){function D(w){var Y,z,Z,ht;ae("beforeSanitizeAttributes",w,null);var bt=w.attributes;if(bt){var Rt={attrName:"",attrValue:"",keepAttr:!0,allowedAttributes:Xt};for(ht=bt.length;ht--;){Y=bt[ht];var Mt=Y,Bt=Mt.name,wt=Mt.namespaceURI;if(z=Bt==="value"?Y.value:V(Y.value),Z=Qt(Bt),Rt.attrName=Z,Rt.attrValue=z,Rt.keepAttr=!0,Rt.forceKeepAttr=void 0,ae("uponSanitizeAttribute",w,Rt),z=Rt.attrValue,!Rt.forceKeepAttr&&(ye(Bt,w),!!Rt.keepAttr)){if(!mn&&j(/\/>/i,z)){ye(Bt,w);continue}if(Fe&&j(/((--!?|])>)|<\/(style|title)/i,z)){ye(Bt,w);continue}le&&(z=M(z,Ke," "),z=M(z,we," "),z=M(z,Le," "));var Dt=Qt(w.nodeName);if(In(Dt,Z,z)){if(ke&&(Z==="id"||Z==="name")&&(ye(Bt,w),z=pe+z),_t&&e(Ht)==="object"&&typeof Ht.getAttributeType=="function"&&!wt)switch(Ht.getAttributeType(Dt,Z)){case"TrustedHTML":{z=_t.createHTML(z);break}case"TrustedScriptURL":{z=_t.createScriptURL(z);break}}try{wt?w.setAttributeNS(wt,Bt,z):w.setAttribute(Bt,z),nn(w)?Zt(w):E(gt.removed)}catch(Yt){}}}}ae("afterSanitizeAttributes",w,null)}}return D}(),B=function(){function D(w){var Y,z=Ye(w);for(ae("beforeSanitizeShadowDOM",w,null);Y=z.nextNode();)if(ae("uponSanitizeShadowNode",Y,null),!rn(Y)){var Z=be(Y);Y.nodeType===1&&(Z&&Z.__depth?Y.__depth=(Y.__removalCount||0)+Z.__depth+1:Y.__depth=1),(Y.__depth>=En||G(Y.__depth))&&Zt(Y),Y.content instanceof Vt&&(Y.content.__depth=Y.__depth,D(Y.content)),N(Y)}ae("afterSanitizeShadowDOM",w,null)}return D}();return gt.sanitize=function(D){var w=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},Y,z,Z,ht,bt;if(_e=!D,_e&&(D=""),typeof D!="string"&&!Ne(D))if(typeof D.toString=="function"){if(D=D.toString(),typeof D!="string")throw $("dirty is not a string, aborting")}else throw $("toString is not a function");if(!gt.isSupported){if(e(lt.toStaticHTML)==="object"||typeof lt.toStaticHTML=="function"){if(typeof D=="string")return lt.toStaticHTML(D);if(Ne(D))return lt.toStaticHTML(D.outerHTML)}return D}if(xe||ee(w),gt.removed=[],typeof D=="string"&&(Ae=!1),Ae){if(D.nodeName){var Rt=Qt(D.nodeName);if(!$t[Rt]||ce[Rt])throw $("root node is forbidden and cannot be sanitized in-place")}}else if(D instanceof vt)Y=Tn(""),z=Y.ownerDocument.importNode(D,!0),z.nodeType===1&&z.nodeName==="BODY"||z.nodeName==="HTML"?Y=z:Y.appendChild(z);else{if(!kt&&!le&&!fe&&D.indexOf("<")===-1)return _t&&je?_t.createHTML(D):D;if(Y=Tn(D),!Y)return kt?null:je?Re:""}Y&&Oe&&Zt(Y.firstChild);for(var Mt=Ye(Ae?D:Y);Z=Mt.nextNode();)if(!(Z.nodeType===3&&Z===ht)&&!rn(Z)){var Bt=be(Z);Z.nodeType===1&&(Bt&&Bt.__depth?Z.__depth=(Z.__removalCount||0)+Bt.__depth+1:Z.__depth=1),(Z.__depth>=En||G(Z.__depth))&&Zt(Z),Z.content instanceof Vt&&(Z.content.__depth=Z.__depth,B(Z.content)),N(Z),ht=Z}if(ht=null,Ae)return D;if(kt){if(Ve)for(bt=cn.call(Y.ownerDocument);Y.firstChild;)bt.appendChild(Y.firstChild);else bt=Y;return(Xt.shadowroot||Xt.shadowrootmod)&&(bt=ln.call(It,bt,!0)),bt}var wt=fe?Y.outerHTML:Y.innerHTML;return fe&&$t["!doctype"]&&Y.ownerDocument&&Y.ownerDocument.doctype&&Y.ownerDocument.doctype.name&&j(pt,Y.ownerDocument.doctype.name)&&(wt="\n"+wt),le&&(wt=M(wt,Ke," "),wt=M(wt,we," "),wt=M(wt,Le," ")),_t&&je?_t.createHTML(wt):wt},gt.setConfig=function(D){ee(D),xe=!0},gt.clearConfig=function(){Ie=null,xe=!1},gt.isValidAttribute=function(D,w,Y){Ie||ee({});var z=Qt(D),Z=Qt(w);return In(z,Z,Y)},gt.addHook=function(D,w){typeof w=="function"&&(ne[D]=ne[D]||[],C(ne[D],w))},gt.removeHook=function(D){if(ne[D])return E(ne[D])},gt.removeHooks=function(D){ne[D]&&(ne[D]=[])},gt.removeAllHooks=function(){ne={}},gt}var Ct=Pt();return Ct})},15875:function(y,e){"use strict";e.__esModule=!0,e.VNodeFlags=e.ChildFlags=void 0;var t;(function(r){r[r.Unknown=0]="Unknown",r[r.HtmlElement=1]="HtmlElement",r[r.ComponentUnknown=2]="ComponentUnknown",r[r.ComponentClass=4]="ComponentClass",r[r.ComponentFunction=8]="ComponentFunction",r[r.Text=16]="Text",r[r.SvgElement=32]="SvgElement",r[r.InputElement=64]="InputElement",r[r.TextareaElement=128]="TextareaElement",r[r.SelectElement=256]="SelectElement",r[r.Portal=1024]="Portal",r[r.ReCreate=2048]="ReCreate",r[r.ContentEditable=4096]="ContentEditable",r[r.Fragment=8192]="Fragment",r[r.InUse=16384]="InUse",r[r.ForwardRef=32768]="ForwardRef",r[r.Normalized=65536]="Normalized",r[r.ForwardRefComponent=32776]="ForwardRefComponent",r[r.FormElement=448]="FormElement",r[r.Element=481]="Element",r[r.Component=14]="Component",r[r.DOMRef=1521]="DOMRef",r[r.InUseOrNormalized=81920]="InUseOrNormalized",r[r.ClearInUse=-16385]="ClearInUse",r[r.ComponentKnown=12]="ComponentKnown"})(t||(e.VNodeFlags=t={}));var n;(function(r){r[r.UnknownChildren=0]="UnknownChildren",r[r.HasInvalidChildren=1]="HasInvalidChildren",r[r.HasVNodeChildren=2]="HasVNodeChildren",r[r.HasNonKeyedChildren=4]="HasNonKeyedChildren",r[r.HasKeyedChildren=8]="HasKeyedChildren",r[r.HasTextChildren=16]="HasTextChildren",r[r.MultipleChildren=12]="MultipleChildren"})(n||(e.ChildFlags=n={}))},89292:function(y,e){"use strict";e.__esModule=!0,e.Fragment=e.EMPTY_OBJ=e.Component=e.AnimationQueues=void 0,e._CI=xe,e._HI=nt,e._M=kt,e._MCCC=Qe,e._ME=ke,e._MFCC=Ze,e._MP=Fe,e._MR=he,e._RFC=Oe,e.__render=Ge,e.createComponentVNode=at,e.createFragment=dt,e.createPortal=ot,e.createRef=Pn,e.createRenderer=Zt,e.createTextVNode=ft,e.createVNode=ut,e.directClone=it,e.findDOMFromVNode=S,e.forwardRef=vn,e.getFlagsForElementVnode=k,e.linkEvent=i,e.normalizeProps=_,e.options=void 0,e.render=Cn,e.rerender=ae,e.version=void 0;var t=Array.isArray;function n(N){var B=typeof N;return B==="string"||B==="number"}function r(N){return N==null}function o(N){return N===null||N===!1||N===!0||N===void 0}function a(N){return typeof N=="function"}function s(N){return typeof N=="string"}function u(N){return typeof N=="number"}function l(N){return N===null}function p(N){return N===void 0}function f(N,B){var D={};if(N)for(var w in N)D[w]=N[w];if(B)for(var Y in B)D[Y]=B[Y];return D}function i(N,B){return a(B)?{data:N,event:B}:null}function d(N){return!l(N)&&typeof N=="object"}var c=e.EMPTY_OBJ={},g=e.Fragment="$F",v=e.AnimationQueues=function(){function N(){this.componentDidAppear=[],this.componentWillDisappear=[],this.componentWillMove=[]}return N}();function h(N){return N.substring(2).toLowerCase()}function m(N,B){N.appendChild(B)}function b(N,B,D){l(D)?m(N,B):N.insertBefore(B,D)}function I(N,B){return B?document.createElementNS("http://www.w3.org/2000/svg",N):document.createElement(N)}function O(N,B,D){N.replaceChild(B,D)}function T(N,B){N.removeChild(B)}function E(N){for(var B=0;B0?A(D.componentWillDisappear,R(N,B)):M(N,B,!1)}function j(N,B,D,w,Y,z,Z,ht){N.componentWillMove.push({dom:w,fn:function(){function bt(){Z&4?D.componentWillMove(B,Y,w):Z&8&&D.onComponentWillMove(B,Y,w,ht)}return bt}(),next:z,parent:Y})}function $(N,B,D,w,Y){var z,Z,ht=B.flags;do{var bt=B.flags;if(bt&1521){!r(z)&&(a(z.componentWillMove)||a(z.onComponentWillMove))?j(Y,N,z,B.dom,D,w,ht,Z):b(D,B.dom,w);return}var Rt=B.children;if(bt&4)z=B.children,Z=B.props,B=Rt.$LI;else if(bt&8)z=B.ref,Z=B.props,B=Rt;else if(bt&8192)if(B.childFlags===2)B=Rt;else{for(var Mt=0,Bt=Rt.length;Mt0,Rt=l(ht),Mt=s(ht)&&ht[0]===W;bt||Rt||Mt?(D=D||B.slice(0,z),(bt||Mt)&&(Z=it(Z)),(Rt||Mt)&&(Z.key=W+z),D.push(Z)):D&&D.push(Z),Z.flags|=65536}}D=D||B,D.length===0?w=1:w=8}else D=B,D.flags|=65536,B.flags&81920&&(D=it(B)),w=2;return N.children=D,N.childFlags=w,N}function nt(N){return o(N)||n(N)?ft(N,null):t(N)?dt(N,0,null):N.flags&16384?it(N):N}var pt="http://www.w3.org/1999/xlink",Et="http://www.w3.org/XML/1998/namespace",st={"xlink:actuate":pt,"xlink:arcrole":pt,"xlink:href":pt,"xlink:role":pt,"xlink:show":pt,"xlink:title":pt,"xlink:type":pt,"xml:base":Et,"xml:lang":Et,"xml:space":Et};function yt(N){return{onClick:N,onDblClick:N,onFocusIn:N,onFocusOut:N,onKeyDown:N,onKeyPress:N,onKeyUp:N,onMouseDown:N,onMouseMove:N,onMouseUp:N,onTouchEnd:N,onTouchMove:N,onTouchStart:N}}var Pt=yt(0),Ct=yt(null),lt=yt(!0);function gt(N,B){var D=B.$EV;return D||(D=B.$EV=yt(null)),D[N]||++Pt[N]===1&&(Ct[N]=jt(N)),D}function It(N,B){var D=B.$EV;D&&D[N]&&(--Pt[N]===0&&(document.removeEventListener(h(N),Ct[N]),Ct[N]=null),D[N]=null)}function Lt(N,B,D,w){if(a(D))gt(N,w)[N]=D;else if(d(D)){if(x(B,D))return;gt(N,w)[N]=D}else It(N,w)}function Vt(N){return a(N.composedPath)?N.composedPath()[0]:N.target}function Ot(N,B,D,w){var Y=Vt(N);do{if(B&&Y.disabled)return;var z=Y.$EV;if(z){var Z=z[D];if(Z&&(w.dom=Y,Z.event?Z.event(Z.data,N):Z(N),N.cancelBubble))return}Y=Y.parentNode}while(!l(Y))}function vt(){this.cancelBubble=!0,this.immediatePropagationStopped||this.stopImmediatePropagation()}function St(){return this.defaultPrevented}function At(){return this.cancelBubble}function Tt(N){var B={dom:document};return N.isDefaultPrevented=St,N.isPropagationStopped=At,N.stopPropagation=vt,Object.defineProperty(N,"currentTarget",{configurable:!0,get:function(){function D(){return B.dom}return D}()}),B}function Nt(N){return function(B){if(B.button!==0){B.stopPropagation();return}Ot(B,!0,N,Tt(B))}}function Ft(N){return function(B){Ot(B,!1,N,Tt(B))}}function jt(N){var B=N==="onClick"||N==="onDblClick"?Nt(N):Ft(N);return document.addEventListener(h(N),B),B}function Ht(N,B){var D=document.createElement("i");return D.innerHTML=B,D.innerHTML===N.innerHTML}function Kt(N,B,D){if(N[B]){var w=N[B];w.event?w.event(w.data,D):w(D)}else{var Y=B.toLowerCase();N[Y]&&N[Y](D)}}function Gt(N,B){var D=function(){function w(Y){var z=this.$V;if(z){var Z=z.props||c,ht=z.dom;if(s(N))Kt(Z,N,Y);else for(var bt=0;bt-1&&B.options[z]&&(ht=B.options[z].value),D&&r(ht)&&(ht=N.defaultValue),se(w,ht)}}var fn=Gt("onInput",we),ne=Gt("onChange");function Ke(N,B){Wt(N,"input",fn),B.onChange&&Wt(N,"change",ne)}function we(N,B,D){var w=N.value,Y=B.value;if(r(w)){if(D){var z=N.defaultValue;!r(z)&&z!==Y&&(B.defaultValue=z,B.value=z)}}else Y!==w&&(B.defaultValue=w,B.value=w)}function Le(N,B,D,w,Y,z){N&64?ve(w,D):N&256?ln(w,D,Y,B):N&128&&we(w,D,Y),z&&(D.$V=B)}function An(N,B,D){N&64?Re(B,D):N&256?On(B):N&128&&Ke(B,D)}function dn(N){return N.type&&te(N.type)?!r(N.checked):!r(N.value)}function Pn(){return{current:null}}function vn(N){var B={render:N};return B}function Be(N){N&&!K(N,null)&&N.current&&(N.current=null)}function he(N,B,D){N&&(a(N)||N.current!==void 0)&&D.push(function(){!K(N,B)&&N.current!==void 0&&(N.current=B)})}function $t(N,B,D){re(N,D),V(N,B,D)}function re(N,B){var D=N.flags,w=N.children,Y;if(D&481){Y=N.ref;var z=N.props;Be(Y);var Z=N.childFlags;if(!l(z))for(var ht=Object.keys(z),bt=0,Rt=ht.length;bt0?A(D.componentWillDisappear,hn(B,N)):N.textContent=""}function ce(N,B,D,w){Xt(D,w),B.flags&8192?V(B,N,w):zt(N,D,w)}function De(N,B,D,w,Y){N.componentWillDisappear.push(function(z){w&4?B.componentWillDisappear(D,z):w&8&&B.onComponentWillDisappear(D,Y,z)})}function pn(N){var B=N.event;return function(D){B(N.data,D)}}function We(N,B,D,w){if(d(D)){if(x(B,D))return;D=pn(D)}Wt(w,h(N),D)}function gn(N,B,D){if(r(B)){D.removeAttribute("style");return}var w=D.style,Y,z;if(s(B)){w.cssText=B;return}if(!r(N)&&!s(N)){for(Y in B)z=B[Y],z!==N[Y]&&w.setProperty(Y,z);for(Y in N)r(B[Y])&&w.removeProperty(Y)}else for(Y in B)z=B[Y],w.setProperty(Y,z)}function mn(N,B,D,w,Y){var z=N&&N.__html||"",Z=B&&B.__html||"";z!==Z&&!r(Z)&&!Ht(w,Z)&&(l(D)||(D.childFlags&12?Xt(D.children,Y):D.childFlags===2&&re(D.children,Y),D.children=null,D.childFlags=1),w.innerHTML=Z)}function le(N,B,D,w,Y,z,Z,ht){switch(N){case"children":case"childrenType":case"className":case"defaultValue":case"key":case"multiple":case"ref":case"selectedIndex":break;case"autoFocus":w.autofocus=!!D;break;case"allowfullscreen":case"autoplay":case"capture":case"checked":case"controls":case"default":case"disabled":case"hidden":case"indeterminate":case"loop":case"muted":case"novalidate":case"open":case"readOnly":case"required":case"reversed":case"scoped":case"seamless":case"selected":w[N]=!!D;break;case"defaultChecked":case"value":case"volume":if(z&&N==="value")break;var bt=r(D)?"":D;w[N]!==bt&&(w[N]=bt);break;case"style":gn(B,D,w);break;case"dangerouslySetInnerHTML":mn(B,D,Z,w,ht);break;default:lt[N]?Lt(N,B,D,w):N.charCodeAt(0)===111&&N.charCodeAt(1)===110?We(N,B,D,w):r(D)?w.removeAttribute(N):Y&&st[N]?w.setAttributeNS(st[N],N,D):w.setAttribute(N,D);break}}function Fe(N,B,D,w,Y,z){var Z=!1,ht=(B&448)>0;ht&&(Z=dn(D),Z&&An(B,w,D));for(var bt in D)le(bt,null,D[bt],w,Y,Z,null,z);ht&&Le(B,N,w,D,!0,Z)}function fe(N,B,D){var w=nt(N.render(B,N.state,D)),Y=D;return a(N.getChildContext)&&(Y=f(D,N.getChildContext())),N.$CX=Y,w}function xe(N,B,D,w,Y,z){var Z=new B(D,w),ht=Z.$N=!!(B.getDerivedStateFromProps||Z.getSnapshotBeforeUpdate);if(Z.$SVG=Y,Z.$L=z,N.children=Z,Z.$BS=!1,Z.context=w,Z.props===c&&(Z.props=D),ht)Z.state=G(Z,D,Z.state);else if(a(Z.componentWillMount)){Z.$BR=!0,Z.componentWillMount();var bt=Z.$PS;if(!l(bt)){var Rt=Z.state;if(l(Rt))Z.state=bt;else for(var Mt in bt)Rt[Mt]=bt[Mt];Z.$PS=null}Z.$BR=!1}return Z.$LI=fe(Z,D,w),Z}function Oe(N,B){var D=N.props||c;return N.flags&32768?N.type.render(D,N.ref,B):N.type(D,B)}function kt(N,B,D,w,Y,z,Z){var ht=N.flags|=16384;ht&481?ke(N,B,D,w,Y,z,Z):ht&4?Xe(N,B,D,w,Y,z,Z):ht&8?Ae(N,B,D,w,Y,z,Z):ht&16?ze(N,B,Y):ht&8192?je(N,D,B,w,Y,z,Z):ht&1024&&Ve(N,D,B,Y,z,Z)}function Ve(N,B,D,w,Y,z){kt(N.children,N.ref,B,!1,null,Y,z);var Z=mt();ze(Z,D,w),N.dom=Z.dom}function je(N,B,D,w,Y,z,Z){var ht=N.children,bt=N.childFlags;bt&12&&ht.length===0&&(bt=N.childFlags=2,ht=N.children=mt()),bt===2?kt(ht,D,B,w,Y,z,Z):pe(ht,D,B,w,Y,z,Z)}function ze(N,B,D){var w=N.dom=document.createTextNode(N.children);l(B)||b(B,w,D)}function ke(N,B,D,w,Y,z,Z){var ht=N.flags,bt=N.props,Rt=N.className,Mt=N.childFlags,Bt=N.dom=I(N.type,w=w||(ht&32)>0),wt=N.children;if(!r(Rt)&&Rt!==""&&(w?Bt.setAttribute("class",Rt):Bt.className=Rt),Mt===16)L(Bt,wt);else if(Mt!==1){var Dt=w&&N.type!=="foreignObject";Mt===2?(wt.flags&16384&&(N.children=wt=it(wt)),kt(wt,Bt,D,Dt,null,z,Z)):(Mt===8||Mt===4)&&pe(wt,Bt,D,Dt,null,z,Z)}l(B)||b(B,Bt,Y),l(bt)||Fe(N,ht,bt,Bt,w,Z),he(N.ref,Bt,z)}function pe(N,B,D,w,Y,z,Z){for(var ht=0;htDt)&&(Bt=S(ht[Dt-1],!1).nextSibling)}tn(Rt,Mt,ht,bt,D,w,Y,Bt,N,z,Z)}function Te(N,B,D,w,Y){var z=N.ref,Z=B.ref,ht=B.children;if(tn(N.childFlags,B.childFlags,N.children,ht,z,D,!1,null,N,w,Y),B.dom=N.dom,z!==Z&&!o(ht)){var bt=ht.dom;T(z,bt),m(Z,bt)}}function _e(N,B,D,w,Y,z,Z){var ht=B.dom=N.dom,bt=N.props,Rt=B.props,Mt=!1,Bt=!1,wt;if(w=w||(Y&32)>0,bt!==Rt){var Dt=bt||c;if(wt=Rt||c,wt!==c){Mt=(Y&448)>0,Mt&&(Bt=dn(wt));for(var Yt in wt){var xt=Dt[Yt],Jt=wt[Yt];xt!==Jt&&le(Yt,xt,Jt,ht,w,Bt,N,Z)}}if(Dt!==c)for(var Ut in Dt)r(wt[Ut])&&!r(Dt[Ut])&&le(Ut,Dt[Ut],null,ht,w,Bt,N,Z)}var Se=B.children,ie=B.className;N.className!==ie&&(r(ie)?ht.removeAttribute("class"):w?ht.setAttribute("class",ie):ht.className=ie),Y&4096?He(ht,Se):tn(N.childFlags,B.childFlags,N.children,Se,ht,D,w&&B.type!=="foreignObject",null,N,z,Z),Mt&&Le(Y,B,ht,wt,!1,Bt);var on=B.ref,de=N.ref;de!==on&&(Be(de),he(on,ht,z))}function qe(N,B,D,w,Y,z,Z){re(N,Z),pe(B,D,w,Y,S(N,!0),z,Z),V(N,D,Z)}function tn(N,B,D,w,Y,z,Z,ht,bt,Rt,Mt){switch(N){case 2:switch(B){case 2:oe(D,w,Y,z,Z,ht,Rt,Mt);break;case 1:$t(D,Y,Mt);break;case 16:re(D,Mt),L(Y,w);break;default:qe(D,w,Y,z,Z,Rt,Mt);break}break;case 1:switch(B){case 2:kt(w,Y,z,Z,ht,Rt,Mt);break;case 1:break;case 16:L(Y,w);break;default:pe(w,Y,z,Z,ht,Rt,Mt);break}break;case 16:switch(B){case 16:Ue(D,w,Y);break;case 2:zt(Y,D,Mt),kt(w,Y,z,Z,ht,Rt,Mt);break;case 1:zt(Y,D,Mt);break;default:zt(Y,D,Mt),pe(w,Y,z,Z,ht,Rt,Mt);break}break;default:switch(B){case 16:Xt(D,Mt),L(Y,w);break;case 2:ce(Y,bt,D,Mt),kt(w,Y,z,Z,ht,Rt,Mt);break;case 1:ce(Y,bt,D,Mt);break;default:var Bt=D.length|0,wt=w.length|0;Bt===0?wt>0&&pe(w,Y,z,Z,ht,Rt,Mt):wt===0?ce(Y,bt,D,Mt):B===8&&N===8?Mn(D,w,Y,z,Z,Bt,wt,ht,bt,Rt,Mt):En(D,w,Y,z,Z,Bt,wt,ht,Rt,Mt);break}break}}function me(N,B,D,w,Y){Y.push(function(){N.componentDidUpdate(B,D,w)})}function Sn(N,B,D,w,Y,z,Z,ht,bt,Rt){var Mt=N.state,Bt=N.props,wt=!!N.$N,Dt=a(N.shouldComponentUpdate);if(wt&&(B=G(N,D,B!==Mt?f(Mt,B):B)),Z||!Dt||Dt&&N.shouldComponentUpdate(D,B,Y)){!wt&&a(N.componentWillUpdate)&&N.componentWillUpdate(D,B,Y),N.props=D,N.state=B,N.context=Y;var Yt=null,xt=fe(N,D,Y);wt&&a(N.getSnapshotBeforeUpdate)&&(Yt=N.getSnapshotBeforeUpdate(Bt,Mt)),oe(N.$LI,xt,w,N.$CX,z,ht,bt,Rt),N.$LI=xt,a(N.componentDidUpdate)&&me(N,Bt,Mt,Yt,bt)}else N.props=D,N.state=B,N.context=Y}function Nn(N,B,D,w,Y,z,Z,ht){var bt=B.children=N.children;if(!l(bt)){bt.$L=Z;var Rt=B.props||c,Mt=B.ref,Bt=N.ref,wt=bt.state;if(!bt.$N){if(a(bt.componentWillReceiveProps)){if(bt.$BR=!0,bt.componentWillReceiveProps(Rt,w),bt.$UN)return;bt.$BR=!1}l(bt.$PS)||(wt=f(wt,bt.$PS),bt.$PS=null)}Sn(bt,wt,Rt,D,w,Y,!1,z,Z,ht),Bt!==Mt&&(Be(Bt),he(Mt,bt,Z))}}function Qt(N,B,D,w,Y,z,Z,ht){var bt=!0,Rt=B.props||c,Mt=B.ref,Bt=N.props,wt=!r(Mt),Dt=N.children;if(wt&&a(Mt.onComponentShouldUpdate)&&(bt=Mt.onComponentShouldUpdate(Bt,Rt)),bt!==!1){wt&&a(Mt.onComponentWillUpdate)&&Mt.onComponentWillUpdate(Bt,Rt);var Yt=nt(Oe(B,w));oe(Dt,Yt,D,w,Y,z,Z,ht),B.children=Yt,wt&&a(Mt.onComponentDidUpdate)&&Mt.onComponentDidUpdate(Bt,Rt)}else B.children=Dt}function Ie(N,B){var D=B.children,w=B.dom=N.dom;D!==N.children&&(w.nodeValue=D)}function En(N,B,D,w,Y,z,Z,ht,bt,Rt){for(var Mt=z>Z?Z:z,Bt=0,wt,Dt;BtZ)for(Bt=Mt;BtBt||Dt>wt)break t;Yt=N[Dt],xt=B[Dt]}for(Yt=N[Bt],xt=B[wt];Yt.key===xt.key;){if(xt.flags&16384&&(B[wt]=xt=it(xt)),oe(Yt,xt,D,w,Y,ht,Rt,Mt),N[Bt]=xt,Bt--,wt--,Dt>Bt||Dt>wt)break t;Yt=N[Bt],xt=B[wt]}}if(Dt>Bt){if(Dt<=wt)for(Jt=wt+1,Ut=Jtwt)for(;Dt<=Bt;)$t(N[Dt++],D,Mt);else bn(N,B,w,z,Z,Bt,wt,Dt,D,Y,ht,bt,Rt,Mt)}function bn(N,B,D,w,Y,z,Z,ht,bt,Rt,Mt,Bt,wt,Dt){var Yt,xt,Jt=0,Ut=0,Se=ht,ie=ht,on=z-ht+1,de=Z-ht+1,an=new Int32Array(de+1),Ee=on===w,Ln=!1,qt=0,un=0;if(Y<4||(on|de)<32)for(Ut=Se;Ut<=z;++Ut)if(Yt=N[Ut],unht?Ln=!0:qt=ht,xt.flags&16384&&(B[ht]=xt=it(xt)),oe(Yt,xt,bt,D,Rt,Mt,wt,Dt),++un;break}!Ee&&ht>Z&&$t(Yt,bt,Dt)}else Ee||$t(Yt,bt,Dt);else{var Dn={};for(Ut=ie;Ut<=Z;++Ut)Dn[B[Ut].key]=Ut;for(Ut=Se;Ut<=z;++Ut)if(Yt=N[Ut],unSe;)$t(N[Se++],bt,Dt);an[ht-ie]=Ut+1,qt>ht?Ln=!0:qt=ht,xt=B[ht],xt.flags&16384&&(B[ht]=xt=it(xt)),oe(Yt,xt,bt,D,Rt,Mt,wt,Dt),++un}else Ee||$t(Yt,bt,Dt);else Ee||$t(Yt,bt,Dt)}if(Ee)ce(bt,Bt,N,Dt),pe(B,bt,D,Rt,Mt,wt,Dt);else if(Ln){var Fn=Rn(an);for(ht=Fn.length-1,Ut=de-1;Ut>=0;Ut--)an[Ut]===0?(qt=Ut+ie,xt=B[qt],xt.flags&16384&&(B[qt]=xt=it(xt)),Jt=qt+1,kt(xt,bt,D,Rt,Jt0&&P(Dt.componentWillMove)}else if(un!==de)for(Ut=de-1;Ut>=0;Ut--)an[Ut]===0&&(qt=Ut+ie,xt=B[qt],xt.flags&16384&&(B[qt]=xt=it(xt)),Jt=qt+1,kt(xt,bt,D,Rt,Jten&&(en=bt,ee=new Int32Array(bt),Pe=new Int32Array(bt));D>1,N[ee[ht]]0&&(Pe[D]=ee[z-1]),ee[z]=D)}z=Y+1;var Rt=new Int32Array(z);for(Z=ee[z-1];z-- >0;)Rt[z]=Z,Z=Pe[Z],ee[z]=0;return Rt}var $e=typeof document!="undefined";$e&&window.Node&&(Node.prototype.$EV=null,Node.prototype.$V=null);function Ge(N,B,D,w){var Y=[],z=new v,Z=B.$V;H.v=!0,r(Z)?r(N)||(N.flags&16384&&(N=it(N)),kt(N,B,w,!1,null,Y,z),B.$V=N,Z=N):r(N)?($t(Z,B,z),B.$V=null):(N.flags&16384&&(N=it(N)),oe(Z,N,B,w,!1,null,Y,z),Z=B.$V=N),E(Y),A(z.componentDidAppear),H.v=!1,a(D)&&D(),a(F.renderComplete)&&F.renderComplete(Z,B)}function Cn(N,B,D,w){D===void 0&&(D=null),w===void 0&&(w=c),Ge(N,B,D,w)}function Zt(N){return function(){function B(D,w,Y,z){N||(N=D),Cn(w,N,Y,z)}return B}()}var ye=[],Tn=typeof Promise!="undefined"?Promise.resolve().then.bind(Promise.resolve()):function(N){window.setTimeout(N,0)},Ye=!1;function nn(N,B,D,w){var Y=N.$PS;if(a(B)&&(B=B(Y?f(N.state,Y):N.state,N.props,N.context)),r(Y))N.$PS=B;else for(var z in B)Y[z]=B[z];if(N.$BR)a(D)&&N.$L.push(D.bind(N));else{if(!H.v&&ye.length===0){rn(N,w),a(D)&&D.call(N);return}if(ye.indexOf(N)===-1&&ye.push(N),w&&(N.$F=!0),Ye||(Ye=!0,Tn(ae)),a(D)){var Z=N.$QU;Z||(Z=N.$QU=[]),Z.push(D)}}}function Ne(N){for(var B=N.$QU,D=0;D=0;--K){var W=this.tryEntries[K],q=W.completion;if(W.tryLoc==="root")return U("end");if(W.tryLoc<=this.prev){var ut=r.call(W,"catchLoc"),ct=r.call(W,"finallyLoc");if(ut&&ct){if(this.prev=0;--U){var K=this.tryEntries[U];if(K.tryLoc<=this.prev&&r.call(K,"finallyLoc")&&this.prev=0;--x){var U=this.tryEntries[x];if(U.finallyLoc===L)return this.complete(U.completion,U.afterLoc),j(U),m}}return F}(),catch:function(){function F(L){for(var x=this.tryEntries.length-1;x>=0;--x){var U=this.tryEntries[x];if(U.tryLoc===L){var K=U.completion;if(K.type==="throw"){var W=K.arg;j(U)}return W}}throw new Error("illegal catch attempt")}return F}(),delegateYield:function(){function F(L,x,U){return this.delegate={iterator:G(L),resultName:x,nextLoc:U},this.method==="next"&&(this.arg=a),m}return F}()},t}(y.exports);try{regeneratorRuntime=e}catch(t){typeof globalThis=="object"?globalThis.regeneratorRuntime=e:Function("r","regeneratorRuntime = r")(e)}},30236:function(){"use strict";self.fetch||(self.fetch=function(y,e){return e=e||{},new Promise(function(t,n){var r=new XMLHttpRequest,o=[],a={},s=function(){function l(){return{ok:(r.status/100|0)==2,statusText:r.statusText,status:r.status,url:r.responseURL,text:function(){function p(){return Promise.resolve(r.responseText)}return p}(),json:function(){function p(){return Promise.resolve(r.responseText).then(JSON.parse)}return p}(),blob:function(){function p(){return Promise.resolve(new Blob([r.response]))}return p}(),clone:l,headers:{keys:function(){function p(){return o}return p}(),entries:function(){function p(){return o.map(function(f){return[f,r.getResponseHeader(f)]})}return p}(),get:function(){function p(f){return r.getResponseHeader(f)}return p}(),has:function(){function p(f){return r.getResponseHeader(f)!=null}return p}()}}}return l}();for(var u in r.open(e.method||"get",y,!0),r.onload=function(){r.getAllResponseHeaders().toLowerCase().replace(/^(.+?):/gm,function(l,p){a[p]||o.push(a[p]=p)}),t(s())},r.onerror=n,r.withCredentials=e.credentials=="include",e.headers)r.setRequestHeader(u,e.headers[u]);r.send(e.body||null)})})},88510:function(y,e){"use strict";e.__esModule=!0,e.zipWith=e.zip=e.uniqBy=e.uniq=e.toKeyedArray=e.toArray=e.sortBy=e.sort=e.reduce=e.range=e.map=e.filterMap=e.filter=void 0;function t(b,I){var O=typeof Symbol!="undefined"&&b[Symbol.iterator]||b["@@iterator"];if(O)return(O=O.call(b)).next.bind(O);if(Array.isArray(b)||(O=n(b))||I&&b&&typeof b.length=="number"){O&&(b=O);var T=0;return function(){return T>=b.length?{done:!0}:{done:!1,value:b[T++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function n(b,I){if(b){if(typeof b=="string")return r(b,I);var O={}.toString.call(b).slice(8,-1);return O==="Object"&&b.constructor&&(O=b.constructor.name),O==="Map"||O==="Set"?Array.from(b):O==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(O)?r(b,I):void 0}}function r(b,I){(I==null||I>b.length)&&(I=b.length);for(var O=0,T=Array(I);O0&&(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],w=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 w.width=w.right-w.left,w.height=w.bottom-w.top,w.x=w.left,w.y=w.top,w}},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),w=(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-w[P]-M[j],K=F/2-w[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,w=E.x,V=w===void 0?0:w,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,w=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:w}):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,w=b.tether,V=w===void 0?!0:w,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,w=v.padding,V=w===void 0?0:w,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(R){return Pt(R)}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(R){return R instanceof RegExp||R instanceof Function}return D}(),ee=function(){function D(R){Ie&&Ie===R||((!R||e(R)!=="object")&&(R={}),R=x(R),me=Sn.indexOf(R.PARSER_MEDIA_TYPE)===-1?me=Nn:me=R.PARSER_MEDIA_TYPE,Qt=me==="application/xhtml+xml"?A:S,$t="ALLOWED_TAGS"in R?L({},R.ALLOWED_TAGS,Qt):re,Xt="ALLOWED_ATTR"in R?L({},R.ALLOWED_ATTR,Qt):hn,qe="ALLOWED_NAMESPACES"in R?L({},R.ALLOWED_NAMESPACES,A):tn,Je="ADD_URI_SAFE_ATTR"in R?L(x(oe),R.ADD_URI_SAFE_ATTR,Qt):oe,yn="ADD_DATA_URI_TAGS"in R?L(x(Ze),R.ADD_DATA_URI_TAGS,Qt):Ze,ge="FORBID_CONTENTS"in R?L({},R.FORBID_CONTENTS,Qt):Qe,ce="FORBID_TAGS"in R?L({},R.FORBID_TAGS,Qt):{},De="FORBID_ATTR"in R?L({},R.FORBID_ATTR,Qt):{},Ce="USE_PROFILES"in R?R.USE_PROFILES:!1,pn=R.ALLOW_ARIA_ATTR!==!1,We=R.ALLOW_DATA_ATTR!==!1,gn=R.ALLOW_UNKNOWN_PROTOCOLS||!1,mn=R.ALLOW_SELF_CLOSE_IN_ATTR!==!1,le=R.SAFE_FOR_TEMPLATES||!1,Fe=R.SAFE_FOR_XML!==!1,fe=R.WHOLE_DOCUMENT||!1,kt=R.RETURN_DOM||!1,Ve=R.RETURN_DOM_FRAGMENT||!1,je=R.RETURN_TRUSTED_TYPE||!1,Oe=R.FORCE_BODY||!1,ze=R.SANITIZE_DOM!==!1,ke=R.SANITIZE_NAMED_PROPS||!1,Xe=R.KEEP_CONTENT!==!1,Ae=R.IN_PLACE||!1,he=R.ALLOWED_URI_REGEXP||he,Te=R.NAMESPACE||ue,zt=R.CUSTOM_ELEMENT_HANDLING||{},R.CUSTOM_ELEMENT_HANDLING&&bn(R.CUSTOM_ELEMENT_HANDLING.tagNameCheck)&&(zt.tagNameCheck=R.CUSTOM_ELEMENT_HANDLING.tagNameCheck),R.CUSTOM_ELEMENT_HANDLING&&bn(R.CUSTOM_ELEMENT_HANDLING.attributeNameCheck)&&(zt.attributeNameCheck=R.CUSTOM_ELEMENT_HANDLING.attributeNameCheck),R.CUSTOM_ELEMENT_HANDLING&&typeof R.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements=="boolean"&&(zt.allowCustomizedBuiltInElements=R.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,_))),R.ADD_TAGS&&($t===re&&($t=x($t)),L($t,R.ADD_TAGS,Qt)),R.ADD_ATTR&&(Xt===hn&&(Xt=x(Xt)),L(Xt,R.ADD_ATTR,Qt)),R.ADD_URI_SAFE_ATTR&&L(Je,R.ADD_URI_SAFE_ATTR,Qt),R.FORBID_CONTENTS&&(ge===Qe&&(ge=x(ge)),L(ge,R.FORBID_CONTENTS,Qt)),Xe&&($t["#text"]=!0),fe&&L($t,["html","head","body"]),$t.table&&(L($t,["tbody"]),delete ce.tbody),v&&v(R),Ie=R)}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(R){var Y=be(R);(!Y||!Y.tagName)&&(Y={namespaceURI:Te,tagName:"template"});var z=S(R.tagName),Z=S(Y.tagName);return qe[R.namespaceURI]?R.namespaceURI===He?Y.namespaceURI===ue?z==="svg":Y.namespaceURI===Ue?z==="svg"&&(Z==="annotation-xml"||Pe[Z]):!!$e[z]:R.namespaceURI===Ue?Y.namespaceURI===ue?z==="math":Y.namespaceURI===He?z==="math"&&en[Z]:!!Ge[z]:R.namespaceURI===ue?Y.namespaceURI===He&&!en[Z]||Y.namespaceURI===Ue&&!Pe[Z]?!1:!Ge[z]&&(Rn[z]||!$e[z]):!!(me==="application/xhtml+xml"&&qe[R.namespaceURI]):!1}return D}(),Zt=function(){function D(R){C(gt.removed,{element:R});try{R.parentNode.removeChild(R)}catch(Y){try{R.outerHTML=Re}catch(z){R.remove()}}}return D}(),ye=function(){function D(R,Y){try{C(gt.removed,{attribute:Y.getAttributeNode(R),from:Y})}catch(z){C(gt.removed,{attribute:null,from:Y})}if(Y.removeAttribute(R),R==="is"&&!Xt[R])if(kt||Ve)try{Zt(Y)}catch(z){}else try{Y.setAttribute(R,"")}catch(z){}}return D}(),Tn=function(){function D(R){var Y,z;if(Oe)R="=0;--Rt){var Mt=Gt(ht[Rt],!0);Mt.__removalCount=(R.__removalCount||0)+1,Z.insertBefore(Mt,Wt(R))}}return Zt(R),!0}return R instanceof St&&!Cn(R)||(z==="noscript"||z==="noembed"||z==="noframes")&&j(/<\/no(script|embed|frames)/i,R.innerHTML)?(Zt(R),!0):(le&&R.nodeType===3&&(Y=R.textContent,Y=M(Y,Ke," "),Y=M(Y,we," "),Y=M(Y,Le," "),R.textContent!==Y&&(C(gt.removed,{element:R.cloneNode()}),R.textContent=Y)),ae("afterSanitizeElements",R,null),!1)}return D}(),In=function(){function D(R,Y,z){if(ze&&(Y==="id"||Y==="name")&&(z in Lt||z in Mn||z==="__depth"||z==="__removalCount"))return!1;if(!(We&&!De[Y]&&j(An,Y))){if(!(pn&&j(dn,Y))){if(!Xt[Y]||De[Y]){if(!(wn(R)&&(zt.tagNameCheck instanceof RegExp&&j(zt.tagNameCheck,R)||zt.tagNameCheck instanceof Function&&zt.tagNameCheck(R))&&(zt.attributeNameCheck instanceof RegExp&&j(zt.attributeNameCheck,Y)||zt.attributeNameCheck instanceof Function&&zt.attributeNameCheck(Y))||Y==="is"&&zt.allowCustomizedBuiltInElements&&(zt.tagNameCheck instanceof RegExp&&j(zt.tagNameCheck,z)||zt.tagNameCheck instanceof Function&&zt.tagNameCheck(z))))return!1}else if(!Je[Y]){if(!j(he,M(z,vn,""))){if(!((Y==="src"||Y==="xlink:href"||Y==="href")&&R!=="script"&&w(z,"data:")===0&&yn[R])){if(!(gn&&!j(Pn,M(z,vn,"")))){if(z)return!1}}}}}}return!0}return D}(),wn=function(){function D(R){return R!=="annotation-xml"&&P(R,Be)}return D}(),N=function(){function D(R){var Y,z,Z,ht;ae("beforeSanitizeAttributes",R,null);var bt=R.attributes;if(bt){var Rt={attrName:"",attrValue:"",keepAttr:!0,allowedAttributes:Xt};for(ht=bt.length;ht--;){Y=bt[ht];var Mt=Y,Bt=Mt.name,wt=Mt.namespaceURI;if(z=Bt==="value"?Y.value:V(Y.value),Z=Qt(Bt),Rt.attrName=Z,Rt.attrValue=z,Rt.keepAttr=!0,Rt.forceKeepAttr=void 0,ae("uponSanitizeAttribute",R,Rt),z=Rt.attrValue,!Rt.forceKeepAttr&&(ye(Bt,R),!!Rt.keepAttr)){if(!mn&&j(/\/>/i,z)){ye(Bt,R);continue}if(Fe&&j(/((--!?|])>)|<\/(style|title)/i,z)){ye(Bt,R);continue}le&&(z=M(z,Ke," "),z=M(z,we," "),z=M(z,Le," "));var Dt=Qt(R.nodeName);if(In(Dt,Z,z)){if(ke&&(Z==="id"||Z==="name")&&(ye(Bt,R),z=pe+z),_t&&e(Ht)==="object"&&typeof Ht.getAttributeType=="function"&&!wt)switch(Ht.getAttributeType(Dt,Z)){case"TrustedHTML":{z=_t.createHTML(z);break}case"TrustedScriptURL":{z=_t.createScriptURL(z);break}}try{wt?R.setAttributeNS(wt,Bt,z):R.setAttribute(Bt,z),nn(R)?Zt(R):E(gt.removed)}catch(Yt){}}}}ae("afterSanitizeAttributes",R,null)}}return D}(),B=function(){function D(R){var Y,z=Ye(R);for(ae("beforeSanitizeShadowDOM",R,null);Y=z.nextNode();)if(ae("uponSanitizeShadowNode",Y,null),!rn(Y)){var Z=be(Y);Y.nodeType===1&&(Z&&Z.__depth?Y.__depth=(Y.__removalCount||0)+Z.__depth+1:Y.__depth=1),(Y.__depth>=En||G(Y.__depth))&&Zt(Y),Y.content instanceof Vt&&(Y.content.__depth=Y.__depth,D(Y.content)),N(Y)}ae("afterSanitizeShadowDOM",R,null)}return D}();return gt.sanitize=function(D){var R=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},Y,z,Z,ht,bt;if(_e=!D,_e&&(D=""),typeof D!="string"&&!Ne(D))if(typeof D.toString=="function"){if(D=D.toString(),typeof D!="string")throw $("dirty is not a string, aborting")}else throw $("toString is not a function");if(!gt.isSupported){if(e(lt.toStaticHTML)==="object"||typeof lt.toStaticHTML=="function"){if(typeof D=="string")return lt.toStaticHTML(D);if(Ne(D))return lt.toStaticHTML(D.outerHTML)}return D}if(xe||ee(R),gt.removed=[],typeof D=="string"&&(Ae=!1),Ae){if(D.nodeName){var Rt=Qt(D.nodeName);if(!$t[Rt]||ce[Rt])throw $("root node is forbidden and cannot be sanitized in-place")}}else if(D instanceof vt)Y=Tn(""),z=Y.ownerDocument.importNode(D,!0),z.nodeType===1&&z.nodeName==="BODY"||z.nodeName==="HTML"?Y=z:Y.appendChild(z);else{if(!kt&&!le&&!fe&&D.indexOf("<")===-1)return _t&&je?_t.createHTML(D):D;if(Y=Tn(D),!Y)return kt?null:je?Re:""}Y&&Oe&&Zt(Y.firstChild);for(var Mt=Ye(Ae?D:Y);Z=Mt.nextNode();)if(!(Z.nodeType===3&&Z===ht)&&!rn(Z)){var Bt=be(Z);Z.nodeType===1&&(Bt&&Bt.__depth?Z.__depth=(Z.__removalCount||0)+Bt.__depth+1:Z.__depth=1),(Z.__depth>=En||G(Z.__depth))&&Zt(Z),Z.content instanceof Vt&&(Z.content.__depth=Z.__depth,B(Z.content)),N(Z),ht=Z}if(ht=null,Ae)return D;if(kt){if(Ve)for(bt=cn.call(Y.ownerDocument);Y.firstChild;)bt.appendChild(Y.firstChild);else bt=Y;return(Xt.shadowroot||Xt.shadowrootmod)&&(bt=ln.call(It,bt,!0)),bt}var wt=fe?Y.outerHTML:Y.innerHTML;return fe&&$t["!doctype"]&&Y.ownerDocument&&Y.ownerDocument.doctype&&Y.ownerDocument.doctype.name&&j(pt,Y.ownerDocument.doctype.name)&&(wt="\n"+wt),le&&(wt=M(wt,Ke," "),wt=M(wt,we," "),wt=M(wt,Le," ")),_t&&je?_t.createHTML(wt):wt},gt.setConfig=function(D){ee(D),xe=!0},gt.clearConfig=function(){Ie=null,xe=!1},gt.isValidAttribute=function(D,R,Y){Ie||ee({});var z=Qt(D),Z=Qt(R);return In(z,Z,Y)},gt.addHook=function(D,R){typeof R=="function"&&(ne[D]=ne[D]||[],C(ne[D],R))},gt.removeHook=function(D){if(ne[D])return E(ne[D])},gt.removeHooks=function(D){ne[D]&&(ne[D]=[])},gt.removeAllHooks=function(){ne={}},gt}var Ct=Pt();return Ct})},15875:function(y,e){"use strict";e.__esModule=!0,e.VNodeFlags=e.ChildFlags=void 0;var t;(function(r){r[r.Unknown=0]="Unknown",r[r.HtmlElement=1]="HtmlElement",r[r.ComponentUnknown=2]="ComponentUnknown",r[r.ComponentClass=4]="ComponentClass",r[r.ComponentFunction=8]="ComponentFunction",r[r.Text=16]="Text",r[r.SvgElement=32]="SvgElement",r[r.InputElement=64]="InputElement",r[r.TextareaElement=128]="TextareaElement",r[r.SelectElement=256]="SelectElement",r[r.Portal=1024]="Portal",r[r.ReCreate=2048]="ReCreate",r[r.ContentEditable=4096]="ContentEditable",r[r.Fragment=8192]="Fragment",r[r.InUse=16384]="InUse",r[r.ForwardRef=32768]="ForwardRef",r[r.Normalized=65536]="Normalized",r[r.ForwardRefComponent=32776]="ForwardRefComponent",r[r.FormElement=448]="FormElement",r[r.Element=481]="Element",r[r.Component=14]="Component",r[r.DOMRef=1521]="DOMRef",r[r.InUseOrNormalized=81920]="InUseOrNormalized",r[r.ClearInUse=-16385]="ClearInUse",r[r.ComponentKnown=12]="ComponentKnown"})(t||(e.VNodeFlags=t={}));var n;(function(r){r[r.UnknownChildren=0]="UnknownChildren",r[r.HasInvalidChildren=1]="HasInvalidChildren",r[r.HasVNodeChildren=2]="HasVNodeChildren",r[r.HasNonKeyedChildren=4]="HasNonKeyedChildren",r[r.HasKeyedChildren=8]="HasKeyedChildren",r[r.HasTextChildren=16]="HasTextChildren",r[r.MultipleChildren=12]="MultipleChildren"})(n||(e.ChildFlags=n={}))},89292:function(y,e){"use strict";e.__esModule=!0,e.Fragment=e.EMPTY_OBJ=e.Component=e.AnimationQueues=void 0,e._CI=xe,e._HI=nt,e._M=kt,e._MCCC=Qe,e._ME=ke,e._MFCC=Ze,e._MP=Fe,e._MR=he,e._RFC=Oe,e.__render=Ge,e.createComponentVNode=at,e.createFragment=dt,e.createPortal=ot,e.createRef=Pn,e.createRenderer=Zt,e.createTextVNode=ft,e.createVNode=ut,e.directClone=it,e.findDOMFromVNode=S,e.forwardRef=vn,e.getFlagsForElementVnode=k,e.linkEvent=i,e.normalizeProps=_,e.options=void 0,e.render=Cn,e.rerender=ae,e.version=void 0;var t=Array.isArray;function n(N){var B=typeof N;return B==="string"||B==="number"}function r(N){return N==null}function o(N){return N===null||N===!1||N===!0||N===void 0}function a(N){return typeof N=="function"}function s(N){return typeof N=="string"}function u(N){return typeof N=="number"}function l(N){return N===null}function p(N){return N===void 0}function f(N,B){var D={};if(N)for(var R in N)D[R]=N[R];if(B)for(var Y in B)D[Y]=B[Y];return D}function i(N,B){return a(B)?{data:N,event:B}:null}function d(N){return!l(N)&&typeof N=="object"}var c=e.EMPTY_OBJ={},g=e.Fragment="$F",v=e.AnimationQueues=function(){function N(){this.componentDidAppear=[],this.componentWillDisappear=[],this.componentWillMove=[]}return N}();function h(N){return N.substring(2).toLowerCase()}function m(N,B){N.appendChild(B)}function b(N,B,D){l(D)?m(N,B):N.insertBefore(B,D)}function I(N,B){return B?document.createElementNS("http://www.w3.org/2000/svg",N):document.createElement(N)}function O(N,B,D){N.replaceChild(B,D)}function T(N,B){N.removeChild(B)}function E(N){for(var B=0;B0?A(D.componentWillDisappear,w(N,B)):M(N,B,!1)}function j(N,B,D,R,Y,z,Z,ht){N.componentWillMove.push({dom:R,fn:function(){function bt(){Z&4?D.componentWillMove(B,Y,R):Z&8&&D.onComponentWillMove(B,Y,R,ht)}return bt}(),next:z,parent:Y})}function $(N,B,D,R,Y){var z,Z,ht=B.flags;do{var bt=B.flags;if(bt&1521){!r(z)&&(a(z.componentWillMove)||a(z.onComponentWillMove))?j(Y,N,z,B.dom,D,R,ht,Z):b(D,B.dom,R);return}var Rt=B.children;if(bt&4)z=B.children,Z=B.props,B=Rt.$LI;else if(bt&8)z=B.ref,Z=B.props,B=Rt;else if(bt&8192)if(B.childFlags===2)B=Rt;else{for(var Mt=0,Bt=Rt.length;Mt0,Rt=l(ht),Mt=s(ht)&&ht[0]===W;bt||Rt||Mt?(D=D||B.slice(0,z),(bt||Mt)&&(Z=it(Z)),(Rt||Mt)&&(Z.key=W+z),D.push(Z)):D&&D.push(Z),Z.flags|=65536}}D=D||B,D.length===0?R=1:R=8}else D=B,D.flags|=65536,B.flags&81920&&(D=it(B)),R=2;return N.children=D,N.childFlags=R,N}function nt(N){return o(N)||n(N)?ft(N,null):t(N)?dt(N,0,null):N.flags&16384?it(N):N}var pt="http://www.w3.org/1999/xlink",Et="http://www.w3.org/XML/1998/namespace",st={"xlink:actuate":pt,"xlink:arcrole":pt,"xlink:href":pt,"xlink:role":pt,"xlink:show":pt,"xlink:title":pt,"xlink:type":pt,"xml:base":Et,"xml:lang":Et,"xml:space":Et};function yt(N){return{onClick:N,onDblClick:N,onFocusIn:N,onFocusOut:N,onKeyDown:N,onKeyPress:N,onKeyUp:N,onMouseDown:N,onMouseMove:N,onMouseUp:N,onTouchEnd:N,onTouchMove:N,onTouchStart:N}}var Pt=yt(0),Ct=yt(null),lt=yt(!0);function gt(N,B){var D=B.$EV;return D||(D=B.$EV=yt(null)),D[N]||++Pt[N]===1&&(Ct[N]=jt(N)),D}function It(N,B){var D=B.$EV;D&&D[N]&&(--Pt[N]===0&&(document.removeEventListener(h(N),Ct[N]),Ct[N]=null),D[N]=null)}function Lt(N,B,D,R){if(a(D))gt(N,R)[N]=D;else if(d(D)){if(x(B,D))return;gt(N,R)[N]=D}else It(N,R)}function Vt(N){return a(N.composedPath)?N.composedPath()[0]:N.target}function Ot(N,B,D,R){var Y=Vt(N);do{if(B&&Y.disabled)return;var z=Y.$EV;if(z){var Z=z[D];if(Z&&(R.dom=Y,Z.event?Z.event(Z.data,N):Z(N),N.cancelBubble))return}Y=Y.parentNode}while(!l(Y))}function vt(){this.cancelBubble=!0,this.immediatePropagationStopped||this.stopImmediatePropagation()}function St(){return this.defaultPrevented}function At(){return this.cancelBubble}function Tt(N){var B={dom:document};return N.isDefaultPrevented=St,N.isPropagationStopped=At,N.stopPropagation=vt,Object.defineProperty(N,"currentTarget",{configurable:!0,get:function(){function D(){return B.dom}return D}()}),B}function Nt(N){return function(B){if(B.button!==0){B.stopPropagation();return}Ot(B,!0,N,Tt(B))}}function Ft(N){return function(B){Ot(B,!1,N,Tt(B))}}function jt(N){var B=N==="onClick"||N==="onDblClick"?Nt(N):Ft(N);return document.addEventListener(h(N),B),B}function Ht(N,B){var D=document.createElement("i");return D.innerHTML=B,D.innerHTML===N.innerHTML}function Kt(N,B,D){if(N[B]){var R=N[B];R.event?R.event(R.data,D):R(D)}else{var Y=B.toLowerCase();N[Y]&&N[Y](D)}}function Gt(N,B){var D=function(){function R(Y){var z=this.$V;if(z){var Z=z.props||c,ht=z.dom;if(s(N))Kt(Z,N,Y);else for(var bt=0;bt-1&&B.options[z]&&(ht=B.options[z].value),D&&r(ht)&&(ht=N.defaultValue),se(R,ht)}}var fn=Gt("onInput",we),ne=Gt("onChange");function Ke(N,B){Wt(N,"input",fn),B.onChange&&Wt(N,"change",ne)}function we(N,B,D){var R=N.value,Y=B.value;if(r(R)){if(D){var z=N.defaultValue;!r(z)&&z!==Y&&(B.defaultValue=z,B.value=z)}}else Y!==R&&(B.defaultValue=R,B.value=R)}function Le(N,B,D,R,Y,z){N&64?ve(R,D):N&256?ln(R,D,Y,B):N&128&&we(R,D,Y),z&&(D.$V=B)}function An(N,B,D){N&64?Re(B,D):N&256?On(B):N&128&&Ke(B,D)}function dn(N){return N.type&&te(N.type)?!r(N.checked):!r(N.value)}function Pn(){return{current:null}}function vn(N){var B={render:N};return B}function Be(N){N&&!K(N,null)&&N.current&&(N.current=null)}function he(N,B,D){N&&(a(N)||N.current!==void 0)&&D.push(function(){!K(N,B)&&N.current!==void 0&&(N.current=B)})}function $t(N,B,D){re(N,D),V(N,B,D)}function re(N,B){var D=N.flags,R=N.children,Y;if(D&481){Y=N.ref;var z=N.props;Be(Y);var Z=N.childFlags;if(!l(z))for(var ht=Object.keys(z),bt=0,Rt=ht.length;bt0?A(D.componentWillDisappear,hn(B,N)):N.textContent=""}function ce(N,B,D,R){Xt(D,R),B.flags&8192?V(B,N,R):zt(N,D,R)}function De(N,B,D,R,Y){N.componentWillDisappear.push(function(z){R&4?B.componentWillDisappear(D,z):R&8&&B.onComponentWillDisappear(D,Y,z)})}function pn(N){var B=N.event;return function(D){B(N.data,D)}}function We(N,B,D,R){if(d(D)){if(x(B,D))return;D=pn(D)}Wt(R,h(N),D)}function gn(N,B,D){if(r(B)){D.removeAttribute("style");return}var R=D.style,Y,z;if(s(B)){R.cssText=B;return}if(!r(N)&&!s(N)){for(Y in B)z=B[Y],z!==N[Y]&&R.setProperty(Y,z);for(Y in N)r(B[Y])&&R.removeProperty(Y)}else for(Y in B)z=B[Y],R.setProperty(Y,z)}function mn(N,B,D,R,Y){var z=N&&N.__html||"",Z=B&&B.__html||"";z!==Z&&!r(Z)&&!Ht(R,Z)&&(l(D)||(D.childFlags&12?Xt(D.children,Y):D.childFlags===2&&re(D.children,Y),D.children=null,D.childFlags=1),R.innerHTML=Z)}function le(N,B,D,R,Y,z,Z,ht){switch(N){case"children":case"childrenType":case"className":case"defaultValue":case"key":case"multiple":case"ref":case"selectedIndex":break;case"autoFocus":R.autofocus=!!D;break;case"allowfullscreen":case"autoplay":case"capture":case"checked":case"controls":case"default":case"disabled":case"hidden":case"indeterminate":case"loop":case"muted":case"novalidate":case"open":case"readOnly":case"required":case"reversed":case"scoped":case"seamless":case"selected":R[N]=!!D;break;case"defaultChecked":case"value":case"volume":if(z&&N==="value")break;var bt=r(D)?"":D;R[N]!==bt&&(R[N]=bt);break;case"style":gn(B,D,R);break;case"dangerouslySetInnerHTML":mn(B,D,Z,R,ht);break;default:lt[N]?Lt(N,B,D,R):N.charCodeAt(0)===111&&N.charCodeAt(1)===110?We(N,B,D,R):r(D)?R.removeAttribute(N):Y&&st[N]?R.setAttributeNS(st[N],N,D):R.setAttribute(N,D);break}}function Fe(N,B,D,R,Y,z){var Z=!1,ht=(B&448)>0;ht&&(Z=dn(D),Z&&An(B,R,D));for(var bt in D)le(bt,null,D[bt],R,Y,Z,null,z);ht&&Le(B,N,R,D,!0,Z)}function fe(N,B,D){var R=nt(N.render(B,N.state,D)),Y=D;return a(N.getChildContext)&&(Y=f(D,N.getChildContext())),N.$CX=Y,R}function xe(N,B,D,R,Y,z){var Z=new B(D,R),ht=Z.$N=!!(B.getDerivedStateFromProps||Z.getSnapshotBeforeUpdate);if(Z.$SVG=Y,Z.$L=z,N.children=Z,Z.$BS=!1,Z.context=R,Z.props===c&&(Z.props=D),ht)Z.state=G(Z,D,Z.state);else if(a(Z.componentWillMount)){Z.$BR=!0,Z.componentWillMount();var bt=Z.$PS;if(!l(bt)){var Rt=Z.state;if(l(Rt))Z.state=bt;else for(var Mt in bt)Rt[Mt]=bt[Mt];Z.$PS=null}Z.$BR=!1}return Z.$LI=fe(Z,D,R),Z}function Oe(N,B){var D=N.props||c;return N.flags&32768?N.type.render(D,N.ref,B):N.type(D,B)}function kt(N,B,D,R,Y,z,Z){var ht=N.flags|=16384;ht&481?ke(N,B,D,R,Y,z,Z):ht&4?Xe(N,B,D,R,Y,z,Z):ht&8?Ae(N,B,D,R,Y,z,Z):ht&16?ze(N,B,Y):ht&8192?je(N,D,B,R,Y,z,Z):ht&1024&&Ve(N,D,B,Y,z,Z)}function Ve(N,B,D,R,Y,z){kt(N.children,N.ref,B,!1,null,Y,z);var Z=mt();ze(Z,D,R),N.dom=Z.dom}function je(N,B,D,R,Y,z,Z){var ht=N.children,bt=N.childFlags;bt&12&&ht.length===0&&(bt=N.childFlags=2,ht=N.children=mt()),bt===2?kt(ht,D,B,R,Y,z,Z):pe(ht,D,B,R,Y,z,Z)}function ze(N,B,D){var R=N.dom=document.createTextNode(N.children);l(B)||b(B,R,D)}function ke(N,B,D,R,Y,z,Z){var ht=N.flags,bt=N.props,Rt=N.className,Mt=N.childFlags,Bt=N.dom=I(N.type,R=R||(ht&32)>0),wt=N.children;if(!r(Rt)&&Rt!==""&&(R?Bt.setAttribute("class",Rt):Bt.className=Rt),Mt===16)L(Bt,wt);else if(Mt!==1){var Dt=R&&N.type!=="foreignObject";Mt===2?(wt.flags&16384&&(N.children=wt=it(wt)),kt(wt,Bt,D,Dt,null,z,Z)):(Mt===8||Mt===4)&&pe(wt,Bt,D,Dt,null,z,Z)}l(B)||b(B,Bt,Y),l(bt)||Fe(N,ht,bt,Bt,R,Z),he(N.ref,Bt,z)}function pe(N,B,D,R,Y,z,Z){for(var ht=0;htDt)&&(Bt=S(ht[Dt-1],!1).nextSibling)}tn(Rt,Mt,ht,bt,D,R,Y,Bt,N,z,Z)}function Te(N,B,D,R,Y){var z=N.ref,Z=B.ref,ht=B.children;if(tn(N.childFlags,B.childFlags,N.children,ht,z,D,!1,null,N,R,Y),B.dom=N.dom,z!==Z&&!o(ht)){var bt=ht.dom;T(z,bt),m(Z,bt)}}function _e(N,B,D,R,Y,z,Z){var ht=B.dom=N.dom,bt=N.props,Rt=B.props,Mt=!1,Bt=!1,wt;if(R=R||(Y&32)>0,bt!==Rt){var Dt=bt||c;if(wt=Rt||c,wt!==c){Mt=(Y&448)>0,Mt&&(Bt=dn(wt));for(var Yt in wt){var xt=Dt[Yt],Jt=wt[Yt];xt!==Jt&&le(Yt,xt,Jt,ht,R,Bt,N,Z)}}if(Dt!==c)for(var Ut in Dt)r(wt[Ut])&&!r(Dt[Ut])&&le(Ut,Dt[Ut],null,ht,R,Bt,N,Z)}var Se=B.children,ie=B.className;N.className!==ie&&(r(ie)?ht.removeAttribute("class"):R?ht.setAttribute("class",ie):ht.className=ie),Y&4096?He(ht,Se):tn(N.childFlags,B.childFlags,N.children,Se,ht,D,R&&B.type!=="foreignObject",null,N,z,Z),Mt&&Le(Y,B,ht,wt,!1,Bt);var on=B.ref,de=N.ref;de!==on&&(Be(de),he(on,ht,z))}function qe(N,B,D,R,Y,z,Z){re(N,Z),pe(B,D,R,Y,S(N,!0),z,Z),V(N,D,Z)}function tn(N,B,D,R,Y,z,Z,ht,bt,Rt,Mt){switch(N){case 2:switch(B){case 2:oe(D,R,Y,z,Z,ht,Rt,Mt);break;case 1:$t(D,Y,Mt);break;case 16:re(D,Mt),L(Y,R);break;default:qe(D,R,Y,z,Z,Rt,Mt);break}break;case 1:switch(B){case 2:kt(R,Y,z,Z,ht,Rt,Mt);break;case 1:break;case 16:L(Y,R);break;default:pe(R,Y,z,Z,ht,Rt,Mt);break}break;case 16:switch(B){case 16:Ue(D,R,Y);break;case 2:zt(Y,D,Mt),kt(R,Y,z,Z,ht,Rt,Mt);break;case 1:zt(Y,D,Mt);break;default:zt(Y,D,Mt),pe(R,Y,z,Z,ht,Rt,Mt);break}break;default:switch(B){case 16:Xt(D,Mt),L(Y,R);break;case 2:ce(Y,bt,D,Mt),kt(R,Y,z,Z,ht,Rt,Mt);break;case 1:ce(Y,bt,D,Mt);break;default:var Bt=D.length|0,wt=R.length|0;Bt===0?wt>0&&pe(R,Y,z,Z,ht,Rt,Mt):wt===0?ce(Y,bt,D,Mt):B===8&&N===8?Mn(D,R,Y,z,Z,Bt,wt,ht,bt,Rt,Mt):En(D,R,Y,z,Z,Bt,wt,ht,Rt,Mt);break}break}}function me(N,B,D,R,Y){Y.push(function(){N.componentDidUpdate(B,D,R)})}function Sn(N,B,D,R,Y,z,Z,ht,bt,Rt){var Mt=N.state,Bt=N.props,wt=!!N.$N,Dt=a(N.shouldComponentUpdate);if(wt&&(B=G(N,D,B!==Mt?f(Mt,B):B)),Z||!Dt||Dt&&N.shouldComponentUpdate(D,B,Y)){!wt&&a(N.componentWillUpdate)&&N.componentWillUpdate(D,B,Y),N.props=D,N.state=B,N.context=Y;var Yt=null,xt=fe(N,D,Y);wt&&a(N.getSnapshotBeforeUpdate)&&(Yt=N.getSnapshotBeforeUpdate(Bt,Mt)),oe(N.$LI,xt,R,N.$CX,z,ht,bt,Rt),N.$LI=xt,a(N.componentDidUpdate)&&me(N,Bt,Mt,Yt,bt)}else N.props=D,N.state=B,N.context=Y}function Nn(N,B,D,R,Y,z,Z,ht){var bt=B.children=N.children;if(!l(bt)){bt.$L=Z;var Rt=B.props||c,Mt=B.ref,Bt=N.ref,wt=bt.state;if(!bt.$N){if(a(bt.componentWillReceiveProps)){if(bt.$BR=!0,bt.componentWillReceiveProps(Rt,R),bt.$UN)return;bt.$BR=!1}l(bt.$PS)||(wt=f(wt,bt.$PS),bt.$PS=null)}Sn(bt,wt,Rt,D,R,Y,!1,z,Z,ht),Bt!==Mt&&(Be(Bt),he(Mt,bt,Z))}}function Qt(N,B,D,R,Y,z,Z,ht){var bt=!0,Rt=B.props||c,Mt=B.ref,Bt=N.props,wt=!r(Mt),Dt=N.children;if(wt&&a(Mt.onComponentShouldUpdate)&&(bt=Mt.onComponentShouldUpdate(Bt,Rt)),bt!==!1){wt&&a(Mt.onComponentWillUpdate)&&Mt.onComponentWillUpdate(Bt,Rt);var Yt=nt(Oe(B,R));oe(Dt,Yt,D,R,Y,z,Z,ht),B.children=Yt,wt&&a(Mt.onComponentDidUpdate)&&Mt.onComponentDidUpdate(Bt,Rt)}else B.children=Dt}function Ie(N,B){var D=B.children,R=B.dom=N.dom;D!==N.children&&(R.nodeValue=D)}function En(N,B,D,R,Y,z,Z,ht,bt,Rt){for(var Mt=z>Z?Z:z,Bt=0,wt,Dt;BtZ)for(Bt=Mt;BtBt||Dt>wt)break t;Yt=N[Dt],xt=B[Dt]}for(Yt=N[Bt],xt=B[wt];Yt.key===xt.key;){if(xt.flags&16384&&(B[wt]=xt=it(xt)),oe(Yt,xt,D,R,Y,ht,Rt,Mt),N[Bt]=xt,Bt--,wt--,Dt>Bt||Dt>wt)break t;Yt=N[Bt],xt=B[wt]}}if(Dt>Bt){if(Dt<=wt)for(Jt=wt+1,Ut=Jtwt)for(;Dt<=Bt;)$t(N[Dt++],D,Mt);else bn(N,B,R,z,Z,Bt,wt,Dt,D,Y,ht,bt,Rt,Mt)}function bn(N,B,D,R,Y,z,Z,ht,bt,Rt,Mt,Bt,wt,Dt){var Yt,xt,Jt=0,Ut=0,Se=ht,ie=ht,on=z-ht+1,de=Z-ht+1,an=new Int32Array(de+1),Ee=on===R,Ln=!1,qt=0,un=0;if(Y<4||(on|de)<32)for(Ut=Se;Ut<=z;++Ut)if(Yt=N[Ut],unht?Ln=!0:qt=ht,xt.flags&16384&&(B[ht]=xt=it(xt)),oe(Yt,xt,bt,D,Rt,Mt,wt,Dt),++un;break}!Ee&&ht>Z&&$t(Yt,bt,Dt)}else Ee||$t(Yt,bt,Dt);else{var Dn={};for(Ut=ie;Ut<=Z;++Ut)Dn[B[Ut].key]=Ut;for(Ut=Se;Ut<=z;++Ut)if(Yt=N[Ut],unSe;)$t(N[Se++],bt,Dt);an[ht-ie]=Ut+1,qt>ht?Ln=!0:qt=ht,xt=B[ht],xt.flags&16384&&(B[ht]=xt=it(xt)),oe(Yt,xt,bt,D,Rt,Mt,wt,Dt),++un}else Ee||$t(Yt,bt,Dt);else Ee||$t(Yt,bt,Dt)}if(Ee)ce(bt,Bt,N,Dt),pe(B,bt,D,Rt,Mt,wt,Dt);else if(Ln){var Fn=Rn(an);for(ht=Fn.length-1,Ut=de-1;Ut>=0;Ut--)an[Ut]===0?(qt=Ut+ie,xt=B[qt],xt.flags&16384&&(B[qt]=xt=it(xt)),Jt=qt+1,kt(xt,bt,D,Rt,Jt0&&P(Dt.componentWillMove)}else if(un!==de)for(Ut=de-1;Ut>=0;Ut--)an[Ut]===0&&(qt=Ut+ie,xt=B[qt],xt.flags&16384&&(B[qt]=xt=it(xt)),Jt=qt+1,kt(xt,bt,D,Rt,Jten&&(en=bt,ee=new Int32Array(bt),Pe=new Int32Array(bt));D>1,N[ee[ht]]0&&(Pe[D]=ee[z-1]),ee[z]=D)}z=Y+1;var Rt=new Int32Array(z);for(Z=ee[z-1];z-- >0;)Rt[z]=Z,Z=Pe[Z],ee[z]=0;return Rt}var $e=typeof document!="undefined";$e&&window.Node&&(Node.prototype.$EV=null,Node.prototype.$V=null);function Ge(N,B,D,R){var Y=[],z=new v,Z=B.$V;H.v=!0,r(Z)?r(N)||(N.flags&16384&&(N=it(N)),kt(N,B,R,!1,null,Y,z),B.$V=N,Z=N):r(N)?($t(Z,B,z),B.$V=null):(N.flags&16384&&(N=it(N)),oe(Z,N,B,R,!1,null,Y,z),Z=B.$V=N),E(Y),A(z.componentDidAppear),H.v=!1,a(D)&&D(),a(F.renderComplete)&&F.renderComplete(Z,B)}function Cn(N,B,D,R){D===void 0&&(D=null),R===void 0&&(R=c),Ge(N,B,D,R)}function Zt(N){return function(){function B(D,R,Y,z){N||(N=D),Cn(R,N,Y,z)}return B}()}var ye=[],Tn=typeof Promise!="undefined"?Promise.resolve().then.bind(Promise.resolve()):function(N){window.setTimeout(N,0)},Ye=!1;function nn(N,B,D,R){var Y=N.$PS;if(a(B)&&(B=B(Y?f(N.state,Y):N.state,N.props,N.context)),r(Y))N.$PS=B;else for(var z in B)Y[z]=B[z];if(N.$BR)a(D)&&N.$L.push(D.bind(N));else{if(!H.v&&ye.length===0){rn(N,R),a(D)&&D.call(N);return}if(ye.indexOf(N)===-1&&ye.push(N),R&&(N.$F=!0),Ye||(Ye=!0,Tn(ae)),a(D)){var Z=N.$QU;Z||(Z=N.$QU=[]),Z.push(D)}}}function Ne(N){for(var B=N.$QU,D=0;D=0;--K){var W=this.tryEntries[K],q=W.completion;if(W.tryLoc==="root")return U("end");if(W.tryLoc<=this.prev){var ut=r.call(W,"catchLoc"),ct=r.call(W,"finallyLoc");if(ut&&ct){if(this.prev=0;--U){var K=this.tryEntries[U];if(K.tryLoc<=this.prev&&r.call(K,"finallyLoc")&&this.prev=0;--x){var U=this.tryEntries[x];if(U.finallyLoc===L)return this.complete(U.completion,U.afterLoc),j(U),m}}return F}(),catch:function(){function F(L){for(var x=this.tryEntries.length-1;x>=0;--x){var U=this.tryEntries[x];if(U.tryLoc===L){var K=U.completion;if(K.type==="throw"){var W=K.arg;j(U)}return W}}throw new Error("illegal catch attempt")}return F}(),delegateYield:function(){function F(L,x,U){return this.delegate={iterator:G(L),resultName:x,nextLoc:U},this.method==="next"&&(this.arg=a),m}return F}()},t}(y.exports);try{regeneratorRuntime=e}catch(t){typeof globalThis=="object"?globalThis.regeneratorRuntime=e:Function("r","regeneratorRuntime = r")(e)}},30236:function(){"use strict";self.fetch||(self.fetch=function(y,e){return e=e||{},new Promise(function(t,n){var r=new XMLHttpRequest,o=[],a={},s=function(){function l(){return{ok:(r.status/100|0)==2,statusText:r.statusText,status:r.status,url:r.responseURL,text:function(){function p(){return Promise.resolve(r.responseText)}return p}(),json:function(){function p(){return Promise.resolve(r.responseText).then(JSON.parse)}return p}(),blob:function(){function p(){return Promise.resolve(new Blob([r.response]))}return p}(),clone:l,headers:{keys:function(){function p(){return o}return p}(),entries:function(){function p(){return o.map(function(f){return[f,r.getResponseHeader(f)]})}return p}(),get:function(){function p(f){return r.getResponseHeader(f)}return p}(),has:function(){function p(f){return r.getResponseHeader(f)!=null}return p}()}}}return l}();for(var u in r.open(e.method||"get",y,!0),r.onload=function(){r.getAllResponseHeaders().toLowerCase().replace(/^(.+?):/gm,function(l,p){a[p]||o.push(a[p]=p)}),t(s())},r.onerror=n,r.withCredentials=e.credentials=="include",e.headers)r.setRequestHeader(u,e.headers[u]);r.send(e.body||null)})})},88510:function(y,e){"use strict";e.__esModule=!0,e.zipWith=e.zip=e.uniqBy=e.uniq=e.toKeyedArray=e.toArray=e.sortBy=e.sort=e.reduce=e.range=e.map=e.filterMap=e.filter=void 0;function t(b,I){var O=typeof Symbol!="undefined"&&b[Symbol.iterator]||b["@@iterator"];if(O)return(O=O.call(b)).next.bind(O);if(Array.isArray(b)||(O=n(b))||I&&b&&typeof b.length=="number"){O&&(b=O);var T=0;return function(){return T>=b.length?{done:!0}:{done:!1,value:b[T++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function n(b,I){if(b){if(typeof b=="string")return r(b,I);var O={}.toString.call(b).slice(8,-1);return O==="Object"&&b.constructor&&(O=b.constructor.name),O==="Map"||O==="Set"?Array.from(b):O==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(O)?r(b,I):void 0}}function r(b,I){(I==null||I>b.length)&&(I=b.length);for(var O=0,T=Array(I);OP)return 1}return 0},f=e.sortBy=function(){function b(){for(var I=arguments.length,O=new Array(I),T=0;TP)return 1}return 0},f=e.sortBy=function(){function b(){for(var I=arguments.length,O=new Array(I),T=0;T=1-t)return U[K-1];var q=W%1,ut=W|0;return H.lerp(U[ut],U[ut+1],q)}return L}(),H}(),r=function(F,L,x){return L===void 0&&(L=0),x===void 0&&(x=Math.pow(10,L)),Math.round(x*F)/x},o={grad:360/400,turn:360,rad:360/(Math.PI*2)},a=e.hexToHsva=function(){function H(F){return P(s(F))}return H}(),s=e.hexToRgba=function(){function H(F){return F[0]==="#"&&(F=F.substring(1)),F.length<6?{r:parseInt(F[0]+F[0],16),g:parseInt(F[1]+F[1],16),b:parseInt(F[2]+F[2],16),a:F.length===4?r(parseInt(F[3]+F[3],16)/255,2):1}:{r:parseInt(F.substring(0,2),16),g:parseInt(F.substring(2,4),16),b:parseInt(F.substring(4,6),16),a:F.length===8?r(parseInt(F.substring(6,8),16)/255,2):1}}return H}(),u=e.parseHue=function(){function H(F,L){return L===void 0&&(L="deg"),Number(F)*(o[L]||1)}return H}(),l=e.hslaStringToHsva=function(){function H(F){var L=/hsla?\(?\s*(-?\d*\.?\d+)(deg|rad|grad|turn)?[,\s]+(-?\d*\.?\d+)%?[,\s]+(-?\d*\.?\d+)%?,?\s*[/\s]*(-?\d*\.?\d+)?(%)?\s*\)?/i,x=L.exec(F);return x?f({h:u(x[1],x[2]),s:Number(x[3]),l:Number(x[4]),a:x[5]===void 0?1:Number(x[5])/(x[6]?100:1)}):{h:0,s:0,v:0,a:1}}return H}(),p=e.hslStringToHsva=l,f=e.hslaToHsva=function(){function H(F){var L=F.h,x=F.s,U=F.l,K=F.a;return x*=(U<50?U:100-U)/100,{h:L,s:x>0?2*x/(U+x)*100:0,v:U+x,a:K}}return H}(),i=e.hsvaToHex=function(){function H(F){return A(m(F))}return H}(),d=e.hsvaToHsla=function(){function H(F){var L=F.h,x=F.s,U=F.v,K=F.a,W=(200-x)*U/100;return{h:r(L),s:r(W>0&&W<200?x*U/100/(W<=100?W:200-W)*100:0),l:r(W/2),a:r(K,2)}}return H}(),c=e.hsvaToHslString=function(){function H(F){var L=d(F),x=L.h,U=L.s,K=L.l;return"hsl("+x+", "+U+"%, "+K+"%)"}return H}(),g=e.hsvaToHsvString=function(){function H(F){var L=M(F),x=L.h,U=L.s,K=L.v;return"hsv("+x+", "+U+"%, "+K+"%)"}return H}(),v=e.hsvaToHsvaString=function(){function H(F){var L=M(F),x=L.h,U=L.s,K=L.v,W=L.a;return"hsva("+x+", "+U+"%, "+K+"%, "+W+")"}return H}(),h=e.hsvaToHslaString=function(){function H(F){var L=d(F),x=L.h,U=L.s,K=L.l,W=L.a;return"hsla("+x+", "+U+"%, "+K+"%, "+W+")"}return H}(),m=e.hsvaToRgba=function(){function H(F){var L=F.h,x=F.s,U=F.v,K=F.a;L=L/360*6,x=x/100,U=U/100;var W=Math.floor(L),q=U*(1-x),ut=U*(1-(L-W)*x),ct=U*(1-(1-L+W)*x),Q=W%6;return{r:[U,ut,q,q,ct,U][Q]*255,g:[ct,U,U,ut,q,q][Q]*255,b:[q,q,ct,U,U,ut][Q]*255,a:r(K,2)}}return H}(),b=e.hsvaToRgbString=function(){function H(F){var L=m(F),x=L.r,U=L.g,K=L.b;return"rgb("+r(x)+", "+r(U)+", "+r(K)+")"}return H}(),I=e.hsvaToRgbaString=function(){function H(F){var L=m(F),x=L.r,U=L.g,K=L.b,W=L.a;return"rgba("+r(x)+", "+r(U)+", "+r(K)+", "+r(W,2)+")"}return H}(),O=e.hsvaStringToHsva=function(){function H(F){var L=/hsva?\(?\s*(-?\d*\.?\d+)(deg|rad|grad|turn)?[,\s]+(-?\d*\.?\d+)%?[,\s]+(-?\d*\.?\d+)%?,?\s*[/\s]*(-?\d*\.?\d+)?(%)?\s*\)?/i,x=L.exec(F);return x?M({h:u(x[1],x[2]),s:Number(x[3]),v:Number(x[4]),a:x[5]===void 0?1:Number(x[5])/(x[6]?100:1)}):{h:0,s:0,v:0,a:1}}return H}(),T=e.hsvStringToHsva=O,E=e.rgbaStringToHsva=function(){function H(F){var L=/rgba?\(?\s*(-?\d*\.?\d+)(%)?[,\s]+(-?\d*\.?\d+)(%)?[,\s]+(-?\d*\.?\d+)(%)?,?\s*[/\s]*(-?\d*\.?\d+)?(%)?\s*\)?/i,x=L.exec(F);return x?P({r:Number(x[1])/(x[2]?100/255:1),g:Number(x[3])/(x[4]?100/255:1),b:Number(x[5])/(x[6]?100/255:1),a:x[7]===void 0?1:Number(x[7])/(x[8]?100:1)}):{h:0,s:0,v:0,a:1}}return H}(),C=e.rgbStringToHsva=E,S=function(F){var L=F.toString(16);return L.length<2?"0"+L:L},A=e.rgbaToHex=function(){function H(F){var L=F.r,x=F.g,U=F.b,K=F.a,W=K<1?S(r(K*255)):"";return"#"+S(r(L))+S(r(x))+S(r(U))+W}return H}(),P=e.rgbaToHsva=function(){function H(F){var L=F.r,x=F.g,U=F.b,K=F.a,W=Math.max(L,x,U),q=W-Math.min(L,x,U),ut=q?W===L?(x-U)/q:W===x?2+(U-L)/q:4+(L-x)/q:0;return{h:60*(ut<0?ut+6:ut),s:W?q/W*100:0,v:W/255*100,a:K}}return H}(),M=e.roundHsva=function(){function H(F){return{h:r(F.h),s:r(F.s),v:r(F.v),a:r(F.a,2)}}return H}(),R=e.rgbaToRgb=function(){function H(F){var L=F.r,x=F.g,U=F.b;return{r:L,g:x,b:U}}return H}(),V=e.hslaToHsl=function(){function H(F){var L=F.h,x=F.s,U=F.l;return{h:L,s:x,l:U}}return H}(),j=e.hsvaToHsv=function(){function H(F){var L=M(F),x=L.h,U=L.s,K=L.v;return{h:x,s:U,v:K}}return H}(),$=/^#?([0-9A-F]{3,8})$/i,G=e.validHex=function(){function H(F,L){var x=$.exec(F),U=x?x[1].length:0;return U===3||U===6||!!L&&U===4||!!L&&U===8}return H}()},92868:function(y,e){"use strict";e.__esModule=!0,e.EventEmitter=void 0;/**
+ */var t=1e-4,n=e.Color=function(){function H(L,x,U,K){L===void 0&&(L=0),x===void 0&&(x=0),U===void 0&&(U=0),K===void 0&&(K=1),this.r=void 0,this.g=void 0,this.b=void 0,this.a=void 0,this.r=L,this.g=x,this.b=U,this.a=K}var F=H.prototype;return F.toString=function(){function L(){return"rgba("+(this.r|0)+", "+(this.g|0)+", "+(this.b|0)+", "+(this.a|0)+")"}return L}(),H.fromHex=function(){function L(x){return new H(parseInt(x.substr(1,2),16),parseInt(x.substr(3,2),16),parseInt(x.substr(5,2),16))}return L}(),H.lerp=function(){function L(x,U,K){return new H((U.r-x.r)*K+x.r,(U.g-x.g)*K+x.g,(U.b-x.b)*K+x.b,(U.a-x.a)*K+x.a)}return L}(),H.lookup=function(){function L(x,U){U===void 0&&(U=[]);var K=U.length;if(K<2)throw new Error("Needs at least two colors!");var W=x*(K-1);if(x=1-t)return U[K-1];var q=W%1,ut=W|0;return H.lerp(U[ut],U[ut+1],q)}return L}(),H}(),r=function(F,L,x){return L===void 0&&(L=0),x===void 0&&(x=Math.pow(10,L)),Math.round(x*F)/x},o={grad:360/400,turn:360,rad:360/(Math.PI*2)},a=e.hexToHsva=function(){function H(F){return P(s(F))}return H}(),s=e.hexToRgba=function(){function H(F){return F[0]==="#"&&(F=F.substring(1)),F.length<6?{r:parseInt(F[0]+F[0],16),g:parseInt(F[1]+F[1],16),b:parseInt(F[2]+F[2],16),a:F.length===4?r(parseInt(F[3]+F[3],16)/255,2):1}:{r:parseInt(F.substring(0,2),16),g:parseInt(F.substring(2,4),16),b:parseInt(F.substring(4,6),16),a:F.length===8?r(parseInt(F.substring(6,8),16)/255,2):1}}return H}(),u=e.parseHue=function(){function H(F,L){return L===void 0&&(L="deg"),Number(F)*(o[L]||1)}return H}(),l=e.hslaStringToHsva=function(){function H(F){var L=/hsla?\(?\s*(-?\d*\.?\d+)(deg|rad|grad|turn)?[,\s]+(-?\d*\.?\d+)%?[,\s]+(-?\d*\.?\d+)%?,?\s*[/\s]*(-?\d*\.?\d+)?(%)?\s*\)?/i,x=L.exec(F);return x?f({h:u(x[1],x[2]),s:Number(x[3]),l:Number(x[4]),a:x[5]===void 0?1:Number(x[5])/(x[6]?100:1)}):{h:0,s:0,v:0,a:1}}return H}(),p=e.hslStringToHsva=l,f=e.hslaToHsva=function(){function H(F){var L=F.h,x=F.s,U=F.l,K=F.a;return x*=(U<50?U:100-U)/100,{h:L,s:x>0?2*x/(U+x)*100:0,v:U+x,a:K}}return H}(),i=e.hsvaToHex=function(){function H(F){return A(m(F))}return H}(),d=e.hsvaToHsla=function(){function H(F){var L=F.h,x=F.s,U=F.v,K=F.a,W=(200-x)*U/100;return{h:r(L),s:r(W>0&&W<200?x*U/100/(W<=100?W:200-W)*100:0),l:r(W/2),a:r(K,2)}}return H}(),c=e.hsvaToHslString=function(){function H(F){var L=d(F),x=L.h,U=L.s,K=L.l;return"hsl("+x+", "+U+"%, "+K+"%)"}return H}(),g=e.hsvaToHsvString=function(){function H(F){var L=M(F),x=L.h,U=L.s,K=L.v;return"hsv("+x+", "+U+"%, "+K+"%)"}return H}(),v=e.hsvaToHsvaString=function(){function H(F){var L=M(F),x=L.h,U=L.s,K=L.v,W=L.a;return"hsva("+x+", "+U+"%, "+K+"%, "+W+")"}return H}(),h=e.hsvaToHslaString=function(){function H(F){var L=d(F),x=L.h,U=L.s,K=L.l,W=L.a;return"hsla("+x+", "+U+"%, "+K+"%, "+W+")"}return H}(),m=e.hsvaToRgba=function(){function H(F){var L=F.h,x=F.s,U=F.v,K=F.a;L=L/360*6,x=x/100,U=U/100;var W=Math.floor(L),q=U*(1-x),ut=U*(1-(L-W)*x),ct=U*(1-(1-L+W)*x),Q=W%6;return{r:[U,ut,q,q,ct,U][Q]*255,g:[ct,U,U,ut,q,q][Q]*255,b:[q,q,ct,U,U,ut][Q]*255,a:r(K,2)}}return H}(),b=e.hsvaToRgbString=function(){function H(F){var L=m(F),x=L.r,U=L.g,K=L.b;return"rgb("+r(x)+", "+r(U)+", "+r(K)+")"}return H}(),I=e.hsvaToRgbaString=function(){function H(F){var L=m(F),x=L.r,U=L.g,K=L.b,W=L.a;return"rgba("+r(x)+", "+r(U)+", "+r(K)+", "+r(W,2)+")"}return H}(),O=e.hsvaStringToHsva=function(){function H(F){var L=/hsva?\(?\s*(-?\d*\.?\d+)(deg|rad|grad|turn)?[,\s]+(-?\d*\.?\d+)%?[,\s]+(-?\d*\.?\d+)%?,?\s*[/\s]*(-?\d*\.?\d+)?(%)?\s*\)?/i,x=L.exec(F);return x?M({h:u(x[1],x[2]),s:Number(x[3]),v:Number(x[4]),a:x[5]===void 0?1:Number(x[5])/(x[6]?100:1)}):{h:0,s:0,v:0,a:1}}return H}(),T=e.hsvStringToHsva=O,E=e.rgbaStringToHsva=function(){function H(F){var L=/rgba?\(?\s*(-?\d*\.?\d+)(%)?[,\s]+(-?\d*\.?\d+)(%)?[,\s]+(-?\d*\.?\d+)(%)?,?\s*[/\s]*(-?\d*\.?\d+)?(%)?\s*\)?/i,x=L.exec(F);return x?P({r:Number(x[1])/(x[2]?100/255:1),g:Number(x[3])/(x[4]?100/255:1),b:Number(x[5])/(x[6]?100/255:1),a:x[7]===void 0?1:Number(x[7])/(x[8]?100:1)}):{h:0,s:0,v:0,a:1}}return H}(),C=e.rgbStringToHsva=E,S=function(F){var L=F.toString(16);return L.length<2?"0"+L:L},A=e.rgbaToHex=function(){function H(F){var L=F.r,x=F.g,U=F.b,K=F.a,W=K<1?S(r(K*255)):"";return"#"+S(r(L))+S(r(x))+S(r(U))+W}return H}(),P=e.rgbaToHsva=function(){function H(F){var L=F.r,x=F.g,U=F.b,K=F.a,W=Math.max(L,x,U),q=W-Math.min(L,x,U),ut=q?W===L?(x-U)/q:W===x?2+(U-L)/q:4+(L-x)/q:0;return{h:60*(ut<0?ut+6:ut),s:W?q/W*100:0,v:W/255*100,a:K}}return H}(),M=e.roundHsva=function(){function H(F){return{h:r(F.h),s:r(F.s),v:r(F.v),a:r(F.a,2)}}return H}(),w=e.rgbaToRgb=function(){function H(F){var L=F.r,x=F.g,U=F.b;return{r:L,g:x,b:U}}return H}(),V=e.hslaToHsl=function(){function H(F){var L=F.h,x=F.s,U=F.l;return{h:L,s:x,l:U}}return H}(),j=e.hsvaToHsv=function(){function H(F){var L=M(F),x=L.h,U=L.s,K=L.v;return{h:x,s:U,v:K}}return H}(),$=/^#?([0-9A-F]{3,8})$/i,G=e.validHex=function(){function H(F,L){var x=$.exec(F),U=x?x[1].length:0;return U===3||U===6||!!L&&U===4||!!L&&U===8}return H}()},92868:function(y,e){"use strict";e.__esModule=!0,e.EventEmitter=void 0;/**
* @file
* @copyright 2020 Aleksej Komarov
* @license MIT
@@ -20,7 +20,7 @@
* @file
* @copyright 2020 Aleksej Komarov
* @license MIT
- */var t=e.KEY_BACKSPACE=8,n=e.KEY_TAB=9,r=e.KEY_ENTER=13,o=e.KEY_SHIFT=16,a=e.KEY_CTRL=17,s=e.KEY_ALT=18,u=e.KEY_PAUSE=19,l=e.KEY_CAPSLOCK=20,p=e.KEY_ESCAPE=27,f=e.KEY_SPACE=32,i=e.KEY_PAGEUP=33,d=e.KEY_PAGEDOWN=34,c=e.KEY_END=35,g=e.KEY_HOME=36,v=e.KEY_LEFT=37,h=e.KEY_UP=38,m=e.KEY_RIGHT=39,b=e.KEY_DOWN=40,I=e.KEY_INSERT=45,O=e.KEY_DELETE=46,T=e.KEY_0=48,E=e.KEY_1=49,C=e.KEY_2=50,S=e.KEY_3=51,A=e.KEY_4=52,P=e.KEY_5=53,M=e.KEY_6=54,R=e.KEY_7=55,V=e.KEY_8=56,j=e.KEY_9=57,$=e.KEY_A=65,G=e.KEY_B=66,H=e.KEY_C=67,F=e.KEY_D=68,L=e.KEY_E=69,x=e.KEY_F=70,U=e.KEY_G=71,K=e.KEY_H=72,W=e.KEY_I=73,q=e.KEY_J=74,ut=e.KEY_K=75,ct=e.KEY_L=76,Q=e.KEY_M=77,X=e.KEY_N=78,at=e.KEY_O=79,ft=e.KEY_P=80,dt=e.KEY_Q=81,_=e.KEY_R=82,rt=e.KEY_S=83,it=e.KEY_T=84,mt=e.KEY_U=85,ot=e.KEY_V=86,et=e.KEY_W=87,k=e.KEY_X=88,tt=e.KEY_Y=89,nt=e.KEY_Z=90,pt=e.KEY_NUMPAD_0=96,Et=e.KEY_NUMPAD_1=97,st=e.KEY_NUMPAD_2=98,yt=e.KEY_NUMPAD_3=99,Pt=e.KEY_NUMPAD_4=100,Ct=e.KEY_NUMPAD_5=101,lt=e.KEY_NUMPAD_6=102,gt=e.KEY_NUMPAD_7=103,It=e.KEY_NUMPAD_8=104,Lt=e.KEY_NUMPAD_9=105,Vt=e.KEY_F1=112,Ot=e.KEY_F2=113,vt=e.KEY_F3=114,St=e.KEY_F4=115,At=e.KEY_F5=116,Tt=e.KEY_F6=117,Nt=e.KEY_F7=118,Ft=e.KEY_F8=119,jt=e.KEY_F9=120,Ht=e.KEY_F10=121,Kt=e.KEY_F11=122,Gt=e.KEY_F12=123,Wt=e.KEY_SEMICOLON=186,te=e.KEY_EQUAL=187,be=e.KEY_COMMA=188,Me=e.KEY_MINUS=189,_t=e.KEY_PERIOD=190,Re=e.KEY_SLASH=191,ve=e.KEY_LEFT_BRACKET=219,se=e.KEY_BACKSLASH=220,sn=e.KEY_RIGHT_BRACKET=221,cn=e.KEY_QUOTE=222},44879:function(y,e){"use strict";e.__esModule=!0,e.toFixed=e.scale=e.round=e.rad2deg=e.keyOfMatchingRange=e.inRange=e.clamp01=e.clamp=void 0;/**
+ */var t=e.KEY_BACKSPACE=8,n=e.KEY_TAB=9,r=e.KEY_ENTER=13,o=e.KEY_SHIFT=16,a=e.KEY_CTRL=17,s=e.KEY_ALT=18,u=e.KEY_PAUSE=19,l=e.KEY_CAPSLOCK=20,p=e.KEY_ESCAPE=27,f=e.KEY_SPACE=32,i=e.KEY_PAGEUP=33,d=e.KEY_PAGEDOWN=34,c=e.KEY_END=35,g=e.KEY_HOME=36,v=e.KEY_LEFT=37,h=e.KEY_UP=38,m=e.KEY_RIGHT=39,b=e.KEY_DOWN=40,I=e.KEY_INSERT=45,O=e.KEY_DELETE=46,T=e.KEY_0=48,E=e.KEY_1=49,C=e.KEY_2=50,S=e.KEY_3=51,A=e.KEY_4=52,P=e.KEY_5=53,M=e.KEY_6=54,w=e.KEY_7=55,V=e.KEY_8=56,j=e.KEY_9=57,$=e.KEY_A=65,G=e.KEY_B=66,H=e.KEY_C=67,F=e.KEY_D=68,L=e.KEY_E=69,x=e.KEY_F=70,U=e.KEY_G=71,K=e.KEY_H=72,W=e.KEY_I=73,q=e.KEY_J=74,ut=e.KEY_K=75,ct=e.KEY_L=76,Q=e.KEY_M=77,X=e.KEY_N=78,at=e.KEY_O=79,ft=e.KEY_P=80,dt=e.KEY_Q=81,_=e.KEY_R=82,rt=e.KEY_S=83,it=e.KEY_T=84,mt=e.KEY_U=85,ot=e.KEY_V=86,et=e.KEY_W=87,k=e.KEY_X=88,tt=e.KEY_Y=89,nt=e.KEY_Z=90,pt=e.KEY_NUMPAD_0=96,Et=e.KEY_NUMPAD_1=97,st=e.KEY_NUMPAD_2=98,yt=e.KEY_NUMPAD_3=99,Pt=e.KEY_NUMPAD_4=100,Ct=e.KEY_NUMPAD_5=101,lt=e.KEY_NUMPAD_6=102,gt=e.KEY_NUMPAD_7=103,It=e.KEY_NUMPAD_8=104,Lt=e.KEY_NUMPAD_9=105,Vt=e.KEY_F1=112,Ot=e.KEY_F2=113,vt=e.KEY_F3=114,St=e.KEY_F4=115,At=e.KEY_F5=116,Tt=e.KEY_F6=117,Nt=e.KEY_F7=118,Ft=e.KEY_F8=119,jt=e.KEY_F9=120,Ht=e.KEY_F10=121,Kt=e.KEY_F11=122,Gt=e.KEY_F12=123,Wt=e.KEY_SEMICOLON=186,te=e.KEY_EQUAL=187,be=e.KEY_COMMA=188,Me=e.KEY_MINUS=189,_t=e.KEY_PERIOD=190,Re=e.KEY_SLASH=191,ve=e.KEY_LEFT_BRACKET=219,se=e.KEY_BACKSLASH=220,sn=e.KEY_RIGHT_BRACKET=221,cn=e.KEY_QUOTE=222},44879:function(y,e){"use strict";e.__esModule=!0,e.toFixed=e.scale=e.round=e.rad2deg=e.keyOfMatchingRange=e.inRange=e.clamp01=e.clamp=void 0;/**
* @file
* @copyright 2020 Aleksej Komarov
* @license MIT
@@ -40,13 +40,13 @@
* @file
* @copyright 2020 Aleksej Komarov
* @license MIT
- */var r=e.createStore=function(){function p(f,i){if(i)return i(p)(f);var d,c=[],g=function(){function m(){return d}return m}(),v=function(){function m(b){c.push(b)}return m}(),h=function(){function m(b){d=f(d,b);for(var I=0;I1?v-1:0),m=1;m1?S-1:0),P=1;P=0;--nt){var pt=this.tryEntries[nt],Et=pt.completion;if(pt.tryLoc==="root")return tt("end");if(pt.tryLoc<=this.prev){var st=C.call(pt,"catchLoc"),yt=C.call(pt,"finallyLoc");if(st&&yt){if(this.prev=0;--tt){var nt=this.tryEntries[tt];if(nt.tryLoc<=this.prev&&C.call(nt,"finallyLoc")&&this.prev=0;--k){var tt=this.tryEntries[k];if(tt.finallyLoc===et)return this.complete(tt.completion,tt.afterLoc),rt(tt),x}}return ot}(),catch:function(){function ot(et){for(var k=this.tryEntries.length-1;k>=0;--k){var tt=this.tryEntries[k];if(tt.tryLoc===et){var nt=tt.completion;if(nt.type==="throw"){var pt=nt.arg;rt(tt)}return pt}}throw Error("illegal catch attempt")}return ot}(),delegateYield:function(){function ot(et,k,tt){return this.delegate={iterator:mt(et),resultName:k,nextLoc:tt},this.method==="next"&&(this.arg=O),x}return ot}()},T}function n(O,T,E,C,S,A,P){try{var M=O[A](P),R=M.value}catch(V){return void E(V)}M.done?T(R):Promise.resolve(R).then(C,S)}function r(O){return function(){var T=this,E=arguments;return new Promise(function(C,S){var A=O.apply(T,E);function P(R){n(A,C,S,P,M,"next",R)}function M(R){n(A,C,S,P,M,"throw",R)}P(void 0)})}}/**
+ */var r=e.createStore=function(){function p(f,i){if(i)return i(p)(f);var d,c=[],g=function(){function m(){return d}return m}(),v=function(){function m(b){c.push(b)}return m}(),h=function(){function m(b){d=f(d,b);for(var I=0;I1?v-1:0),m=1;m1?S-1:0),P=1;P=0;--nt){var pt=this.tryEntries[nt],Et=pt.completion;if(pt.tryLoc==="root")return tt("end");if(pt.tryLoc<=this.prev){var st=C.call(pt,"catchLoc"),yt=C.call(pt,"finallyLoc");if(st&&yt){if(this.prev=0;--tt){var nt=this.tryEntries[tt];if(nt.tryLoc<=this.prev&&C.call(nt,"finallyLoc")&&this.prev=0;--k){var tt=this.tryEntries[k];if(tt.finallyLoc===et)return this.complete(tt.completion,tt.afterLoc),rt(tt),x}}return ot}(),catch:function(){function ot(et){for(var k=this.tryEntries.length-1;k>=0;--k){var tt=this.tryEntries[k];if(tt.tryLoc===et){var nt=tt.completion;if(nt.type==="throw"){var pt=nt.arg;rt(tt)}return pt}}throw Error("illegal catch attempt")}return ot}(),delegateYield:function(){function ot(et,k,tt){return this.delegate={iterator:mt(et),resultName:k,nextLoc:tt},this.method==="next"&&(this.arg=O),x}return ot}()},T}function n(O,T,E,C,S,A,P){try{var M=O[A](P),w=M.value}catch(V){return void E(V)}M.done?T(w):Promise.resolve(w).then(C,S)}function r(O){return function(){var T=this,E=arguments;return new Promise(function(C,S){var A=O.apply(T,E);function P(w){n(A,C,S,P,M,"next",w)}function M(w){n(A,C,S,P,M,"throw",w)}P(void 0)})}}/**
* Browser-agnostic abstraction of key-value web storage.
*
* @file
* @copyright 2020 Aleksej Komarov
* @license MIT
- */var o=e.IMPL_MEMORY=0,a=e.IMPL_HUB_STORAGE=1,s=e.IMPL_INDEXED_DB=2,u=1,l="para-tgui",p="storage-v1",f="readonly",i="readwrite",d=function(T){return function(){try{return!!T()}catch(E){return!1}}},c=d(function(){return window.hubStorage&&window.hubStorage.getItem}),g=d(function(){return(window.indexedDB||window.msIndexedDB)&&(window.IDBTransaction||window.msIDBTransaction)}),v=function(){function O(){this.impl=o,this.store={}}var T=O.prototype;return T.get=function(){var E=r(t().mark(function(){function S(A){return t().wrap(function(){function P(M){for(;;)switch(M.prev=M.next){case 0:return M.abrupt("return",this.store[A]);case 1:case"end":return M.stop()}}return P}(),S,this)}return S}()));function C(S){return E.apply(this,arguments)}return C}(),T.set=function(){var E=r(t().mark(function(){function S(A,P){return t().wrap(function(){function M(R){for(;;)switch(R.prev=R.next){case 0:this.store[A]=P;case 1:case"end":return R.stop()}}return M}(),S,this)}return S}()));function C(S,A){return E.apply(this,arguments)}return C}(),T.remove=function(){var E=r(t().mark(function(){function S(A){return t().wrap(function(){function P(M){for(;;)switch(M.prev=M.next){case 0:this.store[A]=void 0;case 1:case"end":return M.stop()}}return P}(),S,this)}return S}()));function C(S){return E.apply(this,arguments)}return C}(),T.clear=function(){var E=r(t().mark(function(){function S(){return t().wrap(function(){function A(P){for(;;)switch(P.prev=P.next){case 0:this.store={};case 1:case"end":return P.stop()}}return A}(),S,this)}return S}()));function C(){return E.apply(this,arguments)}return C}(),O}(),h=function(){function O(){this.impl=a}var T=O.prototype;return T.get=function(){var E=r(t().mark(function(){function S(A){var P;return t().wrap(function(){function M(R){for(;;)switch(R.prev=R.next){case 0:return R.next=2,window.hubStorage.getItem("paradise-"+A);case 2:if(P=R.sent,typeof P!="string"){R.next=5;break}return R.abrupt("return",JSON.parse(P));case 5:case"end":return R.stop()}}return M}(),S)}return S}()));function C(S){return E.apply(this,arguments)}return C}(),T.set=function(){function E(C,S){window.hubStorage.setItem("paradise-"+C,JSON.stringify(S))}return E}(),T.remove=function(){function E(C){window.hubStorage.removeItem("paradise-"+C)}return E}(),T.clear=function(){function E(){window.hubStorage.clear()}return E}(),O}(),m=function(){function O(){this.impl=s,this.dbPromise=new Promise(function(E,C){var S=window.indexedDB||window.msIndexedDB,A=S.open(l,u);A.onupgradeneeded=function(){try{A.result.createObjectStore(p)}catch(P){C(new Error("Failed to upgrade IDB: "+A.error))}},A.onsuccess=function(){return E(A.result)},A.onerror=function(){C(new Error("Failed to open IDB: "+A.error))}})}var T=O.prototype;return T.getStore=function(){var E=r(t().mark(function(){function S(A){return t().wrap(function(){function P(M){for(;;)switch(M.prev=M.next){case 0:return M.abrupt("return",this.dbPromise.then(function(R){return R.transaction(p,A).objectStore(p)}));case 1:case"end":return M.stop()}}return P}(),S,this)}return S}()));function C(S){return E.apply(this,arguments)}return C}(),T.get=function(){var E=r(t().mark(function(){function S(A){var P;return t().wrap(function(){function M(R){for(;;)switch(R.prev=R.next){case 0:return R.next=2,this.getStore(f);case 2:return P=R.sent,R.abrupt("return",new Promise(function(V,j){var $=P.get(A);$.onsuccess=function(){return V($.result)},$.onerror=function(){return j($.error)}}));case 4:case"end":return R.stop()}}return M}(),S,this)}return S}()));function C(S){return E.apply(this,arguments)}return C}(),T.set=function(){var E=r(t().mark(function(){function S(A,P){var M;return t().wrap(function(){function R(V){for(;;)switch(V.prev=V.next){case 0:return V.next=2,this.getStore(i);case 2:M=V.sent,M.put(P,A);case 4:case"end":return V.stop()}}return R}(),S,this)}return S}()));function C(S,A){return E.apply(this,arguments)}return C}(),T.remove=function(){var E=r(t().mark(function(){function S(A){var P;return t().wrap(function(){function M(R){for(;;)switch(R.prev=R.next){case 0:return R.next=2,this.getStore(i);case 2:P=R.sent,P.delete(A);case 4:case"end":return R.stop()}}return M}(),S,this)}return S}()));function C(S){return E.apply(this,arguments)}return C}(),T.clear=function(){var E=r(t().mark(function(){function S(){var A;return t().wrap(function(){function P(M){for(;;)switch(M.prev=M.next){case 0:return M.next=2,this.getStore(i);case 2:A=M.sent,A.clear();case 4:case"end":return M.stop()}}return P}(),S,this)}return S}()));function C(){return E.apply(this,arguments)}return C}(),O}(),b=function(){function O(){this.backendPromise=r(t().mark(function(){function E(){var C;return t().wrap(function(){function S(A){for(;;)switch(A.prev=A.next){case 0:if(!(!Byond.TRIDENT&&c())){A.next=2;break}return A.abrupt("return",new h);case 2:if(!g()){A.next=12;break}return A.prev=3,C=new m,A.next=7,C.dbPromise;case 7:return A.abrupt("return",C);case 10:A.prev=10,A.t0=A.catch(3);case 12:return A.abrupt("return",new v);case 13:case"end":return A.stop()}}return S}(),E,null,[[3,10]])}return E}()))()}var T=O.prototype;return T.get=function(){var E=r(t().mark(function(){function S(A){var P;return t().wrap(function(){function M(R){for(;;)switch(R.prev=R.next){case 0:return R.next=2,this.backendPromise;case 2:return P=R.sent,R.abrupt("return",P.get(A));case 4:case"end":return R.stop()}}return M}(),S,this)}return S}()));function C(S){return E.apply(this,arguments)}return C}(),T.set=function(){var E=r(t().mark(function(){function S(A,P){var M;return t().wrap(function(){function R(V){for(;;)switch(V.prev=V.next){case 0:return V.next=2,this.backendPromise;case 2:return M=V.sent,V.abrupt("return",M.set(A,P));case 4:case"end":return V.stop()}}return R}(),S,this)}return S}()));function C(S,A){return E.apply(this,arguments)}return C}(),T.remove=function(){var E=r(t().mark(function(){function S(A){var P;return t().wrap(function(){function M(R){for(;;)switch(R.prev=R.next){case 0:return R.next=2,this.backendPromise;case 2:return P=R.sent,R.abrupt("return",P.remove(A));case 4:case"end":return R.stop()}}return M}(),S,this)}return S}()));function C(S){return E.apply(this,arguments)}return C}(),T.clear=function(){var E=r(t().mark(function(){function S(){var A;return t().wrap(function(){function P(M){for(;;)switch(M.prev=M.next){case 0:return M.next=2,this.backendPromise;case 2:return A=M.sent,M.abrupt("return",A.clear());case 4:case"end":return M.stop()}}return P}(),S,this)}return S}()));function C(){return E.apply(this,arguments)}return C}(),O}(),I=e.storage=new b},25328:function(y,e){"use strict";e.__esModule=!0,e.toTitleCase=e.multiline=e.decodeHtmlEntities=e.createSearch=e.createGlobPattern=e.capitalize=e.buildQueryString=void 0;function t(i,d){var c=typeof Symbol!="undefined"&&i[Symbol.iterator]||i["@@iterator"];if(c)return(c=c.call(i)).next.bind(c);if(Array.isArray(i)||(c=n(i))||d&&i&&typeof i.length=="number"){c&&(i=c);var g=0;return function(){return g>=i.length?{done:!0}:{done:!1,value:i[g++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function n(i,d){if(i){if(typeof i=="string")return r(i,d);var c={}.toString.call(i).slice(8,-1);return c==="Object"&&i.constructor&&(c=i.constructor.name),c==="Map"||c==="Set"?Array.from(i):c==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(c)?r(i,d):void 0}}function r(i,d){(d==null||d>i.length)&&(d=i.length);for(var c=0,g=Array(d);c=i.length?{done:!0}:{done:!1,value:i[g++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function n(i,d){if(i){if(typeof i=="string")return r(i,d);var c={}.toString.call(i).slice(8,-1);return c==="Object"&&i.constructor&&(c=i.constructor.name),c==="Map"||c==="Set"?Array.from(i):c==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(c)?r(i,d):void 0}}function r(i,d){(d==null||d>i.length)&&(d=i.length);for(var c=0,g=Array(d);c=E.length?{done:!0}:{done:!1,value:E[A++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function c(E,C){if(E){if(typeof E=="string")return g(E,C);var S={}.toString.call(E).slice(8,-1);return S==="Object"&&E.constructor&&(S=E.constructor.name),S==="Map"||S==="Set"?Array.from(E):S==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(S)?g(E,C):void 0}}function g(E,C){(C==null||C>E.length)&&(C=E.length);for(var S=0,A=Array(C);S=0;--Et){var st=this.tryEntries[Et],yt=st.completion;if(st.tryLoc==="root")return pt("end");if(st.tryLoc<=this.prev){var Pt=A.call(st,"catchLoc"),Ct=A.call(st,"finallyLoc");if(Pt&&Ct){if(this.prev=0;--pt){var Et=this.tryEntries[pt];if(Et.tryLoc<=this.prev&&A.call(Et,"finallyLoc")&&this.prev=0;--nt){var pt=this.tryEntries[nt];if(pt.finallyLoc===tt)return this.complete(pt.completion,pt.afterLoc),mt(pt),K}}return k}(),catch:function(){function k(tt){for(var nt=this.tryEntries.length-1;nt>=0;--nt){var pt=this.tryEntries[nt];if(pt.tryLoc===tt){var Et=pt.completion;if(Et.type==="throw"){var st=Et.arg;mt(pt)}return st}}throw Error("illegal catch attempt")}return k}(),delegateYield:function(){function k(tt,nt,pt){return this.delegate={iterator:et(tt),resultName:nt,nextLoc:pt},this.method==="next"&&(this.arg=E),K}return k}()},C}function h(E,C,S,A,P,M,R){try{var V=E[M](R),j=V.value}catch($){return void S($)}V.done?C(j):Promise.resolve(j).then(A,P)}function m(E){return function(){var C=this,S=arguments;return new Promise(function(A,P){var M=E.apply(C,S);function R(j){h(M,A,P,R,V,"next",j)}function V(j){h(M,A,P,R,V,"throw",j)}R(void 0)})}}/**
+ */var t=e.MAX_VISIBLE_MESSAGES=2500,n=e.MAX_PERSISTED_MESSAGES=1e3,r=e.MESSAGE_SAVE_INTERVAL=1e4,o=e.MESSAGE_PRUNE_INTERVAL=6e4,a=e.COMBINE_MAX_TIME_WINDOW=5e3,s=e.COMBINE_MAX_MESSAGES=5,u=e.IMAGE_RETRY_DELAY=250,l=e.IMAGE_RETRY_LIMIT=10,p=e.IMAGE_RETRY_MESSAGE_AGE=6e4,f=e.MESSAGE_TYPE_UNKNOWN="unknown",i=e.MESSAGE_TYPE_INTERNAL="internal",d=e.MESSAGE_TYPE_SYSTEM="system",c=e.MESSAGE_TYPE_LOCALCHAT="localchat",g=e.MESSAGE_TYPE_RADIO="radio",v=e.MESSAGE_TYPE_INFO="info",h=e.MESSAGE_TYPE_WARNING="warning",m=e.MESSAGE_TYPE_DEADCHAT="deadchat",b=e.MESSAGE_TYPE_OOC="ooc",I=e.MESSAGE_TYPE_ADMINPM="adminpm",O=e.MESSAGE_TYPE_MENTORPM="mentorpm",T=e.MESSAGE_TYPE_COMBAT="combat",E=e.MESSAGE_TYPE_ADMINCHAT="adminchat",C=e.MESSAGE_TYPE_MENTORCHAT="mentorchat",S=e.MESSAGE_TYPE_DEVCHAT="devchat",A=e.MESSAGE_TYPE_EVENTCHAT="eventchat",P=e.MESSAGE_TYPE_ADMINLOG="adminlog",M=e.MESSAGE_TYPE_ATTACKLOG="attacklog",w=e.MESSAGE_TYPE_DEBUG="debug",V=e.MESSAGE_TYPES=[{type:d,name:"System Messages",description:"Messages from your client, always enabled",selector:".boldannounceooc",important:!0},{type:c,name:"Local",description:"In-character local messages (say, emote, etc)",selector:".say, .emote"},{type:g,name:"Radio",description:"All departments of radio messages",selector:".alert, .syndradio, .centradio, .airadio, .entradio, .comradio, .secradio, .engradio, .medradio, .sciradio, .supradio, .srvradio, .expradio, .radio, .deptradio, .newscaster, .proradio"},{type:v,name:"Info",description:"Non-urgent messages from the game and items",selector:".notice:not(.pm), .adminnotice, .info, .sinister, .cult"},{type:h,name:"Warnings",description:"Urgent messages from the game and items",selector:".warning:not(.pm), .critical, .userdanger, .italics, .boldannounceic, .boldwarning"},{type:m,name:"Deadchat",description:"All of deadchat",selector:".deadsay"},{type:b,name:"OOC",description:"The bluewall of global OOC messages",selector:".ooc, .adminooc, .interface"},{type:I,name:"Admin PMs",description:"Messages to/from admins (adminhelp)",selector:".adminpm, .adminhelp, .adminticket, .adminticketalt"},{type:O,name:"Mentor PMs",description:"Messages to/from mentors (mentorhelp)",selector:".mentorpm, .mentorhelp"},{type:T,name:"Combat Log",description:"Urist McTraitor has stabbed you with a knife!",selector:".danger"},{type:f,name:"Unsorted",description:"Everything we could not sort, always enabled"},{type:E,name:"Admin Chat",description:"ASAY messages",selector:".admin_channel, .adminsay",admin:!0},{type:C,name:"Mentor Chat",description:"MSAY messages",selector:".mentor_channel",admin:!0},{type:S,name:"Developer Chat",description:"DEVSAY messages",selector:".dev_channel",admin:!0},{type:P,name:"Admin Log",description:"ADMIN LOG: Urist McAdmin has jumped to coordinates X, Y, Z",selector:".log_message",admin:!0},{type:M,name:"Attack Log",description:"Urist McTraitor has shot John Doe",admin:!0},{type:w,name:"Debug Log",description:"DEBUG: SSPlanets subsystem Recover().",selector:".pr_announce, .debug",admin:!0}]},96835:function(y,e,t){"use strict";e.__esModule=!0,e.chatReducer=e.chatMiddleware=e.ChatTabs=e.ChatPanel=e.ChatPageSettings=void 0;var n=t(15039);e.ChatPageSettings=n.ChatPageSettings;var r=t(44675);e.ChatPanel=r.ChatPanel;var o=t(41125);e.ChatTabs=o.ChatTabs;var a=t(84807);e.chatMiddleware=a.chatMiddleware;var s=t(40147);e.chatReducer=s.chatReducer},84807:function(y,e,t){"use strict";e.__esModule=!0,e.chatMiddleware=void 0;var n=i(t(22734)),r=t(27108),o=t(36471),a=t(77034),s=t(37152),u=t(69126),l=t(41950),p=t(15916),f=t(23429);function i(E){return E&&E.__esModule?E:{default:E}}function d(E,C){var S=typeof Symbol!="undefined"&&E[Symbol.iterator]||E["@@iterator"];if(S)return(S=S.call(E)).next.bind(S);if(Array.isArray(E)||(S=c(E))||C&&E&&typeof E.length=="number"){S&&(E=S);var A=0;return function(){return A>=E.length?{done:!0}:{done:!1,value:E[A++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function c(E,C){if(E){if(typeof E=="string")return g(E,C);var S={}.toString.call(E).slice(8,-1);return S==="Object"&&E.constructor&&(S=E.constructor.name),S==="Map"||S==="Set"?Array.from(E):S==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(S)?g(E,C):void 0}}function g(E,C){(C==null||C>E.length)&&(C=E.length);for(var S=0,A=Array(C);S=0;--Et){var st=this.tryEntries[Et],yt=st.completion;if(st.tryLoc==="root")return pt("end");if(st.tryLoc<=this.prev){var Pt=A.call(st,"catchLoc"),Ct=A.call(st,"finallyLoc");if(Pt&&Ct){if(this.prev=0;--pt){var Et=this.tryEntries[pt];if(Et.tryLoc<=this.prev&&A.call(Et,"finallyLoc")&&this.prev=0;--nt){var pt=this.tryEntries[nt];if(pt.finallyLoc===tt)return this.complete(pt.completion,pt.afterLoc),mt(pt),K}}return k}(),catch:function(){function k(tt){for(var nt=this.tryEntries.length-1;nt>=0;--nt){var pt=this.tryEntries[nt];if(pt.tryLoc===tt){var Et=pt.completion;if(Et.type==="throw"){var st=Et.arg;mt(pt)}return st}}throw Error("illegal catch attempt")}return k}(),delegateYield:function(){function k(tt,nt,pt){return this.delegate={iterator:et(tt),resultName:nt,nextLoc:pt},this.method==="next"&&(this.arg=E),K}return k}()},C}function h(E,C,S,A,P,M,w){try{var V=E[M](w),j=V.value}catch($){return void S($)}V.done?C(j):Promise.resolve(j).then(A,P)}function m(E){return function(){var C=this,S=arguments;return new Promise(function(A,P){var M=E.apply(C,S);function w(j){h(M,A,P,w,V,"next",j)}function V(j){h(M,A,P,w,V,"throw",j)}w(void 0)})}}/**
* @file
* @copyright 2020 Aleksej Komarov
* @license MIT
-*/var b=["a","iframe","link","video"],I=function(){var E=m(v().mark(function(){function C(S){var A,P,M;return v().wrap(function(){function R(V){for(;;)switch(V.prev=V.next){case 0:A=(0,f.selectChat)(S.getState()),P=Math.max(0,p.chatRenderer.messages.length-u.MAX_PERSISTED_MESSAGES),M=p.chatRenderer.messages.slice(P).map(function(j){return(0,l.serializeMessage)(j)}),r.storage.set("chat-state",A),r.storage.set("chat-messages",M);case 5:case"end":return V.stop()}}return R}(),C)}return C}()));return function(){function C(S){return E.apply(this,arguments)}return C}()}(),O=function(){var E=m(v().mark(function(){function C(S){var A,P,M,R,V,j,$;return v().wrap(function(){function G(H){for(;;)switch(H.prev=H.next){case 0:return H.next=2,Promise.all([r.storage.get("chat-state"),r.storage.get("chat-messages")]);case 2:if(A=H.sent,P=A[0],M=A[1],!(P&&P.version<=4)){H.next=8;break}return S.dispatch((0,s.loadChat)()),H.abrupt("return");case 8:if(M){for(R=d(M);!(V=R()).done;)j=V.value,j.html&&(j.html=n.default.sanitize(j.html,{FORBID_TAGS:b}));$=[].concat(M,[(0,l.createMessage)({type:"internal/reconnected"})]),p.chatRenderer.processBatch($,{prepend:!0})}S.dispatch((0,s.loadChat)(P));case 10:case"end":return H.stop()}}return G}(),C)}return C}()));return function(){function C(S){return E.apply(this,arguments)}return C}()}(),T=e.chatMiddleware=function(){function E(C){var S=!1,A=!1,P=[],M=[];return p.chatRenderer.events.on("batchProcessed",function(R){A&&C.dispatch((0,s.updateMessageCount)(R))}),p.chatRenderer.events.on("scrollTrackingChanged",function(R){C.dispatch((0,s.changeScrollTracking)(R))}),setInterval(function(){return I(C)},u.MESSAGE_SAVE_INTERVAL),function(R){return function(V){var j=V.type,$=V.payload;if(S||(S=!0,O(C)),j==="chat/message"){var G;try{G=JSON.parse($)}catch(q){return}var H=G.sequence;if(P.includes(H))return;var F=P.length;t:if(F>0){if(M.includes(H)){M.splice(M.indexOf(H),1);break t}var L=P[F-1]+1;if(H!==L)for(var x=L;x=c.length?{done:!0}:{done:!1,value:c[h++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function a(c,g){if(c){if(typeof c=="string")return s(c,g);var v={}.toString.call(c).slice(8,-1);return v==="Object"&&c.constructor&&(v=c.constructor.name),v==="Map"||v==="Set"?Array.from(c):v==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(v)?s(c,g):void 0}}function s(c,g){(g==null||g>c.length)&&(g=c.length);for(var v=0,h=Array(g);v0){if(M.includes(H)){M.splice(M.indexOf(H),1);break t}var L=P[F-1]+1;if(H!==L)for(var x=L;x=c.length?{done:!0}:{done:!1,value:c[h++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function a(c,g){if(c){if(typeof c=="string")return s(c,g);var v={}.toString.call(c).slice(8,-1);return v==="Object"&&c.constructor&&(v=c.constructor.name),v==="Map"||v==="Set"?Array.from(c):v==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(v)?s(c,g):void 0}}function s(c,g){(g==null||g>c.length)&&(g=c.length);for(var v=0,h=Array(g);v=c.length?{done:!0}:{done:!1,value:c[h++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function l(c,g){if(c){if(typeof c=="string")return p(c,g);var v={}.toString.call(c).slice(8,-1);return v==="Object"&&c.constructor&&(v=c.constructor.name),v==="Map"||v==="Set"?Array.from(c):v==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(v)?p(c,g):void 0}}function p(c,g){(g==null||g>c.length)&&(g=c.length);for(var v=0,h=Array(g);v0&&(W[ct.id]=Object.assign({},ct,{unreadCount:ct.unreadCount+Q}))}return Object.assign({},g,{pageById:W})}if(h===n.addChatPage.type){var dt;return Object.assign({},g,{currentPageId:m.id,pages:[].concat(g.pages,[m.id]),pageById:Object.assign({},g.pageById,(dt={},dt[m.id]=m,dt))})}if(h===n.changeChatPage.type){var _,rt=m.pageId,it=Object.assign({},g.pageById[rt],{unreadCount:0});return Object.assign({},g,{currentPageId:rt,pageById:Object.assign({},g.pageById,(_={},_[rt]=it,_))})}if(h===n.updateChatPage.type){var mt,ot=m.pageId,et=s(m,o),k=Object.assign({},g.pageById[ot],et);return Object.assign({},g,{pageById:Object.assign({},g.pageById,(mt={},mt[ot]=k,mt))})}if(h===n.toggleAcceptedType.type){var tt,nt=m.pageId,pt=m.type,Et=Object.assign({},g.pageById[nt]);return Et.acceptedTypes=Object.assign({},Et.acceptedTypes),Et.acceptedTypes[pt]=!Et.acceptedTypes[pt],Object.assign({},g,{pageById:Object.assign({},g.pageById,(tt={},tt[nt]=Et,tt))})}if(h===n.removeChatPage.type){var st=m.pageId,yt=Object.assign({},g,{pages:[].concat(g.pages),pageById:Object.assign({},g.pageById)});return delete yt.pageById[st],yt.pages=yt.pages.filter(function(Nt){return Nt!==st}),yt.pages.length===0&&(yt.pages.push(f.id),yt.pageById[f.id]=f,yt.currentPageId=f.id),(!yt.currentPageId||yt.currentPageId===st)&&(yt.currentPageId=yt.pages[0]),yt}if(h===n.moveChatPageLeft.type){var Pt=m.pageId,Ct=Object.assign({},g,{pages:[].concat(g.pages),pageById:Object.assign({},g.pageById)}),lt=Ct.pageById[Pt],gt=Ct.pages.indexOf(lt.id),It=gt-1;if(gt>0&&It>0){var Lt=Ct.pages[gt];Ct.pages[gt]=Ct.pages[It],Ct.pages[It]=Lt}return Ct}if(h===n.moveChatPageRight.type){var Vt=m.pageId,Ot=Object.assign({},g,{pages:[].concat(g.pages),pageById:Object.assign({},g.pageById)}),vt=Ot.pageById[Vt],St=Ot.pages.indexOf(vt.id),At=St+1;if(St>0&&At=S.length?{done:!0}:{done:!1,value:S[M++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function i(S,A){if(S){if(typeof S=="string")return d(S,A);var P={}.toString.call(S).slice(8,-1);return P==="Object"&&S.constructor&&(P=S.constructor.name),P==="Map"||P==="Set"?Array.from(S):P==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(P)?d(S,A):void 0}}function d(S,A){(A==null||A>S.length)&&(A=S.length);for(var P=0,M=Array(A);P=c.length?{done:!0}:{done:!1,value:c[h++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function l(c,g){if(c){if(typeof c=="string")return p(c,g);var v={}.toString.call(c).slice(8,-1);return v==="Object"&&c.constructor&&(v=c.constructor.name),v==="Map"||v==="Set"?Array.from(c):v==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(v)?p(c,g):void 0}}function p(c,g){(g==null||g>c.length)&&(g=c.length);for(var v=0,h=Array(g);v0&&(W[ct.id]=Object.assign({},ct,{unreadCount:ct.unreadCount+Q}))}return Object.assign({},g,{pageById:W})}if(h===n.addChatPage.type){var dt;return Object.assign({},g,{currentPageId:m.id,pages:[].concat(g.pages,[m.id]),pageById:Object.assign({},g.pageById,(dt={},dt[m.id]=m,dt))})}if(h===n.changeChatPage.type){var _,rt=m.pageId,it=Object.assign({},g.pageById[rt],{unreadCount:0});return Object.assign({},g,{currentPageId:rt,pageById:Object.assign({},g.pageById,(_={},_[rt]=it,_))})}if(h===n.updateChatPage.type){var mt,ot=m.pageId,et=s(m,o),k=Object.assign({},g.pageById[ot],et);return Object.assign({},g,{pageById:Object.assign({},g.pageById,(mt={},mt[ot]=k,mt))})}if(h===n.toggleAcceptedType.type){var tt,nt=m.pageId,pt=m.type,Et=Object.assign({},g.pageById[nt]);return Et.acceptedTypes=Object.assign({},Et.acceptedTypes),Et.acceptedTypes[pt]=!Et.acceptedTypes[pt],Object.assign({},g,{pageById:Object.assign({},g.pageById,(tt={},tt[nt]=Et,tt))})}if(h===n.removeChatPage.type){var st=m.pageId,yt=Object.assign({},g,{pages:[].concat(g.pages),pageById:Object.assign({},g.pageById)});return delete yt.pageById[st],yt.pages=yt.pages.filter(function(Nt){return Nt!==st}),yt.pages.length===0&&(yt.pages.push(f.id),yt.pageById[f.id]=f,yt.currentPageId=f.id),(!yt.currentPageId||yt.currentPageId===st)&&(yt.currentPageId=yt.pages[0]),yt}if(h===n.moveChatPageLeft.type){var Pt=m.pageId,Ct=Object.assign({},g,{pages:[].concat(g.pages),pageById:Object.assign({},g.pageById)}),lt=Ct.pageById[Pt],gt=Ct.pages.indexOf(lt.id),It=gt-1;if(gt>0&&It>0){var Lt=Ct.pages[gt];Ct.pages[gt]=Ct.pages[It],Ct.pages[It]=Lt}return Ct}if(h===n.moveChatPageRight.type){var Vt=m.pageId,Ot=Object.assign({},g,{pages:[].concat(g.pages),pageById:Object.assign({},g.pageById)}),vt=Ot.pageById[Vt],St=Ot.pages.indexOf(vt.id),At=St+1;if(St>0&&At=S.length?{done:!0}:{done:!1,value:S[M++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function i(S,A){if(S){if(typeof S=="string")return d(S,A);var P={}.toString.call(S).slice(8,-1);return P==="Object"&&S.constructor&&(P=S.constructor.name),P==="Map"||P==="Set"?Array.from(S):P==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(P)?d(S,A):void 0}}function d(S,A){(A==null||A>S.length)&&(A=S.length);for(var P=0,M=Array(A);P=s.IMAGE_RETRY_LIMIT){c.error("failed to load an image after "+M+" attempts");return}var R=P.src;P.src=null,P.src=R+"#"+M,P.setAttribute("data-reload-n",M+1)},s.IMAGE_RETRY_DELAY)},T=function(A){var P=A.node,M=A.times;if(!(!P||!M)){var R=P.querySelector(".Chat__badge"),V=R||document.createElement("div");V.textContent=M,V.className="Chat__badge",R||P.appendChild(V)}},E=function(){function S(){var P=this;this.loaded=!1,this.rootNode=null,this.queue=[],this.messages=[],this.visibleMessages=[],this.page=null,this.events=new r.EventEmitter,this.scrollNode=null,this.scrollTracking=!0,this.handleScroll=function(M){var R=P.scrollNode,V=R.scrollHeight,j=R.scrollTop+R.offsetHeight,$=Math.abs(V-j)0&&(this.processBatch(this.queue),this.queue=[])}return P}(),A.assignStyle=function(){function P(M){M===void 0&&(M={});for(var R=0,V=Object.keys(M);R{}[\]:;'"|~`_\-\\/]/g,W=String(G).split(/[,|]/).map(function(it){return it.trim()}).filter(function(it){return it&&it.length>1&&U.test(it)&&((U.lastIndex=0)||!0)}),q,ut;if(W.length!==0){for(var ct=[],Q=f(W),X;!(X=Q()).done;){var at=X.value;if(at.charAt(0)==="/"&&at.charAt(at.length-1)==="/"){var ft=at.substring(1,at.length-1);if(/^(\[.*\]|\\.|.)$/.test(ft))continue;ct.push(ft)}else q||(q=[]),at=at.replace(K,"\\$&"),q.push(at)}var dt=ct.join("|"),_="g"+(x?"":"i");try{if(dt)ut=new RegExp("("+dt+")",_);else{var rt=(L?"\\b":"")+"("+q.join("|")+")"+(L?"\\b":"");ut=new RegExp(rt,_)}}catch(it){ut=null}V.highlightParsers||(V.highlightParsers=[]),V.highlightParsers.push({highlightWords:q,highlightRegex:ut,highlightColor:H,highlightWholeMessage:F})}})}return P}(),A.scrollToBottom=function(){function P(){this.scrollNode.scrollTop=this.scrollNode.scrollHeight}return P}(),A.changePage=function(){function P(M){if(!this.isReady()){this.page=M,this.tryFlushQueue();return}this.page=M,this.rootNode.textContent="",this.visibleMessages=[];for(var R=document.createDocumentFragment(),V,j=f(this.messages),$;!($=j()).done;){var G=$.value;(0,u.canPageAcceptType)(M,G.type)&&(V=G.node,R.appendChild(V),this.visibleMessages.push(G))}V&&(this.rootNode.appendChild(R),V.scrollIntoView())}return P}(),A.getCombinableMessage=function(){function P(M,R,V,j){for(var $=V;$>=j;$--){var G=this.visibleMessages[$],H=!G.type.startsWith(s.MESSAGE_TYPE_INTERNAL)&&(0,u.isSameMessage)(G,M)&&R0){this.visibleMessages=M.slice(R);for(var V=0;V0&&(this.messages=this.messages.slice($),c.log("pruned "+$+" stored messages"))}}}return P}(),A.rebuildChat=function(){function P(){if(this.isReady()){for(var M=Math.max(0,this.messages.length-s.MAX_VISIBLE_MESSAGES),R=this.messages.slice(M),V=f(R),j;!(j=V()).done;){var $=j.value;$.node=void 0}this.rootNode.textContent="",this.messages=[],this.visibleMessages=[],this.processBatch(R,{notifyListeners:!1})}}return P}(),A.clearChat=function(){function P(){var M=this.visibleMessages;this.visibleMessages=[];for(var R=0;R\n\n\n\n'+H+"
\n\n 
